summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2009-03-22 10:30:13 +0300
committerAndrew Dolgov <[email protected]>2009-03-22 10:30:13 +0300
commit34f9c6b295928bc1a704532b15fcd7030ea52e60 (patch)
tree8ec6c6629127b792f389044651113e0b5e79925b /locale
parentd21459831f2139a2e316d8953b42938bb27abdbf (diff)
release 1.3.2
Diffstat (limited to 'locale')
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin27419 -> 27668 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po351
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.mobin9917 -> 9917 bytes
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.po343
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.mobin39723 -> 39373 bytes
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.po363
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.mobin32310 -> 32804 bytes
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.po355
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.mobin48965 -> 48723 bytes
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.po373
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.mobin10525 -> 10916 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.po355
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin54039 -> 54151 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po373
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin20230 -> 20469 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po359
16 files changed, 1395 insertions, 1477 deletions
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index f1ea8e436..380ccc87a 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 149575734..89ab9f596 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-03-21 23:14+0300\n"
+"POT-Creation-Date: 2009-02-20 15:55+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:247 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
msgid "Default"
msgstr "Utiliser la valeur par défaut"
@@ -111,16 +111,12 @@ msgid "Unknown error"
msgstr "Erreur inconnue"
#: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
+msgid "This program requires XmlHttpRequest "
+msgstr "Ce logiciel nécessite XmlHttpRequest "
#: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
+msgid "This program requires cookies "
+msgstr "Les cookies doivent être activés pour ce logiciel "
#: errors.php:11
msgid "Backend sanity check failed"
@@ -176,192 +172,187 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2846 modules/popup-dialog.php:175
+#: functions.php:2841 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Tous les flux"
-#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
-#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
+#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
+#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Sans catégorie"
-#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
+#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
#: mobile/functions.php:33
msgid "Special"
msgstr "Spécial"
-#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
-#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
+#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
+#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Intitulé"
-#: functions.php:2924 functions.php:3347 functions.php:4144
+#: functions.php:2919 functions.php:3342 functions.php:4127
#: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
#: offline.js:1425
msgid "Starred articles"
msgstr "Articles remarquables"
-#: functions.php:2926 functions.php:3351 functions.php:4151
-#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
+#: functions.php:2921 functions.php:3346 functions.php:4134
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Articles publiés"
-#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
+#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Nouveaux articles"
-#: functions.php:2930 functions.php:3360 functions.php:4122
+#: functions.php:2925 functions.php:3355 functions.php:4105
#: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
#: offline.js:1427
#, fuzzy
msgid "All articles"
msgstr "Tous les articles"
-#: functions.php:3311 functions.php:3313
+#: functions.php:3306 functions.php:3308
msgid "Search results"
msgstr "Résultats de recherche"
-#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
-#: functions.php:3358 functions.php:3361 functions.php:3369
+#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
+#: functions.php:3353 functions.php:3356 functions.php:3364
msgid "Searched for"
msgstr "Recherché"
-#: functions.php:4001
+#: functions.php:3984
msgid "Generated feed"
msgstr "Flux généré"
-#: functions.php:4006 functions.php:5292 localized_js.php:148
-#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
+#: functions.php:3989 functions.php:5253 localized_js.php:148
+#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
#: modules/pref-filters.php:366 modules/pref-labels.php:163
#: modules/pref-users.php:401 offline.js:409
msgid "Select:"
msgstr "Sélectionner&nbsp;:"
-#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
-#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
+#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
+#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
#: modules/pref-labels.php:164 modules/pref-users.php:402
#: mobile/functions.php:570
msgid "All"
msgstr "Tout"
-#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
+#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Non lus"
-#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
+#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(Inverse)"
-#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
-#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
+#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
+#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
#: modules/pref-labels.php:165 modules/pref-users.php:403
#: mobile/functions.php:572
msgid "None"
msgstr "Aucun"
-#: functions.php:4018 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1378 offline.js:185
+#: functions.php:4001 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1371 offline.js:185
msgid "Actions..."
msgstr "Actions..."
-#: functions.php:4023 localized_js.php:150
+#: functions.php:4006 localized_js.php:150
#, fuzzy
msgid "Selection toggle:"
msgstr "Sélection&nbsp;:"
-#: functions.php:4025 localized_js.php:152 tt-rss.php:238
+#: functions.php:4008 localized_js.php:152 tt-rss.php:239
#: mobile/functions.php:459
msgid "Starred"
msgstr "Remarquables"
-#: functions.php:4026
+#: functions.php:4009
msgid "Published"
msgstr "Publiés"
-#: functions.php:4028 localized_js.php:85
+#: functions.php:4011 localized_js.php:85
msgid "Mark as read:"
msgstr "Marquer comme lu&nbsp;:"
-#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
msgid "Selection"
msgstr "La sélection"
-#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
msgid "Entire feed"
msgstr "Tout le flux"
-#: functions.php:4035
+#: functions.php:4018
#, fuzzy
msgid "Assign label:"
msgstr "Attribuer des étiquettes"
-#: functions.php:4076 localized_js.php:56
+#: functions.php:4059 localized_js.php:56
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4342
+#: functions.php:4325
msgid "No feeds to display."
msgstr "Aucun flux à afficher."
-#: functions.php:4359 mobile/functions.php:12
+#: functions.php:4342 mobile/functions.php:12
msgid "Tags"
msgstr "Étiquettes"
-#: functions.php:4596
+#: functions.php:4578
#, fuzzy
msgid " - "
msgstr "- par "
-#: functions.php:4620 functions.php:5320
+#: functions.php:4602 functions.php:5272
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4628
+#: functions.php:4610
#, fuzzy
msgid "Display original article content"
msgstr "Afficher l'heure du dernier article"
-#: functions.php:4635 functions.php:5302
+#: functions.php:4617 functions.php:5263
#, fuzzy
msgid "Show article summary in new window"
msgstr "Ouvrir les liens des articles dans une nouvelle fenêtre"
-#: functions.php:4642 functions.php:5309
-#, fuzzy
-msgid "Publish article with a note"
-msgstr "Publier l'article"
-
-#: functions.php:4682 functions.php:5226
+#: functions.php:4650 functions.php:5187
#, fuzzy
msgid "unknown type"
msgstr "Erreur inconnue"
-#: functions.php:4688 functions.php:5232
+#: functions.php:4656 functions.php:5193
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4724 functions.php:5266
+#: functions.php:4692 functions.php:5227
msgid "Attachment:"
msgstr ""
-#: functions.php:4726 functions.php:5268
+#: functions.php:4694 functions.php:5229
msgid "Attachments:"
msgstr ""
-#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
+#: functions.php:4714 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:4802
+#: functions.php:4770
msgid "Feed not found."
msgstr "Flux non trouvé."
-#: functions.php:4871 mobile/functions.php:423
+#: functions.php:4839 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -369,60 +360,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:5193
+#: functions.php:5161
#, fuzzy
msgid "Click to expand article"
msgstr "Articles mémorisés"
-#: functions.php:5327
-#, fuzzy
-msgid "toggle unread"
-msgstr "Marquages spéciaux&nbsp;"
-
-#: functions.php:5346
+#: functions.php:5298
#, fuzzy
msgid "No unread articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5349
+#: functions.php:5301
#, fuzzy
msgid "No updated articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5352
+#: functions.php:5304
#, fuzzy
msgid "No starred articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5356
+#: functions.php:5308
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:5358 localized_js.php:92 offline.js:444
+#: functions.php:5310 localized_js.php:92 offline.js:444
#, fuzzy
msgid "No articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:6049 tt-rss.php:204
+#: functions.php:5984 tt-rss.php:206
#, fuzzy
msgid "Create label..."
msgstr "Créer un intitulé"
-#: functions.php:6062
+#: functions.php:5997
#, fuzzy
msgid "(remove)"
msgstr "Supprimer"
-#: functions.php:6106
+#: functions.php:6041
msgid "no tags"
msgstr "aucune étiquette"
-#: functions.php:6134
-msgid "edit note"
-msgstr ""
-
#: localized_js.php:36
msgid "Adding feed..."
msgstr "Ajout d'un flux..."
@@ -612,17 +594,17 @@ msgstr "Marquer tous les articles de %s comme lus ?"
msgid "Mark all articles in %s as read?"
msgstr "Marquer tous les articles de %s comme lus ?"
-#: localized_js.php:84 viewfeed.js:1250
+#: localized_js.php:84 viewfeed.js:1212
#, php-format
msgid "Mark all visible articles in %s as read?"
msgstr "Marquer tous les articles visibles de %s comme lus ?"
-#: localized_js.php:86 viewfeed.js:1923
+#: localized_js.php:86 viewfeed.js:1885
#, php-format
msgid "Mark %d article(s) as read?"
msgstr "Marquer %d article(s) comme lu(s) ?"
-#: localized_js.php:87 viewfeed.js:1289
+#: localized_js.php:87 viewfeed.js:1251
#, php-format
msgid "Mark %d selected articles in %s as read?"
msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
@@ -635,16 +617,16 @@ msgstr "Marquage de tous les flux comme lus..."
msgid "New password cannot be blank."
msgstr "Le nouveau mot de passe ne peut pas être vide."
-#: localized_js.php:90 viewfeed.js:1880
+#: localized_js.php:90 viewfeed.js:1842
msgid "No article is selected."
msgstr "Aucun article sélectionné."
-#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
-#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
+#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
+#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
msgid "No articles are selected."
msgstr "Aucun article sélectionné."
-#: localized_js.php:93 viewfeed.js:1921
+#: localized_js.php:93 viewfeed.js:1883
msgid "No articles found to mark"
msgstr "Aucun article à marquer"
@@ -657,7 +639,7 @@ msgstr "Aucune catégorie sélectionnée."
msgid "No feeds are selected."
msgstr "Aucun flux sélectionné."
-#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
+#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
msgid "No feed selected."
msgstr "Aucun flux sélectionné."
@@ -722,7 +704,7 @@ msgstr "Veuillez sélectionner un seul utilisateur."
msgid "Please select some feed first."
msgstr "Veuillez d'abord sélectionner un flux."
-#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
+#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
msgid "Please wait..."
msgstr "Veuillez patienter..."
@@ -730,8 +712,8 @@ msgstr "Veuillez patienter..."
msgid "Please wait until operation finishes."
msgstr ""
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
-#: viewfeed.js:669
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
+#: viewfeed.js:631
msgid "Publish article"
msgstr "Publier l'article"
@@ -881,7 +863,7 @@ msgstr "Enregistrement du filtre..."
msgid "Saving user..."
msgstr "Enregistrement de l'utilisateur..."
-#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
+#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
msgid "Star article"
msgstr "Marquer comme remarquable"
@@ -960,11 +942,11 @@ msgstr "Tentative de modification de l'adresse électronique..."
msgid "Trying to change password..."
msgstr "Tentative de modification du mot de passe..."
-#: localized_js.php:170 viewfeed.js:657
+#: localized_js.php:170 viewfeed.js:618
msgid "Unpublish article"
msgstr "Ne plus publier l'article"
-#: localized_js.php:172 viewfeed.js:586
+#: localized_js.php:172 viewfeed.js:553
msgid "Unstar article"
msgstr "Ne plus marquer comme remarquable"
@@ -1008,8 +990,8 @@ msgid ""
"switch it into offline mode again. Go online?"
msgstr ""
-#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
+#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Titre"
@@ -1035,7 +1017,7 @@ msgstr ""
msgid "Filter article"
msgstr "Filtrer l'article"
-#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
msgid "Mark as read"
msgstr "Marquer comme lu"
@@ -1387,12 +1369,12 @@ msgstr "Quitter la configuration"
msgid "Logout"
msgstr "Déconnexion"
-#: prefs.php:117 tt-rss.php:208
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Purger les articles"
-#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Configuration"
@@ -1417,7 +1399,7 @@ msgstr "Le navigateur de flux a été désactivé par l'administrateur."
#: 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 modules/pref-feeds.php:869
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Revenir à Tiny Tiny RSS"
@@ -1517,117 +1499,122 @@ msgstr "Suppression d'un flux..."
msgid "Search..."
msgstr "Rechercher"
-#: tt-rss.php:191
+#: tt-rss.php:193
msgid "Feed actions:"
msgstr "Actions sur ce flux&nbsp;:"
-#: tt-rss.php:192
+#: tt-rss.php:194
#, fuzzy
msgid "Subscribe to feed..."
msgstr "S'inscrire à un flux"
-#: tt-rss.php:193
+#: tt-rss.php:195
#, fuzzy
msgid "Edit this feed..."
msgstr "Tout le flux"
-#: tt-rss.php:194
+#: tt-rss.php:196
#, fuzzy
msgid "Clear articles"
msgstr "Filtrer l'article"
-#: tt-rss.php:195
+#: tt-rss.php:197
#, fuzzy
msgid "Rescore feed"
msgstr "Suppression d'un flux..."
-#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
+#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Se désinscrire"
-#: tt-rss.php:198
+#: tt-rss.php:200
msgid "All feeds:"
msgstr "Tous les flux&nbsp;:"
-#: tt-rss.php:200 help/3.php:44
+#: tt-rss.php:202 help/3.php:44
#, fuzzy
msgid "(Un)hide read feeds"
msgstr "(Dé)Masquer les flux lus"
-#: tt-rss.php:202
+#: tt-rss.php:204
msgid "Other actions:"
msgstr "Autres actions&nbsp;:"
-#: tt-rss.php:205
+#: tt-rss.php:207
#, fuzzy
msgid "Create filter..."
msgstr "Créer un filtre"
-#: tt-rss.php:206
+#: tt-rss.php:208
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;S'inscrire à ce flux"
-#: tt-rss.php:207
+#: tt-rss.php:209
#, fuzzy
msgid "Reset category order"
msgstr "Supprimer les catégories sélectionnées ?"
-#: tt-rss.php:218
+#: tt-rss.php:210
+#, fuzzy
+msgid "&nbsp;&nbsp;Keyboard shortcuts"
+msgstr "&nbsp;&nbsp;Purger les articles"
+
+#: tt-rss.php:219
#, fuzzy
msgid "Collapse feedlist"
msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
-#: tt-rss.php:220
+#: tt-rss.php:221
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:228 mobile/functions.php:738
+#: tt-rss.php:229 mobile/functions.php:738
msgid "Search:"
msgstr "Rechercher&nbsp;:"
-#: tt-rss.php:236 mobile/functions.php:456
+#: tt-rss.php:237 mobile/functions.php:456
msgid "Adaptive"
msgstr "Adaptatif"
-#: tt-rss.php:237 mobile/functions.php:457
+#: tt-rss.php:238 mobile/functions.php:457
msgid "All Articles"
msgstr "Tous les articles"
-#: tt-rss.php:240
+#: tt-rss.php:241
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
+#: tt-rss.php:242 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:244
+#: tt-rss.php:245
#, fuzzy
msgid "Order:"
msgstr "Autre&nbsp;:"
-#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:461
#, fuzzy
msgid "Date"
msgstr "Mettre à jour"
-#: tt-rss.php:250
+#: tt-rss.php:251
msgid "Score"
msgstr ""
-#: tt-rss.php:254
+#: tt-rss.php:255
msgid "Limit:"
msgstr "Limite&nbsp;:"
-#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Mettre à jour"
-#: tt-rss.php:297
+#: tt-rss.php:298
msgid "Drag me to resize panels"
msgstr ""
@@ -1833,7 +1820,7 @@ msgstr "Annuler"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
@@ -1862,6 +1849,11 @@ msgstr "Ce flux"
msgid "Create Filter"
msgstr "Créer un filtre"
+#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
+#: modules/pref-filters.php:39 modules/pref-filters.php:96
+msgid "description"
+msgstr "description"
+
#: modules/popup-dialog.php:245 modules/pref-filters.php:42
#: modules/pref-filters.php:402
msgid "Match"
@@ -2030,143 +2022,143 @@ msgstr "Enregistrer localement les images"
msgid "Multiple Feed Editor"
msgstr "Éditeur de flux"
-#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:840
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Inscrit à <b>%s</b>."
-#: modules/pref-feeds.php:842
+#: 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:864
+#: modules/pref-feeds.php:860
msgid "Edit subscription options"
msgstr ""
-#: modules/pref-feeds.php:950
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Éditeur de catégorie"
-#: modules/pref-feeds.php:973
+#: 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:1004
+#: 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:1021
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Créer la catégorie"
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Aucune catégorie de flux définie."
-#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
#: modules/pref-filters.php:505 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Supprimer"
-#: modules/pref-feeds.php:1114
+#: 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:1136 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:1141
+#: modules/pref-feeds.php:1134
#, fuzzy
msgid "More Feeds"
msgstr "Suppression d'un flux..."
-#: modules/pref-feeds.php:1215
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Afficher l'heure du dernier article"
-#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Dernier&nbsp;article"
-#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
#: modules/pref-users.php:449
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1327
+#: modules/pref-feeds.php:1320
msgid "(Hidden)"
msgstr ""
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1333
#, php-format
msgid "(linked to %s)"
msgstr ""
-#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "Sélection&nbsp;:"
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Changer de catégorie"
-#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
#: modules/pref-users.php:472
msgid "Edit"
msgstr "Modifier"
-#: modules/pref-feeds.php:1384
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "Purger manuellement"
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Purger les données de flux"
-#: modules/pref-feeds.php:1389 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:1396
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Autre&nbsp;:"
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Modifier les catégories"
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "Fichier&nbsp;:"
-#: modules/pref-feeds.php:1413
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importer"
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Exporter en OPML"
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Intégration à Firefox"
-#: modules/pref-feeds.php:1425
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -2174,11 +2166,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:1429
+#: 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:1438
+#: modules/pref-feeds.php:1429
#, fuzzy
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
@@ -2187,17 +2179,17 @@ 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:1442
+#: modules/pref-feeds.php:1433
#, fuzzy
msgid "Link to published articles feed."
msgstr "Articles publiés"
-#: modules/pref-feeds.php:1445
+#: modules/pref-feeds.php:1436
#, fuzzy
msgid "Generate another link"
msgstr "Générer une autre adresse"
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1502
#, fuzzy
msgid "No feeds found."
msgstr "Aucun flux auquel s'inscrire n'a été trouvé."
@@ -2221,6 +2213,14 @@ msgstr "Filtre <b>%s</b> créé"
msgid "Create filter"
msgstr "Créer un filtre"
+#: modules/pref-filters.php:392
+msgid "filter_type_descr"
+msgstr ""
+
+#: modules/pref-filters.php:393
+msgid "action_description"
+msgstr ""
+
#: modules/pref-filters.php:404
#, fuzzy
msgid "Field"
@@ -2366,6 +2366,10 @@ msgstr "Sélectionner un thème"
msgid "Change theme"
msgstr "Modifier le thème"
+#: modules/pref-prefs.php:388
+msgid "short_desc"
+msgstr ""
+
#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Oui"
@@ -2755,24 +2759,6 @@ msgstr "Correspondance sur&nbsp;:"
msgid "Internal error: Function not implemented"
msgstr ""
-#: viewfeed.js:2193
-#, fuzzy
-msgid "Please enter a note for this article:"
-msgstr "Veuillez saisir le titre de l'intitulé :"
-
-#~ msgid "This program requires XmlHttpRequest "
-#~ msgstr "Ce logiciel nécessite XmlHttpRequest "
-
-#~ msgid "This program requires cookies "
-#~ msgstr "Les cookies doivent être activés pour ce logiciel "
-
-#, fuzzy
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;Purger les articles"
-
-#~ msgid "description"
-#~ msgstr "description"
-
#~ msgid "display tags"
#~ msgstr "afficher les étiquettes"
@@ -2797,6 +2783,9 @@ msgstr "Veuillez saisir le titre de l'intitulé :"
#~ msgid "Address changed."
#~ msgstr "Adresse modifiée."
+#~ msgid "Please enter label title:"
+#~ msgstr "Veuillez saisir le titre de l'intitulé :"
+
#, fuzzy
#~ msgid "Rescoring feeds..."
#~ msgstr "Suppression d'un flux..."
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index a8d5a30fc..1e0813bef 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 9cf6df652..ba4acd316 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-03-21 23:14+0300\n"
+"POT-Creation-Date: 2009-02-20 15:55+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:247 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
msgid "Default"
msgstr "Alapértelmezett"
@@ -111,15 +111,11 @@ msgid "Unknown error"
msgstr "Ismeretlen hiba"
#: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
+msgid "This program requires XmlHttpRequest "
msgstr ""
#: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
+msgid "This program requires cookies "
msgstr ""
#: errors.php:11
@@ -168,249 +164,235 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2846 modules/popup-dialog.php:175
+#: functions.php:2841 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Minden feed"
-#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
-#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
+#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
+#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Kategorizálatlan"
-#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
+#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
#: mobile/functions.php:33
msgid "Special"
msgstr "Speciális"
-#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
-#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
+#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
+#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Címkék"
-#: functions.php:2924 functions.php:3347 functions.php:4144
+#: functions.php:2919 functions.php:3342 functions.php:4127
#: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
#: offline.js:1425
msgid "Starred articles"
msgstr "Csillagost hírek"
-#: functions.php:2926 functions.php:3351 functions.php:4151
-#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
+#: functions.php:2921 functions.php:3346 functions.php:4134
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Publikált hírek"
-#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
+#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Olvasatlan hírek"
-#: functions.php:2930 functions.php:3360 functions.php:4122
+#: functions.php:2925 functions.php:3355 functions.php:4105
#: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
#: offline.js:1427
#, fuzzy
msgid "All articles"
msgstr "Minden hír"
-#: functions.php:3311 functions.php:3313
+#: functions.php:3306 functions.php:3308
msgid "Search results"
msgstr "Keresési találatok"
-#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
-#: functions.php:3358 functions.php:3361 functions.php:3369
+#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
+#: functions.php:3353 functions.php:3356 functions.php:3364
msgid "Searched for"
msgstr ""
-#: functions.php:4001
+#: functions.php:3984
msgid "Generated feed"
msgstr ""
-#: functions.php:4006 functions.php:5292 localized_js.php:148
-#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
+#: functions.php:3989 functions.php:5253 localized_js.php:148
+#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
#: modules/pref-filters.php:366 modules/pref-labels.php:163
#: modules/pref-users.php:401 offline.js:409
msgid "Select:"
msgstr "Kiválaszt:"
-#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
-#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
+#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
+#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
#: modules/pref-labels.php:164 modules/pref-users.php:402
#: mobile/functions.php:570
msgid "All"
msgstr "Mind"
-#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
+#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Olvasatlan"
-#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
+#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(ellentét)"
-#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
-#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
+#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
+#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
#: modules/pref-labels.php:165 modules/pref-users.php:403
#: mobile/functions.php:572
msgid "None"
msgstr "Egyiksem"
-#: functions.php:4018 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1378 offline.js:185
+#: functions.php:4001 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1371 offline.js:185
msgid "Actions..."
msgstr "Műveletek"
-#: functions.php:4023 localized_js.php:150
+#: functions.php:4006 localized_js.php:150
#, fuzzy
msgid "Selection toggle:"
msgstr "Kiválaszt:"
-#: functions.php:4025 localized_js.php:152 tt-rss.php:238
+#: functions.php:4008 localized_js.php:152 tt-rss.php:239
#: mobile/functions.php:459
msgid "Starred"
msgstr "Csillagoz"
-#: functions.php:4026
+#: functions.php:4009
msgid "Published"
msgstr "Publikál"
-#: functions.php:4028 localized_js.php:85
+#: functions.php:4011 localized_js.php:85
msgid "Mark as read:"
msgstr ""
-#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
msgid "Selection"
msgstr "Kiválasztottakat"
-#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
msgid "Entire feed"
msgstr "Összes feed"
-#: functions.php:4035
+#: functions.php:4018
#, fuzzy
msgid "Assign label:"
msgstr "Tag felajánlása"
-#: functions.php:4076 localized_js.php:56
+#: functions.php:4059 localized_js.php:56
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4342
+#: functions.php:4325
msgid "No feeds to display."
msgstr ""
-#: functions.php:4359 mobile/functions.php:12
+#: functions.php:4342 mobile/functions.php:12
msgid "Tags"
msgstr ""
-#: functions.php:4596
+#: functions.php:4578
msgid " - "
msgstr ""
-#: functions.php:4620 functions.php:5320
+#: functions.php:4602 functions.php:5272
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4628
+#: functions.php:4610
#, fuzzy
msgid "Display original article content"
msgstr "Mutasd az utolsó hír időpontját"
-#: functions.php:4635 functions.php:5302
+#: functions.php:4617 functions.php:5263
msgid "Show article summary in new window"
msgstr ""
-#: functions.php:4642 functions.php:5309
-#, fuzzy
-msgid "Publish article with a note"
-msgstr "Hír publikálása"
-
-#: functions.php:4682 functions.php:5226
+#: functions.php:4650 functions.php:5187
#, fuzzy
msgid "unknown type"
msgstr "Ismeretlen hiba"
-#: functions.php:4688 functions.php:5232
+#: functions.php:4656 functions.php:5193
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4724 functions.php:5266
+#: functions.php:4692 functions.php:5227
msgid "Attachment:"
msgstr "Csatolmány:"
-#: functions.php:4726 functions.php:5268
+#: functions.php:4694 functions.php:5229
msgid "Attachments:"
msgstr "Csatolmányok:"
-#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
+#: functions.php:4714 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:4802
+#: functions.php:4770
msgid "Feed not found."
msgstr "Feed nem található"
-#: functions.php:4871 mobile/functions.php:423
+#: functions.php:4839 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5193
+#: functions.php:5161
#, fuzzy
msgid "Click to expand article"
msgstr "Tárolt hírek"
-#: functions.php:5327
-#, fuzzy
-msgid "toggle unread"
-msgstr "Megjelöl"
-
-#: functions.php:5346
+#: functions.php:5298
#, fuzzy
msgid "No unread articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5349
+#: functions.php:5301
#, fuzzy
msgid "No updated articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5352
+#: functions.php:5304
#, fuzzy
msgid "No starred articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5356
+#: functions.php:5308
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:5358 localized_js.php:92 offline.js:444
+#: functions.php:5310 localized_js.php:92 offline.js:444
#, fuzzy
msgid "No articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:6049 tt-rss.php:204
+#: functions.php:5984 tt-rss.php:206
#, fuzzy
msgid "Create label..."
msgstr "Címke készítése"
-#: functions.php:6062
+#: functions.php:5997
#, fuzzy
msgid "(remove)"
msgstr "Eltávolít"
-#: functions.php:6106
+#: functions.php:6041
msgid "no tags"
msgstr ""
-#: functions.php:6134
-msgid "edit note"
-msgstr ""
-
#: localized_js.php:36
msgid "Adding feed..."
msgstr ""
@@ -593,17 +575,17 @@ msgstr "Minden hírt olvasottá tesz itt: %s?"
msgid "Mark all articles in %s as read?"
msgstr "Minden hírt olvasottá tesz itt: %s?"
-#: localized_js.php:84 viewfeed.js:1250
+#: localized_js.php:84 viewfeed.js:1212
#, php-format
msgid "Mark all visible articles in %s as read?"
msgstr ""
-#: localized_js.php:86 viewfeed.js:1923
+#: localized_js.php:86 viewfeed.js:1885
#, php-format
msgid "Mark %d article(s) as read?"
msgstr ""
-#: localized_js.php:87 viewfeed.js:1289
+#: localized_js.php:87 viewfeed.js:1251
#, php-format
msgid "Mark %d selected articles in %s as read?"
msgstr ""
@@ -616,16 +598,16 @@ msgstr ""
msgid "New password cannot be blank."
msgstr ""
-#: localized_js.php:90 viewfeed.js:1880
+#: localized_js.php:90 viewfeed.js:1842
msgid "No article is selected."
msgstr ""
-#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
-#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
+#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
+#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
msgid "No articles are selected."
msgstr ""
-#: localized_js.php:93 viewfeed.js:1921
+#: localized_js.php:93 viewfeed.js:1883
msgid "No articles found to mark"
msgstr ""
@@ -638,7 +620,7 @@ msgstr "Nincs kategória kiválaszta."
msgid "No feeds are selected."
msgstr "Nincs feed kiválasztva."
-#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
+#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
msgid "No feed selected."
msgstr ""
@@ -703,7 +685,7 @@ msgstr ""
msgid "Please select some feed first."
msgstr ""
-#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
+#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
msgid "Please wait..."
msgstr "Kérem várjon"
@@ -711,8 +693,8 @@ msgstr "Kérem várjon"
msgid "Please wait until operation finishes."
msgstr ""
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
-#: viewfeed.js:669
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
+#: viewfeed.js:631
msgid "Publish article"
msgstr "Hír publikálása"
@@ -862,7 +844,7 @@ msgstr ""
msgid "Saving user..."
msgstr ""
-#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
+#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
msgid "Star article"
msgstr "Csillagoz hí"
@@ -940,11 +922,11 @@ msgstr ""
msgid "Trying to change password..."
msgstr ""
-#: localized_js.php:170 viewfeed.js:657
+#: localized_js.php:170 viewfeed.js:618
msgid "Unpublish article"
msgstr "Hír nem publikálása"
-#: localized_js.php:172 viewfeed.js:586
+#: localized_js.php:172 viewfeed.js:553
msgid "Unstar article"
msgstr ""
@@ -987,8 +969,8 @@ msgid ""
"switch it into offline mode again. Go online?"
msgstr ""
-#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
+#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Cím"
@@ -1014,7 +996,7 @@ msgstr ""
msgid "Filter article"
msgstr ""
-#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
msgid "Mark as read"
msgstr "Olvasottá tesz"
@@ -1334,12 +1316,12 @@ msgstr "Kilépés a beállításokból"
msgid "Logout"
msgstr "Kijelentkezés"
-#: prefs.php:117 tt-rss.php:208
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Hírek törlése"
-#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Beállítások"
@@ -1364,7 +1346,7 @@ msgstr "Feed böngészése letilva az adminisztrátor által."
#: 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 modules/pref-feeds.php:869
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Vissza az RSS olvasóhoz"
@@ -1463,117 +1445,122 @@ msgstr "Címke mentése"
msgid "Search..."
msgstr "Keresés"
-#: tt-rss.php:191
+#: tt-rss.php:193
msgid "Feed actions:"
msgstr "Feed művelet:"
-#: tt-rss.php:192
+#: tt-rss.php:194
#, fuzzy
msgid "Subscribe to feed..."
msgstr "Feliratkozás feedre"
-#: tt-rss.php:193
+#: tt-rss.php:195
#, fuzzy
msgid "Edit this feed..."
msgstr "Összes feed"
-#: tt-rss.php:194
+#: tt-rss.php:196
#, fuzzy
msgid "Clear articles"
msgstr "Minden hír"
-#: tt-rss.php:195
+#: tt-rss.php:197
#, fuzzy
msgid "Rescore feed"
msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
-#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
+#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Leiratkozás"
-#: tt-rss.php:198
+#: tt-rss.php:200
msgid "All feeds:"
msgstr "Minden feed:"
-#: tt-rss.php:200 help/3.php:44
+#: tt-rss.php:202 help/3.php:44
#, fuzzy
msgid "(Un)hide read feeds"
msgstr "&nbsp;&nbsp;Megmutatja/elrejti az olvasott feedeket"
-#: tt-rss.php:202
+#: tt-rss.php:204
msgid "Other actions:"
msgstr "Más művelet:"
-#: tt-rss.php:205
+#: tt-rss.php:207
#, fuzzy
msgid "Create filter..."
msgstr "Szárő készítése"
-#: tt-rss.php:206
+#: tt-rss.php:208
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
-#: tt-rss.php:207
+#: tt-rss.php:209
#, fuzzy
msgid "Reset category order"
msgstr "Kiválasztott kategória eltávolítása?"
-#: tt-rss.php:218
+#: tt-rss.php:210
+#, fuzzy
+msgid "&nbsp;&nbsp;Keyboard shortcuts"
+msgstr "&nbsp;&nbsp;Hírek törlése"
+
+#: tt-rss.php:219
#, fuzzy
msgid "Collapse feedlist"
msgstr "Minden feed"
-#: tt-rss.php:220
+#: tt-rss.php:221
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:228 mobile/functions.php:738
+#: tt-rss.php:229 mobile/functions.php:738
msgid "Search:"
msgstr "Keresés"
-#: tt-rss.php:236 mobile/functions.php:456
+#: tt-rss.php:237 mobile/functions.php:456
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:237 mobile/functions.php:457
+#: tt-rss.php:238 mobile/functions.php:457
msgid "All Articles"
msgstr "Minden hír"
-#: tt-rss.php:240
+#: tt-rss.php:241
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
+#: tt-rss.php:242 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:244
+#: tt-rss.php:245
#, fuzzy
msgid "Order:"
msgstr "Más:"
-#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:461
#, fuzzy
msgid "Date"
msgstr "Frissítés"
-#: tt-rss.php:250
+#: tt-rss.php:251
msgid "Score"
msgstr ""
-#: tt-rss.php:254
+#: tt-rss.php:255
msgid "Limit:"
msgstr "Limit:"
-#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Frissítés"
-#: tt-rss.php:297
+#: tt-rss.php:298
msgid "Drag me to resize panels"
msgstr ""
@@ -1760,7 +1747,7 @@ msgstr "Mégse"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
@@ -1789,6 +1776,12 @@ msgstr "Ez a feed"
msgid "Create Filter"
msgstr "Szárő készítése"
+#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
+#: modules/pref-filters.php:39 modules/pref-filters.php:96
+#, fuzzy
+msgid "description"
+msgstr "Kiválasztottakat"
+
#: modules/popup-dialog.php:245 modules/pref-filters.php:42
#: modules/pref-filters.php:402
msgid "Match"
@@ -1957,167 +1950,167 @@ msgstr "Képek helyi tárolása"
msgid "Multiple Feed Editor"
msgstr "Feed editor"
-#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:840
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:842
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:860
msgid "Edit subscription options"
msgstr ""
-#: modules/pref-feeds.php:950
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr ""
-#: modules/pref-feeds.php:973
+#: modules/pref-feeds.php:969
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr ""
-#: modules/pref-feeds.php:1004
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr ""
-#: modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Kategória létrehozása"
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Nincs feed kategória definiálva"
-#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
#: modules/pref-filters.php:505 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Eltávolít"
-#: modules/pref-feeds.php:1114
+#: 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:1136 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:1141
+#: modules/pref-feeds.php:1134
#, fuzzy
msgid "More Feeds"
msgstr "Címke mentése"
-#: modules/pref-feeds.php:1215
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Mutasd az utolsó hír időpontját"
-#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Utolsó&nbsp;Hír"
-#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
#: modules/pref-users.php:449
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1327
+#: modules/pref-feeds.php:1320
msgid "(Hidden)"
msgstr ""
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1333
#, php-format
msgid "(linked to %s)"
msgstr ""
-#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "Kiválaszt:"
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Újrakategorizál"
-#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
#: modules/pref-users.php:472
msgid "Edit"
msgstr "Szerkesztés"
-#: modules/pref-feeds.php:1384
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Feed adatok törlése"
-#: modules/pref-feeds.php:1389 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:1396
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Más:"
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Kategóriák szerkesztése"
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "File:"
-#: modules/pref-feeds.php:1413
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importálás"
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Exportálás OPML-be"
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Firefox integráció"
-#: modules/pref-feeds.php:1425
+#: 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:1429
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1438
+#: 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:1442
+#: modules/pref-feeds.php:1433
#, fuzzy
msgid "Link to published articles feed."
msgstr "Publikált hírek"
-#: modules/pref-feeds.php:1445
+#: modules/pref-feeds.php:1436
#, fuzzy
msgid "Generate another link"
msgstr "Másik cím genrálása"
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1502
#, fuzzy
msgid "No feeds found."
msgstr "Nem található feed a feliratkozáshoz."
@@ -2141,6 +2134,14 @@ msgstr ""
msgid "Create filter"
msgstr "Szárő készítése"
+#: modules/pref-filters.php:392
+msgid "filter_type_descr"
+msgstr ""
+
+#: modules/pref-filters.php:393
+msgid "action_description"
+msgstr ""
+
#: modules/pref-filters.php:404
#, fuzzy
msgid "Field"
@@ -2284,6 +2285,10 @@ msgstr "Kinézet választó"
msgid "Change theme"
msgstr "Kinlzet megváltozatása"
+#: modules/pref-prefs.php:388
+msgid "short_desc"
+msgstr ""
+
#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Igen"
@@ -2664,25 +2669,15 @@ msgstr "Egyezés ezzel:"
msgid "Internal error: Function not implemented"
msgstr ""
-#: viewfeed.js:2193
-#, fuzzy
-msgid "Please enter a note for this article:"
-msgstr "Add meg a címke címét:"
-
-#, fuzzy
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;Hírek törlése"
-
-#, fuzzy
-#~ msgid "description"
-#~ msgstr "Kiválasztottakat"
-
#~ msgid "Loading help..."
#~ msgstr "Segítség betöltése..."
#~ msgid "Saving label..."
#~ msgstr "Címke mentése"
+#~ msgid "Please enter label title:"
+#~ msgstr "Add meg a címke címét:"
+
#~ msgid "Fatal Error"
#~ msgstr "Végzetes Hiba"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 4d0a6c0ef..ac28ccb5f 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 a938946d7..232b75e67 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-03-21 23:14+0300\n"
+"POT-Creation-Date: 2009-02-20 15:55+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:247 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
msgid "Default"
msgstr "Predefinito"
@@ -107,20 +107,12 @@ msgid "Unknown error"
msgstr "Errore sconosciuto"
#: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
+msgid "This program requires XmlHttpRequest "
msgstr ""
-"Questo programma richiede XmlHttpRequest per funzionare correttamente. Il "
-"browser sembra non supportarla."
#: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
+msgid "This program requires cookies "
msgstr ""
-"Questo programma richiede i cookie per funzionare correttamente. Il browser "
-"sembra non supportarli."
#: errors.php:11
msgid "Backend sanity check failed"
@@ -177,186 +169,181 @@ msgstr ""
"Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
"configurazione del PHP"
-#: functions.php:2846 modules/popup-dialog.php:175
+#: functions.php:2841 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Tutti i notiziari"
-#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
-#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
+#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
+#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Senza categoria"
-#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
+#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
#: mobile/functions.php:33
msgid "Special"
msgstr "Speciale"
-#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
-#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
+#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
+#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Etichette"
-#: functions.php:2924 functions.php:3347 functions.php:4144
+#: functions.php:2919 functions.php:3342 functions.php:4127
#: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
#: offline.js:1425
msgid "Starred articles"
msgstr "Articoli con stella"
-#: functions.php:2926 functions.php:3351 functions.php:4151
-#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
+#: functions.php:2921 functions.php:3346 functions.php:4134
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Articoli pubblicati"
-#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
+#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Articoli nuovi"
-#: functions.php:2930 functions.php:3360 functions.php:4122
+#: functions.php:2925 functions.php:3355 functions.php:4105
#: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
#: offline.js:1427
#, fuzzy
msgid "All articles"
msgstr "Tutti gli articoli"
-#: functions.php:3311 functions.php:3313
+#: functions.php:3306 functions.php:3308
msgid "Search results"
msgstr "Risultati della ricerca"
-#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
-#: functions.php:3358 functions.php:3361 functions.php:3369
+#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
+#: functions.php:3353 functions.php:3356 functions.php:3364
msgid "Searched for"
msgstr "Ricerca"
-#: functions.php:4001
+#: functions.php:3984
msgid "Generated feed"
msgstr "Notiziario generato"
-#: functions.php:4006 functions.php:5292 localized_js.php:148
-#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
+#: functions.php:3989 functions.php:5253 localized_js.php:148
+#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
#: modules/pref-filters.php:366 modules/pref-labels.php:163
#: modules/pref-users.php:401 offline.js:409
msgid "Select:"
msgstr "Seleziona:"
-#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
-#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
+#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
+#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
#: modules/pref-labels.php:164 modules/pref-users.php:402
#: mobile/functions.php:570
msgid "All"
msgstr "Tutti"
-#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
+#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Non letti"
-#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
+#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
msgid "Invert"
msgstr "Inverti"
-#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
-#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
+#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
+#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
#: modules/pref-labels.php:165 modules/pref-users.php:403
#: mobile/functions.php:572
msgid "None"
msgstr "Nessuno"
-#: functions.php:4018 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1378 offline.js:185
+#: functions.php:4001 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1371 offline.js:185
msgid "Actions..."
msgstr "Azioni..."
-#: functions.php:4023 localized_js.php:150
+#: functions.php:4006 localized_js.php:150
msgid "Selection toggle:"
msgstr "Inverti selezione:"
-#: functions.php:4025 localized_js.php:152 tt-rss.php:238
+#: functions.php:4008 localized_js.php:152 tt-rss.php:239
#: mobile/functions.php:459
msgid "Starred"
msgstr "Con stella"
-#: functions.php:4026
+#: functions.php:4009
msgid "Published"
msgstr "Pubblicati"
-#: functions.php:4028 localized_js.php:85
+#: functions.php:4011 localized_js.php:85
msgid "Mark as read:"
msgstr "Segna come letti:"
-#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
msgid "Selection"
msgstr "Selezione"
-#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
msgid "Entire feed"
msgstr "Intero notiziario"
-#: functions.php:4035
+#: functions.php:4018
#, fuzzy
msgid "Assign label:"
msgstr "Assegna etichette"
-#: functions.php:4076 localized_js.php:56
+#: functions.php:4059 localized_js.php:56
msgid "Click to collapse category"
msgstr "Fare clic per contrarre la categoria"
-#: functions.php:4342
+#: functions.php:4325
msgid "No feeds to display."
msgstr "Nessun notiziario da visualizzare."
-#: functions.php:4359 mobile/functions.php:12
+#: functions.php:4342 mobile/functions.php:12
msgid "Tags"
msgstr "Etichette"
-#: functions.php:4596
+#: functions.php:4578
msgid " - "
msgstr " - "
-#: functions.php:4620 functions.php:5320
+#: functions.php:4602 functions.php:5272
msgid "Edit tags for this article"
msgstr "Modifica le etichette per questo articolo"
-#: functions.php:4628
+#: functions.php:4610
msgid "Display original article content"
msgstr "Visualizza il contenuto originale dell&apos;articolo"
-#: functions.php:4635 functions.php:5302
+#: functions.php:4617 functions.php:5263
msgid "Show article summary in new window"
msgstr "Mostra il sommario dell&apos;articolo in una nuova finestra"
-#: functions.php:4642 functions.php:5309
-#, fuzzy
-msgid "Publish article with a note"
-msgstr "Pubblica articolo"
-
-#: functions.php:4682 functions.php:5226
+#: functions.php:4650 functions.php:5187
msgid "unknown type"
msgstr "tipo sconosciuto"
-#: functions.php:4688 functions.php:5232
+#: functions.php:4656 functions.php:5193
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4724 functions.php:5266
+#: functions.php:4692 functions.php:5227
msgid "Attachment:"
msgstr "Allegato:"
-#: functions.php:4726 functions.php:5268
+#: functions.php:4694 functions.php:5229
msgid "Attachments:"
msgstr "Allegati:"
-#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
+#: functions.php:4714 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:4802
+#: functions.php:4770
msgid "Feed not found."
msgstr "Notiziario non trovato."
-#: functions.php:4871 mobile/functions.php:423
+#: functions.php:4839 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -364,56 +351,47 @@ msgstr ""
"Impossibile visualizzare il notiziario (interrogazione fallita). Controllare "
"che l&apos;etichetta corrisponda alla sintassi o la configurazione locale."
-#: functions.php:5193
+#: functions.php:5161
msgid "Click to expand article"
msgstr "Fare clic per espandere l&apos;articolo"
-#: functions.php:5327
-#, fuzzy
-msgid "toggle unread"
-msgstr "Inverti non letti"
-
-#: functions.php:5346
+#: functions.php:5298
msgid "No unread articles found to display."
msgstr "Nessun articolo non letto trovato da visualizzare."
-#: functions.php:5349
+#: functions.php:5301
#, fuzzy
msgid "No updated articles found to display."
msgstr "Nessun articolo non letto trovato da visualizzare."
-#: functions.php:5352
+#: functions.php:5304
msgid "No starred articles found to display."
msgstr "Nessun articolo con stella trovato da visualizzare."
-#: functions.php:5356
+#: functions.php:5308
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:5358 localized_js.php:92 offline.js:444
+#: functions.php:5310 localized_js.php:92 offline.js:444
msgid "No articles found to display."
msgstr "Nessun articolo trovato da visualizzare."
-#: functions.php:6049 tt-rss.php:204
+#: functions.php:5984 tt-rss.php:206
#, fuzzy
msgid "Create label..."
msgstr "Crea etichetta"
-#: functions.php:6062
+#: functions.php:5997
#, fuzzy
msgid "(remove)"
msgstr "Rimuovi"
-#: functions.php:6106
+#: functions.php:6041
msgid "no tags"
msgstr "nessuna etichetta"
-#: functions.php:6134
-msgid "edit note"
-msgstr ""
-
#: localized_js.php:36
msgid "Adding feed..."
msgstr "Aggiunta notiziario..."
@@ -606,17 +584,17 @@ msgstr "Segnare tutti gli articoli come letti?"
msgid "Mark all articles in %s as read?"
msgstr "Segnare tutti gli articoli in «%s» come letti?"
-#: localized_js.php:84 viewfeed.js:1250
+#: localized_js.php:84 viewfeed.js:1212
#, php-format
msgid "Mark all visible articles in %s as read?"
msgstr "Segnare tutti gli articoli visibili in «%s» come letti?"
-#: localized_js.php:86 viewfeed.js:1923
+#: localized_js.php:86 viewfeed.js:1885
#, php-format
msgid "Mark %d article(s) as read?"
msgstr "Segnare %d articolo/i come letto/i?"
-#: localized_js.php:87 viewfeed.js:1289
+#: localized_js.php:87 viewfeed.js:1251
#, php-format
msgid "Mark %d selected articles in %s as read?"
msgstr "Segnare %d articoli selezionati in «%s» come letti?"
@@ -629,16 +607,16 @@ msgstr "Segnatura dei notiziari come letti..."
msgid "New password cannot be blank."
msgstr "La nuova password non può essere vuota."
-#: localized_js.php:90 viewfeed.js:1880
+#: localized_js.php:90 viewfeed.js:1842
msgid "No article is selected."
msgstr "Nessun articolo selezionato."
-#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
-#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
+#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
+#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
msgid "No articles are selected."
msgstr "Nessun articolo selezionato."
-#: localized_js.php:93 viewfeed.js:1921
+#: localized_js.php:93 viewfeed.js:1883
msgid "No articles found to mark"
msgstr "Nessun articolo trovato da segnare"
@@ -651,7 +629,7 @@ msgstr "Nessuna categoria selezionata."
msgid "No feeds are selected."
msgstr "Nessun notiziario selezionato."
-#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
+#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
msgid "No feed selected."
msgstr "Nessun notiziario selezionato."
@@ -716,7 +694,7 @@ msgstr "Selezionare un solo utente."
msgid "Please select some feed first."
msgstr "Selezionare prima qualche notiziario."
-#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
+#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
msgid "Please wait..."
msgstr "Attendere prego..."
@@ -724,8 +702,8 @@ msgstr "Attendere prego..."
msgid "Please wait until operation finishes."
msgstr ""
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
-#: viewfeed.js:669
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
+#: viewfeed.js:631
msgid "Publish article"
msgstr "Pubblica articolo"
@@ -873,7 +851,7 @@ msgstr "Salvataggio filtro..."
msgid "Saving user..."
msgstr "Salvataggio utente..."
-#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
+#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
msgid "Star article"
msgstr "Metti la stella all&apos;articolo"
@@ -952,11 +930,11 @@ msgstr "Tentativo di cambio dell&apos;email..."
msgid "Trying to change password..."
msgstr "Tentativo di cambio della password..."
-#: localized_js.php:170 viewfeed.js:657
+#: localized_js.php:170 viewfeed.js:618
msgid "Unpublish article"
msgstr "Non pubblicare articolo"
-#: localized_js.php:172 viewfeed.js:586
+#: localized_js.php:172 viewfeed.js:553
msgid "Unstar article"
msgstr "Togli la stella all&apos;articolo"
@@ -999,8 +977,8 @@ msgid ""
"switch it into offline mode again. Go online?"
msgstr ""
-#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
+#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Titolo"
@@ -1026,7 +1004,7 @@ msgstr "Data dell&apos;articolo"
msgid "Filter article"
msgstr "Filtra articoli"
-#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
msgid "Mark as read"
msgstr "Segna come letto"
@@ -1384,11 +1362,11 @@ msgstr "Esci dalle preferenze"
msgid "Logout"
msgstr "Esci"
-#: prefs.php:117 tt-rss.php:208
+#: prefs.php:117
msgid "Keyboard shortcuts"
msgstr "Scorciatoie da tastiera"
-#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Preferenze"
@@ -1413,7 +1391,7 @@ msgstr "La lettura del notiziario è bloccata dall&apos;amministratore."
#: 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 modules/pref-feeds.php:869
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Ritorna a Tiny Tiny RSS"
@@ -1513,113 +1491,117 @@ msgstr "Cambiamento del punteggio dei notiziari..."
msgid "Search..."
msgstr "Cerca"
-#: tt-rss.php:191
+#: tt-rss.php:193
msgid "Feed actions:"
msgstr "Azioni notiziari:"
-#: tt-rss.php:192
+#: tt-rss.php:194
#, fuzzy
msgid "Subscribe to feed..."
msgstr "Sottoscrivi il notiziario"
-#: tt-rss.php:193
+#: tt-rss.php:195
#, fuzzy
msgid "Edit this feed..."
msgstr "Modifica notiziario"
-#: tt-rss.php:194
+#: tt-rss.php:196
#, fuzzy
msgid "Clear articles"
msgstr "Filtra articoli"
-#: tt-rss.php:195
+#: tt-rss.php:197
#, fuzzy
msgid "Rescore feed"
msgstr "Cambiamento del punteggio dei notiziari..."
-#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
+#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Annulla sottoscrizione"
-#: tt-rss.php:198
+#: tt-rss.php:200
msgid "All feeds:"
msgstr "Tutti i notiziari:"
-#: tt-rss.php:200 help/3.php:44
+#: tt-rss.php:202 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Visualizza/Nascondi notiziari letti"
-#: tt-rss.php:202
+#: tt-rss.php:204
msgid "Other actions:"
msgstr "Altre azioni:"
-#: tt-rss.php:205
+#: tt-rss.php:207
#, fuzzy
msgid "Create filter..."
msgstr "Crea filtro"
-#: tt-rss.php:206
+#: tt-rss.php:208
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;Reimposta disposizione UI"
-#: tt-rss.php:207
+#: tt-rss.php:209
#, fuzzy
msgid "Reset category order"
msgstr "Reimpostare l&apos;ordine dalla categoria?"
-#: tt-rss.php:218
+#: tt-rss.php:210
+msgid "&nbsp;&nbsp;Keyboard shortcuts"
+msgstr "&nbsp;&nbsp;Scorciatoie da tastiera"
+
+#: tt-rss.php:219
msgid "Collapse feedlist"
msgstr "Contrai elenco notiziari"
-#: tt-rss.php:220
+#: tt-rss.php:221
msgid "Toggle Feedlist"
msgstr "Inverti elenco notiziari"
-#: tt-rss.php:228 mobile/functions.php:738
+#: tt-rss.php:229 mobile/functions.php:738
msgid "Search:"
msgstr "Cerca:"
-#: tt-rss.php:236 mobile/functions.php:456
+#: tt-rss.php:237 mobile/functions.php:456
msgid "Adaptive"
msgstr "Adattivo"
-#: tt-rss.php:237 mobile/functions.php:457
+#: tt-rss.php:238 mobile/functions.php:457
msgid "All Articles"
msgstr "Tutti gli articoli"
-#: tt-rss.php:240
+#: tt-rss.php:241
msgid "Ignore Scoring"
msgstr "Ignora punteggio"
-#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
+#: tt-rss.php:242 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:244
+#: tt-rss.php:245
msgid "Order:"
msgstr "Ordine:"
-#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:461
msgid "Date"
msgstr "Data"
-#: tt-rss.php:250
+#: tt-rss.php:251
msgid "Score"
msgstr "Punteggio"
-#: tt-rss.php:254
+#: tt-rss.php:255
msgid "Limit:"
msgstr "Limite:"
-#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Aggiorna"
-#: tt-rss.php:297
+#: tt-rss.php:298
msgid "Drag me to resize panels"
msgstr "Trascina per ridimensionare i riquadri"
@@ -1824,7 +1806,7 @@ msgstr "Annulla"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
@@ -1851,6 +1833,12 @@ msgstr "Questo notiziario"
msgid "Create Filter"
msgstr "Crea filtro"
+#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
+#: modules/pref-filters.php:39 modules/pref-filters.php:96
+#, fuzzy
+msgid "description"
+msgstr "Selezione"
+
#: modules/popup-dialog.php:245 modules/pref-filters.php:42
#: modules/pref-filters.php:402
msgid "Match"
@@ -2011,141 +1999,141 @@ msgstr "Memorizzare le immagini localmente"
msgid "Multiple Feed Editor"
msgstr "Editor di notiziari multipli"
-#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr "Fatto tutto."
-#: modules/pref-feeds.php:840
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Sottoscrizione avvenuta a <b>%s</b>."
-#: modules/pref-feeds.php:842
+#: 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:864
+#: modules/pref-feeds.php:860
msgid "Edit subscription options"
msgstr ""
-#: modules/pref-feeds.php:950
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Editor categorie"
-#: modules/pref-feeds.php:973
+#: 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:1004
+#: 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:1021
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Crea categoria"
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Nessuna categoria notiziari definita."
-#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
#: modules/pref-filters.php:505 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Rimuovi"
-#: modules/pref-feeds.php:1114
+#: 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:1136 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:1141
+#: modules/pref-feeds.php:1134
#, fuzzy
msgid "More Feeds"
msgstr "Cambiamento del punteggio dei notiziari..."
-#: modules/pref-feeds.php:1215
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Mostrare l&apos;ora dell&apos;ultimo articolo"
-#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Ultimo&nbsp;articolo"
-#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
#: modules/pref-users.php:449
msgid "Click to edit"
msgstr "Fare clic per modificare"
-#: modules/pref-feeds.php:1327
+#: modules/pref-feeds.php:1320
msgid "(Hidden)"
msgstr ""
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1333
#, php-format
msgid "(linked to %s)"
msgstr ""
-#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "Selezione:"
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Reimposta categoria"
-#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
#: modules/pref-users.php:472
msgid "Edit"
msgstr "Modifica"
-#: modules/pref-feeds.php:1384
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "Eliminazione manuale"
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Pulisci i dati del notiziario"
-#: modules/pref-feeds.php:1389 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:1396
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Altro:"
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Modifica categorie"
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "File:"
-#: modules/pref-feeds.php:1413
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importa"
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Esporta OPML"
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Integrazione con Firefox"
-#: modules/pref-feeds.php:1425
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -2153,11 +2141,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:1429
+#: 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:1438
+#: 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."
@@ -2166,15 +2154,15 @@ msgstr ""
"possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
"sotto."
-#: modules/pref-feeds.php:1442
+#: modules/pref-feeds.php:1433
msgid "Link to published articles feed."
msgstr "Collegamento al notiziario degli articoli pubblicati."
-#: modules/pref-feeds.php:1445
+#: modules/pref-feeds.php:1436
msgid "Generate another link"
msgstr "Genera altro collegamento"
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1502
msgid "No feeds found."
msgstr "Nessun notiziario trovato."
@@ -2196,6 +2184,14 @@ msgstr "Filtro <b>%s</b> creato"
msgid "Create filter"
msgstr "Crea filtro"
+#: modules/pref-filters.php:392
+msgid "filter_type_descr"
+msgstr ""
+
+#: modules/pref-filters.php:393
+msgid "action_description"
+msgstr ""
+
#: modules/pref-filters.php:404
msgid "Field"
msgstr "Campo"
@@ -2336,6 +2332,10 @@ msgstr "Seleziona tema"
msgid "Change theme"
msgstr "Cambia tema"
+#: modules/pref-prefs.php:388
+msgid "short_desc"
+msgstr ""
+
#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Sì"
@@ -2700,18 +2700,6 @@ msgstr "Corrisponde a:"
msgid "Internal error: Function not implemented"
msgstr "Errore interno: funzione non implementata"
-#: viewfeed.js:2193
-#, fuzzy
-msgid "Please enter a note for this article:"
-msgstr "Inserire il titolo dell&apos;etichetta:"
-
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;Scorciatoie da tastiera"
-
-#, fuzzy
-#~ msgid "description"
-#~ msgstr "Selezione"
-
#~ msgid "display tags"
#~ msgstr "visualizza etichette"
@@ -2736,6 +2724,9 @@ msgstr "Inserire il titolo dell&apos;etichetta:"
#~ msgid "Address changed."
#~ msgstr "Indirizzo cambiato"
+#~ msgid "Please enter label title:"
+#~ msgstr "Inserire il titolo dell&apos;etichetta:"
+
#~ msgid ""
#~ "Rescore articles in all feeds? This operation may take a lot of time."
#~ msgstr ""
@@ -2767,8 +2758,8 @@ msgstr "Inserire il titolo dell&apos;etichetta:"
#~ "\t\t\tIn base all&apos;insieme di caratteri attuale del database si "
#~ "potrebbero avere delle corruzioni dei dati (caratteri accentati persi, "
#~ "ecc.). \n"
-#~ "\t\t\tDopo l&apos;aggiornamento, occorre impostare l&apos;opzione a «utf8» "
-#~ "<b>MYSQL_CHARSET</b> in config.php."
+#~ "\t\t\tDopo l&apos;aggiornamento, occorre impostare l&apos;opzione a "
+#~ "«utf8» <b>MYSQL_CHARSET</b> in config.php."
#~ msgid "Converting database..."
#~ msgstr "Conversione del database..."
@@ -3056,6 +3047,20 @@ msgstr "Inserire il titolo dell&apos;etichetta:"
#~ msgid "Test"
#~ msgstr "Prova"
+#~ msgid ""
+#~ "This program requires XmlHttpRequest to function properly. Your browser "
+#~ "doesn't seem to support it."
+#~ msgstr ""
+#~ "Questo programma richiede XmlHttpRequest per funzionare correttamente. Il "
+#~ "browser sembra non supportarla."
+
+#~ msgid ""
+#~ "This program requires cookies to function properly. Your browser doesn't "
+#~ "seem to support them."
+#~ msgstr ""
+#~ "Questo programma richiede i cookie per funzionare correttamente. Il "
+#~ "browser sembra non supportarli."
+
#~ msgid "Filter expression"
#~ msgstr "Espressione del filtro"
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 15ce2fe00..c033df851 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 7a8903596..111447dfc 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-03-21 23:14+0300\n"
+"POT-Creation-Date: 2009-02-20 15:55+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:247 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
msgid "Default"
msgstr "標準"
@@ -108,16 +108,12 @@ msgid "Unknown error"
msgstr "未知のエラー"
#: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
+msgid "This program requires XmlHttpRequest "
+msgstr "このプログラムは、XmlHttpRequest を要求します"
#: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
+msgid "This program requires cookies "
+msgstr "このプログラムはクッキーを要求します"
#: errors.php:11
msgid "Backend sanity check failed"
@@ -170,243 +166,229 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2846 modules/popup-dialog.php:175
+#: functions.php:2841 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "すべてのフィード"
-#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
-#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
+#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
+#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "カテゴリー割り当てなし"
-#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
+#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
#: mobile/functions.php:33
msgid "Special"
msgstr "特別"
-#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
-#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
+#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
+#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "ラベル"
-#: functions.php:2924 functions.php:3347 functions.php:4144
+#: functions.php:2919 functions.php:3342 functions.php:4127
#: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
#: offline.js:1425
msgid "Starred articles"
msgstr "お気に入りの記事"
-#: functions.php:2926 functions.php:3351 functions.php:4151
-#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
+#: functions.php:2921 functions.php:3346 functions.php:4134
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "公開済みの記事"
-#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
+#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "新しい記事"
-#: functions.php:2930 functions.php:3360 functions.php:4122
+#: functions.php:2925 functions.php:3355 functions.php:4105
#: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
#: offline.js:1427
#, fuzzy
msgid "All articles"
msgstr "すべての記事"
-#: functions.php:3311 functions.php:3313
+#: functions.php:3306 functions.php:3308
msgid "Search results"
msgstr "検索結果"
-#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
-#: functions.php:3358 functions.php:3361 functions.php:3369
+#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
+#: functions.php:3353 functions.php:3356 functions.php:3364
#, fuzzy
msgid "Searched for"
msgstr "検索"
-#: functions.php:4001
+#: functions.php:3984
msgid "Generated feed"
msgstr "生成したフィード"
-#: functions.php:4006 functions.php:5292 localized_js.php:148
-#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
+#: functions.php:3989 functions.php:5253 localized_js.php:148
+#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
#: modules/pref-filters.php:366 modules/pref-labels.php:163
#: modules/pref-users.php:401 offline.js:409
msgid "Select:"
msgstr "選択:"
-#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
-#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
+#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
+#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
#: modules/pref-labels.php:164 modules/pref-users.php:402
#: mobile/functions.php:570
msgid "All"
msgstr "すべて"
-#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
+#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "未読"
-#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
+#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
msgid "Invert"
msgstr "反転"
-#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
-#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
+#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
+#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
#: modules/pref-labels.php:165 modules/pref-users.php:403
#: mobile/functions.php:572
msgid "None"
msgstr "なし"
-#: functions.php:4018 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1378 offline.js:185
+#: functions.php:4001 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1371 offline.js:185
msgid "Actions..."
msgstr "操作..."
-#: functions.php:4023 localized_js.php:150
+#: functions.php:4006 localized_js.php:150
msgid "Selection toggle:"
msgstr "選択の切り替え:"
-#: functions.php:4025 localized_js.php:152 tt-rss.php:238
+#: functions.php:4008 localized_js.php:152 tt-rss.php:239
#: mobile/functions.php:459
msgid "Starred"
msgstr "お気に入り"
-#: functions.php:4026
+#: functions.php:4009
msgid "Published"
msgstr "公開済み"
-#: functions.php:4028 localized_js.php:85
+#: functions.php:4011 localized_js.php:85
msgid "Mark as read:"
msgstr "既読にする:"
-#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
msgid "Selection"
msgstr "選択"
-#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
msgid "Entire feed"
msgstr "フィードの入力"
-#: functions.php:4035
+#: functions.php:4018
#, fuzzy
msgid "Assign label:"
msgstr "タグの割り当て"
-#: functions.php:4076 localized_js.php:56
+#: functions.php:4059 localized_js.php:56
msgid "Click to collapse category"
msgstr "閉じたカテゴリーのクリック"
-#: functions.php:4342
+#: functions.php:4325
msgid "No feeds to display."
msgstr "表示するフィードがありません。"
-#: functions.php:4359 mobile/functions.php:12
+#: functions.php:4342 mobile/functions.php:12
msgid "Tags"
msgstr "タグ"
-#: functions.php:4596
+#: functions.php:4578
msgid " - "
msgstr " - "
-#: functions.php:4620 functions.php:5320
+#: functions.php:4602 functions.php:5272
msgid "Edit tags for this article"
msgstr "この記事のタグを編集する"
-#: functions.php:4628
+#: functions.php:4610
#, fuzzy
msgid "Display original article content"
msgstr "記事の内容をスクロールする"
-#: functions.php:4635 functions.php:5302
+#: functions.php:4617 functions.php:5263
msgid "Show article summary in new window"
msgstr "記事の要約を新しいウィンドウで表示する"
-#: functions.php:4642 functions.php:5309
-#, fuzzy
-msgid "Publish article with a note"
-msgstr "公開記事"
-
-#: functions.php:4682 functions.php:5226
+#: functions.php:4650 functions.php:5187
msgid "unknown type"
msgstr "未知の種類"
-#: functions.php:4688 functions.php:5232
+#: functions.php:4656 functions.php:5193
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4724 functions.php:5266
+#: functions.php:4692 functions.php:5227
msgid "Attachment:"
msgstr "添付: "
-#: functions.php:4726 functions.php:5268
+#: functions.php:4694 functions.php:5229
msgid "Attachments:"
msgstr "添付:"
-#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
+#: functions.php:4714 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:4802
+#: functions.php:4770
msgid "Feed not found."
msgstr "フィードが見つかりません。"
-#: functions.php:4871 mobile/functions.php:423
+#: functions.php:4839 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5193
+#: functions.php:5161
msgid "Click to expand article"
msgstr "開いた記事のクリック"
-#: functions.php:5327
-#, fuzzy
-msgid "toggle unread"
-msgstr "未読に切り替える"
-
-#: functions.php:5346
+#: functions.php:5298
msgid "No unread articles found to display."
msgstr "表示する未読記事が見つかりませんでした。"
-#: functions.php:5349
+#: functions.php:5301
#, fuzzy
msgid "No updated articles found to display."
msgstr "表示する未読記事が見つかりませんでした。"
-#: functions.php:5352
+#: functions.php:5304
msgid "No starred articles found to display."
msgstr "表示するお気に入りの記事が見つかりませんでした。"
-#: functions.php:5356
+#: functions.php:5308
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:5358 localized_js.php:92 offline.js:444
+#: functions.php:5310 localized_js.php:92 offline.js:444
msgid "No articles found to display."
msgstr "表示する記事が見つかりません。"
-#: functions.php:6049 tt-rss.php:204
+#: functions.php:5984 tt-rss.php:206
#, fuzzy
msgid "Create label..."
msgstr "ラベルを作成する"
-#: functions.php:6062
+#: functions.php:5997
#, fuzzy
msgid "(remove)"
msgstr "削除"
-#: functions.php:6106
+#: functions.php:6041
msgid "no tags"
msgstr "タグがありません"
-#: functions.php:6134
-msgid "edit note"
-msgstr ""
-
#: localized_js.php:36
msgid "Adding feed..."
msgstr "フィードの追加中..."
@@ -595,17 +577,17 @@ msgstr "すべての記事を既読にしますか?"
msgid "Mark all articles in %s as read?"
msgstr "すべての記事を既読に設定しますか?"
-#: localized_js.php:84 viewfeed.js:1250
+#: localized_js.php:84 viewfeed.js:1212
#, php-format
msgid "Mark all visible articles in %s as read?"
msgstr "%s のすべての可視記事を既読に設定しますか?"
-#: localized_js.php:86 viewfeed.js:1923
+#: localized_js.php:86 viewfeed.js:1885
#, php-format
msgid "Mark %d article(s) as read?"
msgstr "%d 件のマークした記事を既読として設定しますか?"
-#: localized_js.php:87 viewfeed.js:1289
+#: localized_js.php:87 viewfeed.js:1251
#, php-format
msgid "Mark %d selected articles in %s as read?"
msgstr "選択した %d 件の記事を既読にしますか?"
@@ -618,16 +600,16 @@ msgstr "すべてのフィードを既読に設定しています..."
msgid "New password cannot be blank."
msgstr "新しいパスワードを空にできません。"
-#: localized_js.php:90 viewfeed.js:1880
+#: localized_js.php:90 viewfeed.js:1842
msgid "No article is selected."
msgstr "選択された記事はありません。"
-#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
-#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
+#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
+#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
msgid "No articles are selected."
msgstr "記事は選択されていません。"
-#: localized_js.php:93 viewfeed.js:1921
+#: localized_js.php:93 viewfeed.js:1883
msgid "No articles found to mark"
msgstr "マークした記事が見つかりません"
@@ -640,7 +622,7 @@ msgstr "選択されたカテゴリーはありません。"
msgid "No feeds are selected."
msgstr "選択されたフィードはありません。"
-#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
+#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
msgid "No feed selected."
msgstr "フィードは選択されていません。"
@@ -705,7 +687,7 @@ msgstr "ひとつだけユーザーを選択してください。"
msgid "Please select some feed first."
msgstr "はじめにいくつかのフィードを選択してください。"
-#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
+#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
msgid "Please wait..."
msgstr "しばらくお待ちください..."
@@ -713,8 +695,8 @@ msgstr "しばらくお待ちください..."
msgid "Please wait until operation finishes."
msgstr ""
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
-#: viewfeed.js:669
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
+#: viewfeed.js:631
msgid "Publish article"
msgstr "公開記事"
@@ -862,7 +844,7 @@ msgstr "フィルターの保存中..."
msgid "Saving user..."
msgstr "ユーザーの保存中..."
-#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
+#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
msgid "Star article"
msgstr "記事をお気に入りにする"
@@ -941,11 +923,11 @@ msgstr "電子メールの変更を試行中..."
msgid "Trying to change password..."
msgstr "パスワードの変更を試行中..."
-#: localized_js.php:170 viewfeed.js:657
+#: localized_js.php:170 viewfeed.js:618
msgid "Unpublish article"
msgstr "非公開記事"
-#: localized_js.php:172 viewfeed.js:586
+#: localized_js.php:172 viewfeed.js:553
msgid "Unstar article"
msgstr "記事のお気に入りを解除する"
@@ -988,8 +970,8 @@ msgid ""
"switch it into offline mode again. Go online?"
msgstr ""
-#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
+#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "題名"
@@ -1015,7 +997,7 @@ msgstr ""
msgid "Filter article"
msgstr "記事フィルター"
-#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
msgid "Mark as read"
msgstr "既読にする"
@@ -1337,12 +1319,12 @@ msgstr "設定を終了する"
msgid "Logout"
msgstr "ログアウト"
-#: prefs.php:117 tt-rss.php:208
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "キーボードショートカット"
-#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "設定"
@@ -1367,7 +1349,7 @@ msgstr "フィードブラウザーは管理者によって無効になってい
#: 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 modules/pref-feeds.php:869
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Tiny Tiny RSS に戻る"
@@ -1466,113 +1448,117 @@ msgstr "フィードのスコアの再計算中..."
msgid "Search..."
msgstr "検索"
-#: tt-rss.php:191
+#: tt-rss.php:193
msgid "Feed actions:"
msgstr "フィード操作"
-#: tt-rss.php:192
+#: tt-rss.php:194
#, fuzzy
msgid "Subscribe to feed..."
msgstr "フィードを購読する"
-#: tt-rss.php:193
+#: tt-rss.php:195
#, fuzzy
msgid "Edit this feed..."
msgstr "フィードを編集する"
-#: tt-rss.php:194
+#: tt-rss.php:196
#, fuzzy
msgid "Clear articles"
msgstr "記事フィルター"
-#: tt-rss.php:195
+#: tt-rss.php:197
#, fuzzy
msgid "Rescore feed"
msgstr "フィードのスコアの再計算中..."
-#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
+#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "購読をやめる"
-#: tt-rss.php:198
+#: tt-rss.php:200
msgid "All feeds:"
msgstr "すべてのフィード:"
-#: tt-rss.php:200 help/3.php:44
+#: tt-rss.php:202 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "読んだフィードを隠す/再表示する"
-#: tt-rss.php:202
+#: tt-rss.php:204
msgid "Other actions:"
msgstr "その他の操作:"
-#: tt-rss.php:205
+#: tt-rss.php:207
#, fuzzy
msgid "Create filter..."
msgstr "フィルターを作成する"
-#: tt-rss.php:206
+#: tt-rss.php:208
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;UI レイアウトのリセット"
-#: tt-rss.php:207
+#: tt-rss.php:209
#, fuzzy
msgid "Reset category order"
msgstr "選択されたカテゴリーの順序をリセットしますか?"
-#: tt-rss.php:218
+#: tt-rss.php:210
+msgid "&nbsp;&nbsp;Keyboard shortcuts"
+msgstr "&nbsp;&nbsp;キーボードショートカット"
+
+#: tt-rss.php:219
msgid "Collapse feedlist"
msgstr "フィード一覧を閉じる"
-#: tt-rss.php:220
+#: tt-rss.php:221
msgid "Toggle Feedlist"
msgstr "フィード一覧を切り替える"
-#: tt-rss.php:228 mobile/functions.php:738
+#: tt-rss.php:229 mobile/functions.php:738
msgid "Search:"
msgstr "検索:"
-#: tt-rss.php:236 mobile/functions.php:456
+#: tt-rss.php:237 mobile/functions.php:456
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:237 mobile/functions.php:457
+#: tt-rss.php:238 mobile/functions.php:457
msgid "All Articles"
msgstr "すべての記事"
-#: tt-rss.php:240
+#: tt-rss.php:241
msgid "Ignore Scoring"
msgstr "スコア計算の無効化"
-#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
+#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "更新日時"
-#: tt-rss.php:244
+#: tt-rss.php:245
msgid "Order:"
msgstr "並べ替え:"
-#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:461
msgid "Date"
msgstr "日付"
-#: tt-rss.php:250
+#: tt-rss.php:251
msgid "Score"
msgstr "スコア"
-#: tt-rss.php:254
+#: tt-rss.php:255
msgid "Limit:"
msgstr "制限:"
-#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "更新"
-#: tt-rss.php:297
+#: tt-rss.php:298
msgid "Drag me to resize panels"
msgstr "パネルの大きさを変更するにはここをドラッグします"
@@ -1761,7 +1747,7 @@ msgstr "取り消し"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
@@ -1788,6 +1774,11 @@ msgstr "このフィード"
msgid "Create Filter"
msgstr "フィルターを作成する"
+#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
+#: modules/pref-filters.php:39 modules/pref-filters.php:96
+msgid "description"
+msgstr "説明"
+
#: modules/popup-dialog.php:245 modules/pref-filters.php:42
#: modules/pref-filters.php:402
msgid "Match"
@@ -1951,140 +1942,140 @@ msgstr "ローカルに画像をキャッシュする"
msgid "Multiple Feed Editor"
msgstr "複数フィードエディター"
-#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr "すべて終了しました。"
-#: modules/pref-feeds.php:840
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "<b>%s</b> を購読しました。"
-#: modules/pref-feeds.php:842
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "<b>%s</b> は既に購読しています。"
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:860
msgid "Edit subscription options"
msgstr ""
-#: modules/pref-feeds.php:950
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "カテゴリーエディター"
-#: modules/pref-feeds.php:973
+#: 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:1004
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr "殻でないフィードカテゴリーは削除できません。"
-#: modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "カテゴリーの作成"
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "フィードカテゴリーが定義されていません。"
-#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
#: modules/pref-filters.php:505 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "削除"
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
-#: modules/pref-feeds.php:1136 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:1141
+#: modules/pref-feeds.php:1134
#, fuzzy
msgid "More Feeds"
msgstr "フィードのスコアの再計算中..."
-#: modules/pref-feeds.php:1215
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "最後の記事の時間を表示する"
-#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "最後の記事"
-#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
#: modules/pref-users.php:449
msgid "Click to edit"
msgstr "編集するにはクリック"
-#: modules/pref-feeds.php:1327
+#: modules/pref-feeds.php:1320
msgid "(Hidden)"
msgstr ""
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1333
#, php-format
msgid "(linked to %s)"
msgstr ""
-#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "選択:"
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "カテゴリー再設定"
-#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
#: modules/pref-users.php:472
msgid "Edit"
msgstr "編集"
-#: modules/pref-feeds.php:1384
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "手動削除"
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "フィードデータの消去"
-#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
msgid "Rescore articles"
msgstr "記事のスコアの再集計"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "その他:"
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "カテゴリーの編集"
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "ファイル:"
-#: modules/pref-feeds.php:1413
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "インポート"
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "OPML エクスポート"
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Firefox 統合"
-#: modules/pref-feeds.php:1425
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -2092,26 +2083,26 @@ msgstr ""
"下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
"Tiny RSS のサイトを使うことができます。"
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
-#: modules/pref-feeds.php:1438
+#: 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:1442
+#: modules/pref-feeds.php:1433
#, fuzzy
msgid "Link to published articles feed."
msgstr "公開済みの記事"
-#: modules/pref-feeds.php:1445
+#: modules/pref-feeds.php:1436
msgid "Generate another link"
msgstr "別のリンクを生成する"
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1502
msgid "No feeds found."
msgstr "フィードがありません。"
@@ -2133,6 +2124,14 @@ msgstr "フィルター <b>%s</b> を作成しました"
msgid "Create filter"
msgstr "フィルターを作成する"
+#: modules/pref-filters.php:392
+msgid "filter_type_descr"
+msgstr "filter_type_descr"
+
+#: modules/pref-filters.php:393
+msgid "action_description"
+msgstr "action_description"
+
#: modules/pref-filters.php:404
#, fuzzy
msgid "Field"
@@ -2274,6 +2273,10 @@ msgstr "テーマを選択する"
msgid "Change theme"
msgstr "テーマを変更する"
+#: modules/pref-prefs.php:388
+msgid "short_desc"
+msgstr ""
+
#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "はい"
@@ -2631,29 +2634,6 @@ msgstr "対象項目:"
msgid "Internal error: Function not implemented"
msgstr "インターナルエラー: 機能が実装されていません"
-#: viewfeed.js:2193
-#, fuzzy
-msgid "Please enter a note for this article:"
-msgstr "ラベルの題名を入力してください:"
-
-#~ msgid "This program requires XmlHttpRequest "
-#~ msgstr "このプログラムは、XmlHttpRequest を要求します"
-
-#~ msgid "This program requires cookies "
-#~ msgstr "このプログラムはクッキーを要求します"
-
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;キーボードショートカット"
-
-#~ msgid "description"
-#~ msgstr "説明"
-
-#~ msgid "filter_type_descr"
-#~ msgstr "filter_type_descr"
-
-#~ msgid "action_description"
-#~ msgstr "action_description"
-
#~ msgid "display tags"
#~ msgstr "タグの表示"
@@ -2678,6 +2658,9 @@ msgstr "ラベルの題名を入力してください:"
#~ msgid "Address changed."
#~ msgstr "アドレスを変更しました。"
+#~ msgid "Please enter label title:"
+#~ msgstr "ラベルの題名を入力してください:"
+
#~ msgid ""
#~ "Rescore articles in all feeds? This operation may take a lot of time."
#~ msgstr ""
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index d72240b69..88cb33f28 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 98891cf0c..6192f638e 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tiny Tiny RSS 1.3.2\n"
+"Project-Id-Version: Tiny Tiny RSS 1.2.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-21 23:14+0300\n"
-"PO-Revision-Date: 2009-03-21 19:22+0100\n"
+"POT-Creation-Date: 2009-02-20 15:55+0300\n"
+"PO-Revision-Date: 2009-02-20 13:47+0100\n"
"Last-Translator: Christian Lomsdalen <[email protected]>\n"
"Language-Team: Norwegian Bokmål <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgstr "Daglig"
msgid "Weekly"
msgstr "Ukentlig"
-#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
msgid "Default"
msgstr "Standard"
@@ -108,20 +108,12 @@ msgid "Unknown error"
msgstr "Ukjent feil"
#: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
-"Dette programmet krever XmlHttpRequest for å fungere slik det skal. Din "
-"nettleser ser ikke ut til å støtte dette."
+msgid "This program requires XmlHttpRequest "
+msgstr "Dette programmet krever XmlHttpRequest "
#: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
-"Dette programmet krever cookies for å fungere ordentlig. Din nettleser ser "
-"ikke ut til å støtte dette."
+msgid "This program requires cookies "
+msgstr "Dette programmet krever informasjonskapsler påslått"
#: errors.php:11
msgid "Backend sanity check failed"
@@ -177,183 +169,179 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
"SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
-#: functions.php:2846 modules/popup-dialog.php:175
+#: functions.php:2841 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Alle Nyhetsstrømmer"
-#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
-#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
+#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
+#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Ukategorisert"
-#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
+#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
#: mobile/functions.php:33
msgid "Special"
msgstr "Snarveier"
-#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
-#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
+#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
+#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Merkelapper"
-#: functions.php:2924 functions.php:3347 functions.php:4144
+#: functions.php:2919 functions.php:3342 functions.php:4127
#: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
#: offline.js:1425
msgid "Starred articles"
msgstr "Favorittartikler"
-#: functions.php:2926 functions.php:3351 functions.php:4151
-#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
+#: functions.php:2921 functions.php:3346 functions.php:4134
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Publiserte artikler"
-#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
+#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Ferske artikler"
-#: functions.php:2930 functions.php:3360 functions.php:4122
+#: functions.php:2925 functions.php:3355 functions.php:4105
#: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
#: offline.js:1427
msgid "All articles"
msgstr "Alle artikler"
-#: functions.php:3311 functions.php:3313
+#: functions.php:3306 functions.php:3308
msgid "Search results"
msgstr "Søkeresultat"
-#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
-#: functions.php:3358 functions.php:3361 functions.php:3369
+#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
+#: functions.php:3353 functions.php:3356 functions.php:3364
msgid "Searched for"
msgstr "Søkte etter"
-#: functions.php:4001
+#: functions.php:3984
msgid "Generated feed"
msgstr "Generert nyhetsstrøm"
-#: functions.php:4006 functions.php:5292 localized_js.php:148
-#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
+#: functions.php:3989 functions.php:5253 localized_js.php:148
+#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
#: modules/pref-filters.php:366 modules/pref-labels.php:163
#: modules/pref-users.php:401 offline.js:409
msgid "Select:"
msgstr "Velg:"
-#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
-#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
+#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
+#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
#: modules/pref-labels.php:164 modules/pref-users.php:402
#: mobile/functions.php:570
msgid "All"
msgstr "Alle"
-#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
+#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Ulest"
-#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
+#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
msgid "Invert"
msgstr "Motsatt"
-#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
-#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
+#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
+#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
#: modules/pref-labels.php:165 modules/pref-users.php:403
#: mobile/functions.php:572
msgid "None"
msgstr "Ingen"
-#: functions.php:4018 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1378 offline.js:185
+#: functions.php:4001 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1371 offline.js:185
msgid "Actions..."
msgstr "Handlinger..."
-#: functions.php:4023 localized_js.php:150
+#: functions.php:4006 localized_js.php:150
msgid "Selection toggle:"
msgstr "Marker utvalg:"
-#: functions.php:4025 localized_js.php:152 tt-rss.php:238
+#: functions.php:4008 localized_js.php:152 tt-rss.php:239
#: mobile/functions.php:459
msgid "Starred"
msgstr "Favoritter"
-#: functions.php:4026
+#: functions.php:4009
msgid "Published"
msgstr "Publisert"
-#: functions.php:4028 localized_js.php:85
+#: functions.php:4011 localized_js.php:85
msgid "Mark as read:"
msgstr "Marker som lest:"
-#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
msgid "Selection"
msgstr "Utvalg"
-#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
msgid "Entire feed"
msgstr "Hele nyhetsstrømmen"
-#: functions.php:4035
+#: functions.php:4018
msgid "Assign label:"
msgstr "Tildel stikkord:"
-#: functions.php:4076 localized_js.php:56
+#: functions.php:4059 localized_js.php:56
msgid "Click to collapse category"
msgstr "Velg for å slå sammen kategorien"
-#: functions.php:4342
+#: functions.php:4325
msgid "No feeds to display."
msgstr "Ingen nyhetstrømmer å vise"
-#: functions.php:4359 mobile/functions.php:12
+#: functions.php:4342 mobile/functions.php:12
msgid "Tags"
msgstr "Stikkord"
-#: functions.php:4596
+#: functions.php:4578
msgid " - "
msgstr "-"
-#: functions.php:4620 functions.php:5320
+#: functions.php:4602 functions.php:5272
msgid "Edit tags for this article"
msgstr "Rediger stikkordene for denne artikkelen"
-#: functions.php:4628
+#: functions.php:4610
msgid "Display original article content"
msgstr "Vis opprinnelig artikkelinnhold"
-#: functions.php:4635 functions.php:5302
+#: functions.php:4617 functions.php:5263
msgid "Show article summary in new window"
msgstr "Åpne artikkelsammendraget i nytt nettleservindu"
-#: functions.php:4642 functions.php:5309
-msgid "Publish article with a note"
-msgstr "Publiser artikkelen med et notat"
-
-#: functions.php:4682 functions.php:5226
+#: functions.php:4650 functions.php:5187
msgid "unknown type"
msgstr "Ukjent type"
-#: functions.php:4688 functions.php:5232
+#: functions.php:4656 functions.php:5193
msgid "audio/mpeg"
msgstr "Lyd/mpeg"
-#: functions.php:4724 functions.php:5266
+#: functions.php:4692 functions.php:5227
msgid "Attachment:"
msgstr "Vedlegg:"
-#: functions.php:4726 functions.php:5268
+#: functions.php:4694 functions.php:5229
msgid "Attachments:"
msgstr "Vedlegg:"
-#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
+#: functions.php:4714 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:4802
+#: functions.php:4770
msgid "Feed not found."
msgstr "Nyhetsstrømmen ble ikke funnet"
-#: functions.php:4871 mobile/functions.php:423
+#: functions.php:4839 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -361,27 +349,23 @@ msgstr ""
"Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
"merkelappsyntaksen eller lokal konfigurasjon."
-#: functions.php:5193
+#: functions.php:5161
msgid "Click to expand article"
msgstr "Trykk for å utvide artikkel"
-#: functions.php:5327
-msgid "toggle unread"
-msgstr "Merk som ulest"
-
-#: functions.php:5346
+#: functions.php:5298
msgid "No unread articles found to display."
msgstr "Ingen uleste artikler funnet som kunne vises"
-#: functions.php:5349
+#: functions.php:5301
msgid "No updated articles found to display."
msgstr "Ingen oppdaterte artikler funnet som kunne vises"
-#: functions.php:5352
+#: functions.php:5304
msgid "No starred articles found to display."
msgstr "Ingen markerte artikler som kan vises"
-#: functions.php:5356
+#: functions.php:5308
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -389,26 +373,22 @@ msgstr ""
"Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
"menyen ovenfor) eller bruke et filter."
-#: functions.php:5358 localized_js.php:92 offline.js:444
+#: functions.php:5310 localized_js.php:92 offline.js:444
msgid "No articles found to display."
msgstr "Ingen artikler funnet som kan vises"
-#: functions.php:6049 tt-rss.php:204
+#: functions.php:5984 tt-rss.php:206
msgid "Create label..."
msgstr "Lag merkelapp..."
-#: functions.php:6062
+#: functions.php:5997
msgid "(remove)"
msgstr "(fjern)"
-#: functions.php:6106
+#: functions.php:6041
msgid "no tags"
msgstr "Ingen stikkord"
-#: functions.php:6134
-msgid "edit note"
-msgstr "Endre notat"
-
#: localized_js.php:36
msgid "Adding feed..."
msgstr "Legger til nyhetsstrøm..."
@@ -584,17 +564,17 @@ msgstr "Marker alle artikler som leste?"
msgid "Mark all articles in %s as read?"
msgstr "Marker alle artikler i %s som leste?"
-#: localized_js.php:84 viewfeed.js:1250
+#: localized_js.php:84 viewfeed.js:1212
#, php-format
msgid "Mark all visible articles in %s as read?"
msgstr "Marker alle synlige artikler i %s som leste?"
-#: localized_js.php:86 viewfeed.js:1923
+#: localized_js.php:86 viewfeed.js:1885
#, php-format
msgid "Mark %d article(s) as read?"
msgstr "Marker %d artikkel/artikler som leste?"
-#: localized_js.php:87 viewfeed.js:1289
+#: localized_js.php:87 viewfeed.js:1251
#, php-format
msgid "Mark %d selected articles in %s as read?"
msgstr "Marker %d valgte artikler i %s som leste?"
@@ -607,16 +587,16 @@ msgstr "Marker alle nyhetsstrømmer som lest"
msgid "New password cannot be blank."
msgstr "Nytt passord kan ikke vært blankt."
-#: localized_js.php:90 viewfeed.js:1880
+#: localized_js.php:90 viewfeed.js:1842
msgid "No article is selected."
msgstr "Ingen artikkel er valgt."
-#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
-#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
+#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
+#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
msgid "No articles are selected."
msgstr "Ingen artikler er valgt."
-#: localized_js.php:93 viewfeed.js:1921
+#: localized_js.php:93 viewfeed.js:1883
msgid "No articles found to mark"
msgstr "Ingen artikler funnet som kan markeres"
@@ -629,7 +609,7 @@ msgstr "Ingen kategorier er valgt."
msgid "No feeds are selected."
msgstr "Ingen nyhetsstrømmer er valgt"
-#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
+#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
msgid "No feed selected."
msgstr "Ingen valgt nyhetsstrøm"
@@ -690,7 +670,7 @@ msgstr "Vennligst velg kun en bruker"
msgid "Please select some feed first."
msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
-#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
+#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
msgid "Please wait..."
msgstr "Vennligst vent..."
@@ -698,8 +678,8 @@ msgstr "Vennligst vent..."
msgid "Please wait until operation finishes."
msgstr "Vennligst venn til operasjonen avsluttes."
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
-#: viewfeed.js:669
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
+#: viewfeed.js:631
msgid "Publish article"
msgstr "Publiser artiklen"
@@ -838,7 +818,7 @@ msgstr "Lagrer filter..."
msgid "Saving user..."
msgstr "Lagrer bruker..."
-#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
+#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
msgid "Star article"
msgstr "Marker artikkel som favoritt"
@@ -914,11 +894,11 @@ msgstr "Prøver å endre e-posten..."
msgid "Trying to change password..."
msgstr "Prøver å endre passordet..."
-#: localized_js.php:170 viewfeed.js:657
+#: localized_js.php:170 viewfeed.js:618
msgid "Unpublish article"
msgstr "Fjern publiseringen av artikkelen."
-#: localized_js.php:172 viewfeed.js:586
+#: localized_js.php:172 viewfeed.js:553
msgid "Unstar article"
msgstr "Fjern favorittmerkingen fra artiklen"
@@ -965,8 +945,8 @@ msgstr ""
"Du kan ikke benytte tilgang til lesning uten internett-tilgang før du bytter "
"til denne modusen neste gang. Les med internett-tilgang?"
-#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
+#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Tittel"
@@ -992,7 +972,7 @@ msgstr "Artikkeldato"
msgid "Filter article"
msgstr "Filtrer artikkel"
-#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
msgid "Mark as read"
msgstr "Marker som lest"
@@ -1343,11 +1323,11 @@ msgstr "Forlat innstillinger"
msgid "Logout"
msgstr "Logg ut"
-#: prefs.php:117 tt-rss.php:208
+#: prefs.php:117
msgid "Keyboard shortcuts"
msgstr "Tastatursnarveier"
-#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Innstillinger"
@@ -1369,7 +1349,7 @@ msgstr "Registrering av nye brukere er administrativt avskrudd"
#: 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 modules/pref-feeds.php:869
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Returner til Tiny Tiny RSS"
@@ -1463,106 +1443,110 @@ msgstr "Flere nyhetsstrømmer..."
msgid "Search..."
msgstr "Søk..."
-#: tt-rss.php:191
+#: tt-rss.php:193
msgid "Feed actions:"
msgstr "Nyhetsstrømshandlinger:"
-#: tt-rss.php:192
+#: tt-rss.php:194
msgid "Subscribe to feed..."
msgstr "Abonner på nyhetsstrøm..."
-#: tt-rss.php:193
+#: tt-rss.php:195
msgid "Edit this feed..."
msgstr "Rediger nyhetsstrømmen..."
-#: tt-rss.php:194
+#: tt-rss.php:196
msgid "Clear articles"
msgstr "Fjern artikler"
-#: tt-rss.php:195
+#: tt-rss.php:197
msgid "Rescore feed"
msgstr "Sett poeng på nytt for nyhetskanalene"
-#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
+#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Avabonner"
-#: tt-rss.php:198
+#: tt-rss.php:200
msgid "All feeds:"
msgstr "Alle nyhetsstrømmer:"
-#: tt-rss.php:200 help/3.php:44
+#: tt-rss.php:202 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Skjul/vis leste nyhetsstrømmer"
-#: tt-rss.php:202
+#: tt-rss.php:204
msgid "Other actions:"
msgstr "Andre handlinger:"
-#: tt-rss.php:205
+#: tt-rss.php:207
msgid "Create filter..."
msgstr "Lag filter..."
-#: tt-rss.php:206
+#: tt-rss.php:208
msgid "Reset UI layout"
msgstr "Tilbakestill de grafiske instillingene"
-#: tt-rss.php:207
+#: tt-rss.php:209
msgid "Reset category order"
msgstr "Tilbakestill kategorirekkefølgen"
-#: tt-rss.php:218
+#: tt-rss.php:210
+msgid "&nbsp;&nbsp;Keyboard shortcuts"
+msgstr "&nbsp;&nbsp;Tastatursnarveier"
+
+#: tt-rss.php:219
msgid "Collapse feedlist"
msgstr "Skjul nyhetskanalsslisten"
-#: tt-rss.php:220
+#: tt-rss.php:221
msgid "Toggle Feedlist"
msgstr "Vis nyhetskanallisten"
-#: tt-rss.php:228 mobile/functions.php:738
+#: tt-rss.php:229 mobile/functions.php:738
msgid "Search:"
msgstr "Søk:"
-#: tt-rss.php:236 mobile/functions.php:456
+#: tt-rss.php:237 mobile/functions.php:456
msgid "Adaptive"
msgstr "Tilpasset"
-#: tt-rss.php:237 mobile/functions.php:457
+#: tt-rss.php:238 mobile/functions.php:457
msgid "All Articles"
msgstr "Alle artikler"
-#: tt-rss.php:240
+#: tt-rss.php:241
msgid "Ignore Scoring"
msgstr "Ignorer poenggivning"
-#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
+#: tt-rss.php:242 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:244
+#: tt-rss.php:245
msgid "Order:"
msgstr "Rekkefølge:"
-#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:461
msgid "Date"
msgstr "Dato"
-#: tt-rss.php:250
+#: tt-rss.php:251
msgid "Score"
msgstr "Poeng"
-#: tt-rss.php:254
+#: tt-rss.php:255
msgid "Limit:"
msgstr "Antall:"
-#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Oppdater"
-#: tt-rss.php:297
+#: tt-rss.php:298
msgid "Drag me to resize panels"
msgstr "Dra i meg for å endre størrelsen på panelene."
@@ -1759,7 +1743,7 @@ msgstr "Avbryt"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
@@ -1786,6 +1770,11 @@ msgstr "Denne nyhetsstrømmen"
msgid "Create Filter"
msgstr "Lag filter"
+#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
+#: modules/pref-filters.php:39 modules/pref-filters.php:96
+msgid "description"
+msgstr "beskrivelse"
+
#: modules/popup-dialog.php:245 modules/pref-filters.php:42
#: modules/pref-filters.php:402
msgid "Match"
@@ -1945,139 +1934,139 @@ msgstr "Mellomlagre bilder lokalt på serveren"
msgid "Multiple Feed Editor"
msgstr "Nyhetsstrømsredigerer"
-#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr "Alt ferdig."
-#: modules/pref-feeds.php:840
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Abonnerer på <b>%s</b>"
-#: modules/pref-feeds.php:842
+#: 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:864
+#: modules/pref-feeds.php:860
msgid "Edit subscription options"
msgstr "Rediger abonnementsalternativer"
-#: modules/pref-feeds.php:950
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Kategoriredigerer"
-#: modules/pref-feeds.php:973
+#: 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:1004
+#: 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:1021
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Lag kategori"
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Ingen kategorier ble markert"
-#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
#: modules/pref-filters.php:505 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Fjern"
-#: modules/pref-feeds.php:1114
+#: 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:1136 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:1141
+#: modules/pref-feeds.php:1134
msgid "More Feeds"
msgstr "Flere nyhetsstrømmer"
-#: modules/pref-feeds.php:1215
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Vis tidspunktene for siste artikkel"
-#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Siste&nbsp;Artikkel"
-#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
#: modules/pref-users.php:449
msgid "Click to edit"
msgstr "Trykk for å endre"
-#: modules/pref-feeds.php:1327
+#: modules/pref-feeds.php:1320
msgid "(Hidden)"
msgstr "(Skjult)"
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1333
#, php-format
msgid "(linked to %s)"
msgstr "(koblet til %s)"
-#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "Utvalg:"
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Rekategoriser"
-#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
#: modules/pref-users.php:472
msgid "Edit"
msgstr "Rediger"
-#: modules/pref-feeds.php:1384
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "Slett manuelt"
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Slett nyhetsstrømsdata"
-#: modules/pref-feeds.php:1389 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:1396
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Andre:"
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Rediger kategorier"
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "Fil:"
-#: modules/pref-feeds.php:1413
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importer"
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Eksporter OPML"
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Firefox integrering"
-#: modules/pref-feeds.php:1425
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -2085,11 +2074,11 @@ msgstr ""
"Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
"ved å trykke på lenken nedenfor."
-#: modules/pref-feeds.php:1429
+#: 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:1438
+#: 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."
@@ -2097,15 +2086,15 @@ 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:1442
+#: modules/pref-feeds.php:1433
msgid "Link to published articles feed."
msgstr "Lenke til nyhetsstrøm for publiserte artikler"
-#: modules/pref-feeds.php:1445
+#: modules/pref-feeds.php:1436
msgid "Generate another link"
msgstr "Genererer en ny adresse"
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1502
msgid "No feeds found."
msgstr "Ingen nyhetsstrømmer ble funnet."
@@ -2127,6 +2116,14 @@ msgstr "Laget filter <b>%s</b>"
msgid "Create filter"
msgstr "Lag filter"
+#: modules/pref-filters.php:392
+msgid "filter_type_descr"
+msgstr "Beskrivelse av filtertype"
+
+#: modules/pref-filters.php:393
+msgid "action_description"
+msgstr "Handlingsbeskrivelse"
+
#: modules/pref-filters.php:404
msgid "Field"
msgstr "Felt"
@@ -2265,6 +2262,10 @@ msgstr "Velg utseende"
msgid "Change theme"
msgstr "Endre utseende"
+#: modules/pref-prefs.php:388
+msgid "short_desc"
+msgstr "kort beskrivelse"
+
#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Ja"
@@ -2629,30 +2630,19 @@ msgstr "Match på:"
msgid "Internal error: Function not implemented"
msgstr "Intern feil: funksjonen er ikke implementert"
-#: viewfeed.js:2193
-msgid "Please enter a note for this article:"
-msgstr "Vennligst skriv inn et notat for denne artikkelen:"
-
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;Tastatursnarveier"
-
-#~ msgid "This program requires XmlHttpRequest "
-#~ msgstr "Dette programmet krever XmlHttpRequest "
-
-#~ msgid "This program requires cookies "
-#~ msgstr "Dette programmet krever informasjonskapsler påslått"
-
-#~ msgid "description"
-#~ msgstr "beskrivelse"
-
-#~ msgid "filter_type_descr"
-#~ msgstr "Beskrivelse av filtertype"
-
-#~ msgid "action_description"
-#~ msgstr "Handlingsbeskrivelse"
+#~ msgid ""
+#~ "This program requires XmlHttpRequest to function properly. Your browser "
+#~ "doesn't seem to support it."
+#~ msgstr ""
+#~ "Dette programmet krever XmlHttpRequest for å fungere slik det skal. Din "
+#~ "nettleser ser ikke ut til å støtte dette."
-#~ msgid "short_desc"
-#~ msgstr "kort beskrivelse"
+#~ msgid ""
+#~ "This program requires cookies to function properly. Your browser doesn't "
+#~ "seem to support them."
+#~ msgstr ""
+#~ "Dette programmet krever cookies for å fungere ordentlig. Din nettleser "
+#~ "ser ikke ut til å støtte dette."
#~ msgid "display tags"
#~ msgstr "Vis stikkord"
@@ -2678,6 +2668,9 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
#~ msgid "Address changed."
#~ msgstr "Adresse er endret"
+#~ msgid "Please enter label title:"
+#~ msgstr "Vennligst skriv inn merkelapp:"
+
#~ msgid ""
#~ "Rescore articles in all feeds? This operation may take a lot of time."
#~ msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index f51ff7a86..d6e88e467 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 b57af46e2..7bf396ee9 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-03-21 23:14+0300\n"
+"POT-Creation-Date: 2009-02-20 15:55+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:247 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
msgid "Default"
msgstr "Padrão"
@@ -111,16 +111,12 @@ msgid "Unknown error"
msgstr "Erro desconhecido"
#: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
+msgid "This program requires XmlHttpRequest "
+msgstr "Este programa requer XmlHttpRequest"
#: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
+msgid "This program requires cookies "
+msgstr "Este programa requer cookies "
#: errors.php:11
msgid "Backend sanity check failed"
@@ -170,247 +166,234 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2846 modules/popup-dialog.php:175
+#: functions.php:2841 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Todos os feeds"
-#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
-#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
+#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
+#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Não Categorizado"
-#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
+#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
#: mobile/functions.php:33
msgid "Special"
msgstr "Especial"
-#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
-#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
+#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
+#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr ""
-#: functions.php:2924 functions.php:3347 functions.php:4144
+#: functions.php:2919 functions.php:3342 functions.php:4127
#: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
#: offline.js:1425
msgid "Starred articles"
msgstr ""
-#: functions.php:2926 functions.php:3351 functions.php:4151
-#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
+#: functions.php:2921 functions.php:3346 functions.php:4134
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr ""
-#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
+#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr ""
-#: functions.php:2930 functions.php:3360 functions.php:4122
+#: functions.php:2925 functions.php:3355 functions.php:4105
#: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
#: offline.js:1427
#, fuzzy
msgid "All articles"
msgstr "Favoritos"
-#: functions.php:3311 functions.php:3313
+#: functions.php:3306 functions.php:3308
msgid "Search results"
msgstr ""
-#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
-#: functions.php:3358 functions.php:3361 functions.php:3369
+#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
+#: functions.php:3353 functions.php:3356 functions.php:3364
msgid "Searched for"
msgstr ""
-#: functions.php:4001
+#: functions.php:3984
msgid "Generated feed"
msgstr ""
-#: functions.php:4006 functions.php:5292 localized_js.php:148
-#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
+#: functions.php:3989 functions.php:5253 localized_js.php:148
+#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
#: modules/pref-filters.php:366 modules/pref-labels.php:163
#: modules/pref-users.php:401 offline.js:409
msgid "Select:"
msgstr "Selecione:"
-#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
-#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
+#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
+#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
#: modules/pref-labels.php:164 modules/pref-users.php:402
#: mobile/functions.php:570
msgid "All"
msgstr "Todos"
-#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
+#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Não Lido"
-#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
+#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(Inverso)"
-#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
-#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
+#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
+#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
#: modules/pref-labels.php:165 modules/pref-users.php:403
#: mobile/functions.php:572
msgid "None"
msgstr "Nenhum"
-#: functions.php:4018 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1378 offline.js:185
+#: functions.php:4001 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1371 offline.js:185
msgid "Actions..."
msgstr "Ações..."
-#: functions.php:4023 localized_js.php:150
+#: functions.php:4006 localized_js.php:150
#, fuzzy
msgid "Selection toggle:"
msgstr "Seleção"
-#: functions.php:4025 localized_js.php:152 tt-rss.php:238
+#: functions.php:4008 localized_js.php:152 tt-rss.php:239
#: mobile/functions.php:459
msgid "Starred"
msgstr "Favoritos"
-#: functions.php:4026
+#: functions.php:4009
msgid "Published"
msgstr "Publicado"
-#: functions.php:4028 localized_js.php:85
+#: functions.php:4011 localized_js.php:85
msgid "Mark as read:"
msgstr "Marcar como lido:"
-#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
msgid "Selection"
msgstr "Seleção"
-#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
msgid "Entire feed"
msgstr ""
-#: functions.php:4035
+#: functions.php:4018
msgid "Assign label:"
msgstr ""
-#: functions.php:4076 localized_js.php:56
+#: functions.php:4059 localized_js.php:56
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4342
+#: functions.php:4325
msgid "No feeds to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:4359 mobile/functions.php:12
+#: functions.php:4342 mobile/functions.php:12
msgid "Tags"
msgstr "Tags"
-#: functions.php:4596
+#: functions.php:4578
#, fuzzy
msgid " - "
msgstr " - por "
-#: functions.php:4620 functions.php:5320
+#: functions.php:4602 functions.php:5272
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4628
+#: functions.php:4610
msgid "Display original article content"
msgstr ""
-#: functions.php:4635 functions.php:5302
+#: functions.php:4617 functions.php:5263
msgid "Show article summary in new window"
msgstr ""
-#: functions.php:4642 functions.php:5309
-msgid "Publish article with a note"
-msgstr ""
-
-#: functions.php:4682 functions.php:5226
+#: functions.php:4650 functions.php:5187
#, fuzzy
msgid "unknown type"
msgstr "Erro desconhecido"
-#: functions.php:4688 functions.php:5232
+#: functions.php:4656 functions.php:5193
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4724 functions.php:5266
+#: functions.php:4692 functions.php:5227
msgid "Attachment:"
msgstr ""
-#: functions.php:4726 functions.php:5268
+#: functions.php:4694 functions.php:5229
msgid "Attachments:"
msgstr ""
-#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
+#: functions.php:4714 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:4802
+#: functions.php:4770
msgid "Feed not found."
msgstr "Feed não encontrado."
-#: functions.php:4871 mobile/functions.php:423
+#: functions.php:4839 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5193
+#: functions.php:5161
#, fuzzy
msgid "Click to expand article"
msgstr "Favoritos"
-#: functions.php:5327
-#, fuzzy
-msgid "toggle unread"
-msgstr "Marcar como favorito"
-
-#: functions.php:5346
+#: functions.php:5298
#, fuzzy
msgid "No unread articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5349
+#: functions.php:5301
#, fuzzy
msgid "No updated articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5352
+#: functions.php:5304
#, fuzzy
msgid "No starred articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5356
+#: functions.php:5308
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:5358 localized_js.php:92 offline.js:444
+#: functions.php:5310 localized_js.php:92 offline.js:444
#, fuzzy
msgid "No articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:6049 tt-rss.php:204
+#: functions.php:5984 tt-rss.php:206
#, fuzzy
msgid "Create label..."
msgstr "Criar um usuário"
-#: functions.php:6062
+#: functions.php:5997
#, fuzzy
msgid "(remove)"
msgstr "Remover"
-#: functions.php:6106
+#: functions.php:6041
msgid "no tags"
msgstr "sem tags"
-#: functions.php:6134
-msgid "edit note"
-msgstr ""
-
#: localized_js.php:36
msgid "Adding feed..."
msgstr "Adicionando o Feed..."
@@ -593,17 +576,17 @@ msgstr "Marcando todos os feeds como lidos..."
msgid "Mark all articles in %s as read?"
msgstr "Marcando todos os feeds como lidos..."
-#: localized_js.php:84 viewfeed.js:1250
+#: localized_js.php:84 viewfeed.js:1212
#, php-format
msgid "Mark all visible articles in %s as read?"
msgstr ""
-#: localized_js.php:86 viewfeed.js:1923
+#: localized_js.php:86 viewfeed.js:1885
#, php-format
msgid "Mark %d article(s) as read?"
msgstr ""
-#: localized_js.php:87 viewfeed.js:1289
+#: localized_js.php:87 viewfeed.js:1251
#, php-format
msgid "Mark %d selected articles in %s as read?"
msgstr ""
@@ -616,16 +599,16 @@ msgstr "Marcando todos os feeds como lidos..."
msgid "New password cannot be blank."
msgstr "A nova senha não pode ser vazia."
-#: localized_js.php:90 viewfeed.js:1880
+#: localized_js.php:90 viewfeed.js:1842
msgid "No article is selected."
msgstr ""
-#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
-#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
+#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
+#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
msgid "No articles are selected."
msgstr ""
-#: localized_js.php:93 viewfeed.js:1921
+#: localized_js.php:93 viewfeed.js:1883
msgid "No articles found to mark"
msgstr ""
@@ -638,7 +621,7 @@ msgstr "Nenhuma categoria foi selecionada."
msgid "No feeds are selected."
msgstr "Nenhum feed foi selecionado."
-#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
+#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
msgid "No feed selected."
msgstr "Nenhum feed foi selecionado."
@@ -700,7 +683,7 @@ msgstr "Por favor selecione somente um usuário."
msgid "Please select some feed first."
msgstr ""
-#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
+#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
msgid "Please wait..."
msgstr ""
@@ -708,8 +691,8 @@ msgstr ""
msgid "Please wait until operation finishes."
msgstr ""
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
-#: viewfeed.js:669
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
+#: viewfeed.js:631
msgid "Publish article"
msgstr ""
@@ -858,7 +841,7 @@ msgstr "Salvando o filtro..."
msgid "Saving user..."
msgstr "Salvando usuário"
-#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
+#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
#, fuzzy
msgid "Star article"
msgstr "Favoritos"
@@ -937,11 +920,11 @@ msgstr "Tentando mudar o E-mail..."
msgid "Trying to change password..."
msgstr "Tentando alterar senha ..."
-#: localized_js.php:170 viewfeed.js:657
+#: localized_js.php:170 viewfeed.js:618
msgid "Unpublish article"
msgstr ""
-#: localized_js.php:172 viewfeed.js:586
+#: localized_js.php:172 viewfeed.js:553
msgid "Unstar article"
msgstr ""
@@ -984,8 +967,8 @@ msgid ""
"switch it into offline mode again. Go online?"
msgstr ""
-#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
+#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Título"
@@ -1011,7 +994,7 @@ msgstr ""
msgid "Filter article"
msgstr ""
-#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
msgid "Mark as read"
msgstr "Marcar como lido"
@@ -1333,12 +1316,12 @@ msgstr "Sair das preferências"
msgid "Logout"
msgstr "Sair"
-#: prefs.php:117 tt-rss.php:208
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Criar filtro"
-#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Preferências"
@@ -1362,7 +1345,7 @@ msgstr ""
#: 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 modules/pref-feeds.php:869
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr ""
@@ -1459,116 +1442,121 @@ msgstr "Removendo o Feed..."
msgid "Search..."
msgstr ""
-#: tt-rss.php:191
+#: tt-rss.php:193
msgid "Feed actions:"
msgstr "Ações do Feed:"
-#: tt-rss.php:192
+#: tt-rss.php:194
#, fuzzy
msgid "Subscribe to feed..."
msgstr "Removendo o Feed..."
-#: tt-rss.php:193
+#: tt-rss.php:195
#, fuzzy
msgid "Edit this feed..."
msgstr "Editar"
-#: tt-rss.php:194
+#: tt-rss.php:196
#, fuzzy
msgid "Clear articles"
msgstr "Favoritos"
-#: tt-rss.php:195
+#: tt-rss.php:197
#, fuzzy
msgid "Rescore feed"
msgstr "Removendo o Feed..."
-#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
+#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr ""
-#: tt-rss.php:198
+#: tt-rss.php:200
msgid "All feeds:"
msgstr "Todos os Feeds:"
-#: tt-rss.php:200 help/3.php:44
+#: tt-rss.php:202 help/3.php:44
msgid "(Un)hide read feeds"
msgstr ""
-#: tt-rss.php:202
+#: tt-rss.php:204
msgid "Other actions:"
msgstr "Outras ações:"
-#: tt-rss.php:205
+#: tt-rss.php:207
#, fuzzy
msgid "Create filter..."
msgstr "Criar um usuário"
-#: tt-rss.php:206
+#: tt-rss.php:208
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;Editar esse Feed"
-#: tt-rss.php:207
+#: tt-rss.php:209
#, fuzzy
msgid "Reset category order"
msgstr "Remover as categorias selecionadas?"
-#: tt-rss.php:218
+#: tt-rss.php:210
+#, fuzzy
+msgid "&nbsp;&nbsp;Keyboard shortcuts"
+msgstr "&nbsp;&nbsp;Criar filtro"
+
+#: tt-rss.php:219
#, fuzzy
msgid "Collapse feedlist"
msgstr "Todos os feeds"
-#: tt-rss.php:220
+#: tt-rss.php:221
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:228 mobile/functions.php:738
+#: tt-rss.php:229 mobile/functions.php:738
msgid "Search:"
msgstr ""
-#: tt-rss.php:236 mobile/functions.php:456
+#: tt-rss.php:237 mobile/functions.php:456
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:237 mobile/functions.php:457
+#: tt-rss.php:238 mobile/functions.php:457
msgid "All Articles"
msgstr ""
-#: tt-rss.php:240
+#: tt-rss.php:241
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
+#: tt-rss.php:242 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:244
+#: tt-rss.php:245
#, fuzzy
msgid "Order:"
msgstr "Onde:"
-#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:461
#, fuzzy
msgid "Date"
msgstr "Atualizar"
-#: tt-rss.php:250
+#: tt-rss.php:251
msgid "Score"
msgstr ""
-#: tt-rss.php:254
+#: tt-rss.php:255
msgid "Limit:"
msgstr "Limite:"
-#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Atualizar"
-#: tt-rss.php:297
+#: tt-rss.php:298
msgid "Drag me to resize panels"
msgstr ""
@@ -1755,7 +1743,7 @@ msgstr "Cancelar"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
@@ -1783,6 +1771,11 @@ msgstr ""
msgid "Create Filter"
msgstr "Criar um usuário"
+#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
+#: modules/pref-filters.php:39 modules/pref-filters.php:96
+msgid "description"
+msgstr "descrição"
+
#: modules/popup-dialog.php:245 modules/pref-filters.php:42
#: modules/pref-filters.php:402
msgid "Match"
@@ -1949,168 +1942,168 @@ msgstr ""
msgid "Multiple Feed Editor"
msgstr "Editor de Feed"
-#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:840
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:842
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:860
msgid "Edit subscription options"
msgstr ""
-#: modules/pref-feeds.php:950
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Editor de Categoria"
-#: modules/pref-feeds.php:973
+#: 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:1004
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr ""
-#: modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Criar categoria"
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr ""
-#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
#: modules/pref-filters.php:505 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Remover"
-#: modules/pref-feeds.php:1114
+#: 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:1136 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:1141
+#: modules/pref-feeds.php:1134
#, fuzzy
msgid "More Feeds"
msgstr "Removendo o Feed..."
-#: modules/pref-feeds.php:1215
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr ""
-#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr ""
-#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
#: modules/pref-users.php:449
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1327
+#: modules/pref-feeds.php:1320
msgid "(Hidden)"
msgstr ""
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1333
#, php-format
msgid "(linked to %s)"
msgstr ""
-#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
#, fuzzy
msgid "Selection:"
msgstr "Seleção"
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr ""
-#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
#: modules/pref-users.php:472
msgid "Edit"
msgstr "Editar"
-#: modules/pref-feeds.php:1384
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr ""
-#: modules/pref-feeds.php:1389 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:1396
+#: modules/pref-feeds.php:1389
#, fuzzy
msgid "Other:"
msgstr "Onde:"
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Editar categorias"
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "Arquivo:"
-#: modules/pref-feeds.php:1413
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importar"
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Exportar OPML"
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1425
+#: 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:1429
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1438
+#: 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:1442
+#: modules/pref-feeds.php:1433
msgid "Link to published articles feed."
msgstr ""
-#: modules/pref-feeds.php:1445
+#: modules/pref-feeds.php:1436
#, fuzzy
msgid "Generate another link"
msgstr "Gerar um outro endereço"
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1502
#, fuzzy
msgid "No feeds found."
msgstr "Sem Feeds para exibir."
@@ -2134,6 +2127,14 @@ msgstr ""
msgid "Create filter"
msgstr ""
+#: modules/pref-filters.php:392
+msgid "filter_type_descr"
+msgstr "filter_type_descr"
+
+#: modules/pref-filters.php:393
+msgid "action_description"
+msgstr "action_description"
+
#: modules/pref-filters.php:404
#, fuzzy
msgid "Field"
@@ -2276,6 +2277,10 @@ msgstr "Selecionar o tema"
msgid "Change theme"
msgstr "Mudar Tema"
+#: modules/pref-prefs.php:388
+msgid "short_desc"
+msgstr "short_desc"
+
#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Sim"
@@ -2660,32 +2665,6 @@ msgstr ""
msgid "Internal error: Function not implemented"
msgstr ""
-#: viewfeed.js:2193
-msgid "Please enter a note for this article:"
-msgstr ""
-
-#~ msgid "This program requires XmlHttpRequest "
-#~ msgstr "Este programa requer XmlHttpRequest"
-
-#~ msgid "This program requires cookies "
-#~ msgstr "Este programa requer cookies "
-
-#, fuzzy
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;Criar filtro"
-
-#~ msgid "description"
-#~ msgstr "descrição"
-
-#~ msgid "filter_type_descr"
-#~ msgstr "filter_type_descr"
-
-#~ msgid "action_description"
-#~ msgstr "action_description"
-
-#~ msgid "short_desc"
-#~ msgstr "short_desc"
-
#~ msgid "Please select only one category."
#~ msgstr "Por favor selecione somente uma categoria."
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index ca3cb4eee..a99c53073 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 0346927ea..d5d9c15d2 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-21 23:14+0300\n"
+"POT-Creation-Date: 2009-02-20 15:55+0300\n"
"PO-Revision-Date: 2009-01-26 08:36+0400\n"
"Last-Translator: Max Kamashev <[email protected]>\n"
"Language-Team: Русский <[email protected]>\n"
@@ -85,7 +85,7 @@ msgstr "Раз в день"
msgid "Weekly"
msgstr "Раз в неделю"
-#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
msgid "Default"
msgstr "По умолчанию"
@@ -114,18 +114,12 @@ msgid "Unknown error"
msgstr "Неизвестная ошибка"
#: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
-"Программе требуется функционал XmlHttpRequest. Ваш браузер его не "
-"поддерживает."
+msgid "This program requires XmlHttpRequest "
+msgstr "Этой программе нужен XmlHttpRequest "
#: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr "Для работы программы необходимы куки. Ваш браузер их не поддерживает."
+msgid "This program requires cookies "
+msgstr "Этой программе нужны включённые куки"
#: errors.php:11
msgid "Backend sanity check failed"
@@ -181,184 +175,179 @@ msgstr ""
"неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
"конфигурацию PHP"
-#: functions.php:2846 modules/popup-dialog.php:175
+#: functions.php:2841 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Все каналы"
-#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
-#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
+#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
+#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Нет категории"
-#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
+#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
#: mobile/functions.php:33
msgid "Special"
msgstr "Особые"
-#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
-#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
+#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
+#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Метки"
-#: functions.php:2924 functions.php:3347 functions.php:4144
+#: functions.php:2919 functions.php:3342 functions.php:4127
#: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
#: offline.js:1425
msgid "Starred articles"
msgstr "Отмеченные"
-#: functions.php:2926 functions.php:3351 functions.php:4151
-#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
+#: functions.php:2921 functions.php:3346 functions.php:4134
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Опубликованные"
-#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
+#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Свежие"
-#: functions.php:2930 functions.php:3360 functions.php:4122
+#: functions.php:2925 functions.php:3355 functions.php:4105
#: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
#: offline.js:1427
msgid "All articles"
msgstr "Все статьи"
-#: functions.php:3311 functions.php:3313
+#: functions.php:3306 functions.php:3308
msgid "Search results"
msgstr "Результаты поиска"
-#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
-#: functions.php:3358 functions.php:3361 functions.php:3369
+#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
+#: functions.php:3353 functions.php:3356 functions.php:3364
msgid "Searched for"
msgstr "Поиск"
-#: functions.php:4001
+#: functions.php:3984
msgid "Generated feed"
msgstr "Генерировать канал"
-#: functions.php:4006 functions.php:5292 localized_js.php:148
-#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
+#: functions.php:3989 functions.php:5253 localized_js.php:148
+#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
#: modules/pref-filters.php:366 modules/pref-labels.php:163
#: modules/pref-users.php:401 offline.js:409
msgid "Select:"
msgstr "Выбрать:"
-#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
-#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
+#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
+#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
#: modules/pref-labels.php:164 modules/pref-users.php:402
#: mobile/functions.php:570
msgid "All"
msgstr "Все"
-#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
+#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Новые"
-#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
+#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
msgid "Invert"
msgstr "Инвертировать"
-#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
-#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
+#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
+#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
#: modules/pref-labels.php:165 modules/pref-users.php:403
#: mobile/functions.php:572
msgid "None"
msgstr "Ничего"
-#: functions.php:4018 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1378 offline.js:185
+#: functions.php:4001 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1371 offline.js:185
msgid "Actions..."
msgstr "Действия..."
-#: functions.php:4023 localized_js.php:150
+#: functions.php:4006 localized_js.php:150
msgid "Selection toggle:"
msgstr "Переключить выбранное:"
-#: functions.php:4025 localized_js.php:152 tt-rss.php:238
+#: functions.php:4008 localized_js.php:152 tt-rss.php:239
#: mobile/functions.php:459
msgid "Starred"
msgstr "Отмеченные"
-#: functions.php:4026
+#: functions.php:4009
msgid "Published"
msgstr "Опубликован"
-#: functions.php:4028 localized_js.php:85
+#: functions.php:4011 localized_js.php:85
msgid "Mark as read:"
msgstr "Пометить как прочит.:"
-#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
msgid "Selection"
msgstr "Выбранные"
-#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
msgid "Entire feed"
msgstr "Весь канал"
-#: functions.php:4035
+#: functions.php:4018
msgid "Assign label:"
msgstr "Применить метку:"
-#: functions.php:4076 localized_js.php:56
+#: functions.php:4059 localized_js.php:56
msgid "Click to collapse category"
msgstr "Щёлкните, чтобы развернуть категорию"
-#: functions.php:4342
+#: functions.php:4325
msgid "No feeds to display."
msgstr "Нет каналов для отображения."
-#: functions.php:4359 mobile/functions.php:12
+#: functions.php:4342 mobile/functions.php:12
msgid "Tags"
msgstr "Теги"
-#: functions.php:4596
+#: functions.php:4578
msgid " - "
msgstr " - "
-#: functions.php:4620 functions.php:5320
+#: functions.php:4602 functions.php:5272
msgid "Edit tags for this article"
msgstr "Редактировать теги статьи"
-#: functions.php:4628
+#: functions.php:4610
msgid "Display original article content"
msgstr "Показать оригинальное содержимое статьи"
-#: functions.php:4635 functions.php:5302
+#: functions.php:4617 functions.php:5263
msgid "Show article summary in new window"
msgstr "Показать детали статьи в новом окне"
-#: functions.php:4642 functions.php:5309
-#, fuzzy
-msgid "Publish article with a note"
-msgstr "Опубликовать"
-
-#: functions.php:4682 functions.php:5226
+#: functions.php:4650 functions.php:5187
msgid "unknown type"
msgstr "Неизвестный тип"
-#: functions.php:4688 functions.php:5232
+#: functions.php:4656 functions.php:5193
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4724 functions.php:5266
+#: functions.php:4692 functions.php:5227
msgid "Attachment:"
msgstr "Вложение:"
-#: functions.php:4726 functions.php:5268
+#: functions.php:4694 functions.php:5229
msgid "Attachments:"
msgstr "Вложения:"
-#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
+#: functions.php:4714 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:4802
+#: functions.php:4770
msgid "Feed not found."
msgstr "Канал не найден."
-#: functions.php:4871 mobile/functions.php:423
+#: functions.php:4839 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -366,28 +355,23 @@ msgstr ""
"Не могу показать канал (ошибка в запросе). Пожалуйста проверьте синтаксис "
"или локальную конфигурацию."
-#: functions.php:5193
+#: functions.php:5161
msgid "Click to expand article"
msgstr "Щёлкните чтобы развернуть статью"
-#: functions.php:5327
-#, fuzzy
-msgid "toggle unread"
-msgstr "Прочитано / не прочитано"
-
-#: functions.php:5346
+#: functions.php:5298
msgid "No unread articles found to display."
msgstr "Не найдено не прочитанных статей"
-#: functions.php:5349
+#: functions.php:5301
msgid "No updated articles found to display."
msgstr "Не найдено не прочитанных статей."
-#: functions.php:5352
+#: functions.php:5304
msgid "No starred articles found to display."
msgstr "Не найдено отмеченных статей"
-#: functions.php:5356
+#: functions.php:5308
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -395,26 +379,22 @@ msgstr ""
"Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
"Действия) или используйте фильтр."
-#: functions.php:5358 localized_js.php:92 offline.js:444
+#: functions.php:5310 localized_js.php:92 offline.js:444
msgid "No articles found to display."
msgstr "Статей не найдено."
-#: functions.php:6049 tt-rss.php:204
+#: functions.php:5984 tt-rss.php:206
msgid "Create label..."
msgstr "Создать метку..."
-#: functions.php:6062
+#: functions.php:5997
msgid "(remove)"
msgstr "(удалить)"
-#: functions.php:6106
+#: functions.php:6041
msgid "no tags"
msgstr "нет тегов"
-#: functions.php:6134
-msgid "edit note"
-msgstr ""
-
#: localized_js.php:36
msgid "Adding feed..."
msgstr "Канал добавляется..."
@@ -603,17 +583,17 @@ msgstr "Пометить все статьи как прочитанные?"
msgid "Mark all articles in %s as read?"
msgstr "Отметить все статьи в %s как прочитанные?"
-#: localized_js.php:84 viewfeed.js:1250
+#: localized_js.php:84 viewfeed.js:1212
#, php-format
msgid "Mark all visible articles in %s as read?"
msgstr "Отметить все видимые статьи в %s как прочитанные?"
-#: localized_js.php:86 viewfeed.js:1923
+#: localized_js.php:86 viewfeed.js:1885
#, php-format
msgid "Mark %d article(s) as read?"
msgstr "Отметить %d статью(ей) как прочитанные?"
-#: localized_js.php:87 viewfeed.js:1289
+#: localized_js.php:87 viewfeed.js:1251
#, php-format
msgid "Mark %d selected articles in %s as read?"
msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
@@ -626,16 +606,16 @@ msgstr "Помечаю все каналы как прочитанные..."
msgid "New password cannot be blank."
msgstr "Новый пароль не может быть пустым."
-#: localized_js.php:90 viewfeed.js:1880
+#: localized_js.php:90 viewfeed.js:1842
msgid "No article is selected."
msgstr "Статья не выбрана"
-#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
-#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
+#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
+#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
msgid "No articles are selected."
msgstr "Нет выбранных статей."
-#: localized_js.php:93 viewfeed.js:1921
+#: localized_js.php:93 viewfeed.js:1883
msgid "No articles found to mark"
msgstr "Статей для отметки не найдено."
@@ -648,7 +628,7 @@ msgstr "Нет выбранных категорий."
msgid "No feeds are selected."
msgstr "Нет выбранных каналов."
-#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
+#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
msgid "No feed selected."
msgstr "Канал не выбран."
@@ -713,7 +693,7 @@ msgstr "Пожалуйста выберите только одного поль
msgid "Please select some feed first."
msgstr "Пожалуйста выберите какой-нибудь канал."
-#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
+#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
msgid "Please wait..."
msgstr "Пожалуйста, подождите..."
@@ -721,8 +701,8 @@ msgstr "Пожалуйста, подождите..."
msgid "Please wait until operation finishes."
msgstr ""
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
-#: viewfeed.js:669
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
+#: viewfeed.js:631
msgid "Publish article"
msgstr "Опубликовать"
@@ -870,7 +850,7 @@ msgstr "Идет сохранение фильтра..."
msgid "Saving user..."
msgstr "Идет сохранение пользователя..."
-#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
+#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
msgid "Star article"
msgstr "Отмеченные"
@@ -949,11 +929,11 @@ msgstr "Идет изменение e-mail..."
msgid "Trying to change password..."
msgstr "Идет сохранение пароля..."
-#: localized_js.php:170 viewfeed.js:657
+#: localized_js.php:170 viewfeed.js:618
msgid "Unpublish article"
msgstr "Не публиковать"
-#: localized_js.php:172 viewfeed.js:586
+#: localized_js.php:172 viewfeed.js:553
msgid "Unstar article"
msgstr "Не отмеченные"
@@ -996,8 +976,8 @@ msgid ""
"switch it into offline mode again. Go online?"
msgstr ""
-#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
+#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Заголовок"
@@ -1023,7 +1003,7 @@ msgstr "Дата Статьи"
msgid "Filter article"
msgstr "Отфильтровать статью"
-#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
msgid "Mark as read"
msgstr "Как прочитанные"
@@ -1370,11 +1350,11 @@ msgstr "Закрыть настройки"
msgid "Logout"
msgstr "Выход"
-#: prefs.php:117 tt-rss.php:208
+#: prefs.php:117
msgid "Keyboard shortcuts"
msgstr "Горячие Клавиши"
-#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Настройки"
@@ -1396,7 +1376,7 @@ msgstr "Регистрация новых пользователей запре�
#: 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 modules/pref-feeds.php:869
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Вернуться к Tiny Tiny RSS"
@@ -1493,106 +1473,110 @@ msgstr "Больше каналов..."
msgid "Search..."
msgstr "Поиск..."
-#: tt-rss.php:191
+#: tt-rss.php:193
msgid "Feed actions:"
msgstr "Действия над каналами:"
-#: tt-rss.php:192
+#: tt-rss.php:194
msgid "Subscribe to feed..."
msgstr "Подписаться на канал..."
-#: tt-rss.php:193
+#: tt-rss.php:195
msgid "Edit this feed..."
msgstr "Редактировать канал..."
-#: tt-rss.php:194
+#: tt-rss.php:196
msgid "Clear articles"
msgstr "Очистить статьи"
-#: tt-rss.php:195
+#: tt-rss.php:197
msgid "Rescore feed"
msgstr "Заново оценить канал"
-#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
+#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Отписаться"
-#: tt-rss.php:198
+#: tt-rss.php:200
msgid "All feeds:"
msgstr "Все каналы:"
-#: tt-rss.php:200 help/3.php:44
+#: tt-rss.php:202 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
-#: tt-rss.php:202
+#: tt-rss.php:204
msgid "Other actions:"
msgstr "Другие действия:"
-#: tt-rss.php:205
+#: tt-rss.php:207
msgid "Create filter..."
msgstr "Создать фильтр..."
-#: tt-rss.php:206
+#: tt-rss.php:208
msgid "Reset UI layout"
msgstr "Сбросить панели"
-#: tt-rss.php:207
+#: tt-rss.php:209
msgid "Reset category order"
msgstr "Сбросить порядок категорий"
-#: tt-rss.php:218
+#: tt-rss.php:210
+msgid "&nbsp;&nbsp;Keyboard shortcuts"
+msgstr "&nbsp;&nbsp;Горячие клавиши"
+
+#: tt-rss.php:219
msgid "Collapse feedlist"
msgstr "Свернуть список каналов"
-#: tt-rss.php:220
+#: tt-rss.php:221
msgid "Toggle Feedlist"
msgstr "Переключить Список Каналов"
-#: tt-rss.php:228 mobile/functions.php:738
+#: tt-rss.php:229 mobile/functions.php:738
msgid "Search:"
msgstr "Искать:"
-#: tt-rss.php:236 mobile/functions.php:456
+#: tt-rss.php:237 mobile/functions.php:456
msgid "Adaptive"
msgstr "Адаптивно"
-#: tt-rss.php:237 mobile/functions.php:457
+#: tt-rss.php:238 mobile/functions.php:457
msgid "All Articles"
msgstr "Все статьи"
-#: tt-rss.php:240
+#: tt-rss.php:241
msgid "Ignore Scoring"
msgstr "Игнорировать Оценки"
-#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
+#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "Обновлено"
-#: tt-rss.php:244
+#: tt-rss.php:245
msgid "Order:"
msgstr "Порядок:"
-#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:461
msgid "Date"
msgstr "Дата"
-#: tt-rss.php:250
+#: tt-rss.php:251
msgid "Score"
msgstr "Оценка"
-#: tt-rss.php:254
+#: tt-rss.php:255
msgid "Limit:"
msgstr "Сколько:"
-#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Обновить"
-#: tt-rss.php:297
+#: tt-rss.php:298
msgid "Drag me to resize panels"
msgstr "Потяни за меня для изменения размера панелей"
@@ -1788,7 +1772,7 @@ msgstr "Отмена"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
@@ -1815,6 +1799,11 @@ msgstr "Этот канал"
msgid "Create Filter"
msgstr "Создать фильтр"
+#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
+#: modules/pref-filters.php:39 modules/pref-filters.php:96
+msgid "description"
+msgstr "описание"
+
#: modules/popup-dialog.php:245 modules/pref-filters.php:42
#: modules/pref-filters.php:402
msgid "Match"
@@ -1974,139 +1963,139 @@ msgstr "Кэшировать изображения локально"
msgid "Multiple Feed Editor"
msgstr "Редактор канала"
-#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr "Всё выполнено."
-#: modules/pref-feeds.php:840
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Добавлена подписка на <b>%s</b>."
-#: modules/pref-feeds.php:842
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Канал <b>%s</b> уже подписан."
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:860
msgid "Edit subscription options"
msgstr "Редактировать опции подписки"
-#: modules/pref-feeds.php:950
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Редактор категорий"
-#: modules/pref-feeds.php:973
+#: 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:1004
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr "Не могу удалить не пустую категорию"
-#: modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Создать категорию"
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Категории отсутствуют."
-#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
#: modules/pref-filters.php:505 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Удалить"
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
-#: modules/pref-feeds.php:1136 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:1141
+#: modules/pref-feeds.php:1134
msgid "More Feeds"
msgstr "Больше каналов"
-#: modules/pref-feeds.php:1215
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Показать дату последней статьи"
-#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Последняя&nbsp;статья"
-#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
#: modules/pref-users.php:449
msgid "Click to edit"
msgstr "Щёлкните для редактирования"
-#: modules/pref-feeds.php:1327
+#: modules/pref-feeds.php:1320
msgid "(Hidden)"
msgstr "(Скрыт)"
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1333
#, php-format
msgid "(linked to %s)"
msgstr "(ссылка на %s)"
-#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "Выбрано:"
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Изменить категорию"
-#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
#: modules/pref-users.php:472
msgid "Edit"
msgstr "Редактировать"
-#: modules/pref-feeds.php:1384
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "Ручная очистка"
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Очистить данные канала."
-#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
msgid "Rescore articles"
msgstr "Заново оценить статьи"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Другой:"
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Редактировать категории"
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "Файл:"
-#: modules/pref-feeds.php:1413
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Импортировать"
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Экспортировать OPML"
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Интеграция в Firefox"
-#: modules/pref-feeds.php:1425
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -2114,11 +2103,11 @@ msgstr ""
"Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
"Для этого щёлкните по ссылке ниже."
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
-#: modules/pref-feeds.php:1438
+#: 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."
@@ -2126,15 +2115,15 @@ msgstr ""
"Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
"быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
-#: modules/pref-feeds.php:1442
+#: modules/pref-feeds.php:1433
msgid "Link to published articles feed."
msgstr "Ссылка на общий канал со статьями."
-#: modules/pref-feeds.php:1445
+#: modules/pref-feeds.php:1436
msgid "Generate another link"
msgstr "Создать другую ссылку"
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1502
msgid "No feeds found."
msgstr "Каналы не найдены."
@@ -2156,6 +2145,14 @@ msgstr "Добавлен фильтр <b>%s</b>"
msgid "Create filter"
msgstr "Создать фильтр"
+#: modules/pref-filters.php:392
+msgid "filter_type_descr"
+msgstr "описание типа фильтра"
+
+#: modules/pref-filters.php:393
+msgid "action_description"
+msgstr "описание действия"
+
#: modules/pref-filters.php:404
msgid "Field"
msgstr "Поле"
@@ -2296,6 +2293,10 @@ msgstr "Выбор темы"
msgid "Change theme"
msgstr "Изменить тему"
+#: modules/pref-prefs.php:388
+msgid "short_desc"
+msgstr "краткое описание"
+
#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Да"
@@ -2658,32 +2659,6 @@ msgstr "Соответствие:"
msgid "Internal error: Function not implemented"
msgstr "Внутренняя ошибка: Функция не реализована"
-#: viewfeed.js:2193
-#, fuzzy
-msgid "Please enter a note for this article:"
-msgstr "Пожалуйста, введите заголовок метки:"
-
-#~ msgid "This program requires XmlHttpRequest "
-#~ msgstr "Этой программе нужен XmlHttpRequest "
-
-#~ msgid "This program requires cookies "
-#~ msgstr "Этой программе нужны включённые куки"
-
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;Горячие клавиши"
-
-#~ msgid "description"
-#~ msgstr "описание"
-
-#~ msgid "filter_type_descr"
-#~ msgstr "описание типа фильтра"
-
-#~ msgid "action_description"
-#~ msgstr "описание действия"
-
-#~ msgid "short_desc"
-#~ msgstr "краткое описание"
-
#~ msgid "display tags"
#~ msgstr "показать теги"
@@ -2708,6 +2683,9 @@ msgstr "Пожалуйста, введите заголовок метки:"
#~ msgid "Address changed."
#~ msgstr "Адрес изменен."
+#~ msgid "Please enter label title:"
+#~ msgstr "Пожалуйста, введите заголовок метки:"
+
#~ msgid ""
#~ "Rescore articles in all feeds? This operation may take a lot of time."
#~ msgstr ""
@@ -2831,6 +2809,19 @@ msgstr "Пожалуйста, введите заголовок метки:"
#~ msgid "Fatal Error"
#~ 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 "Изменить оценку"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index dc0c9d4a5..2cf4755bc 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 7a19f41e3..77a647ed4 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-03-21 23:14+0300\n"
+"POT-Creation-Date: 2009-02-20 15:55+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:247 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
msgid "Default"
msgstr "默认"
@@ -107,16 +107,12 @@ msgid "Unknown error"
msgstr "未知错误"
#: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
+msgid "This program requires XmlHttpRequest "
+msgstr "本程序需要xmlhttprequest支持"
#: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
+msgid "This program requires cookies "
+msgstr "本程序需要开启cookies"
#: errors.php:11
msgid "Backend sanity check failed"
@@ -166,252 +162,238 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2846 modules/popup-dialog.php:175
+#: functions.php:2841 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "所有feed"
-#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
-#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
+#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
+#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "未分类"
-#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
+#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
#: mobile/functions.php:33
msgid "Special"
msgstr "专用"
-#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
-#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
+#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
+#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "标记"
-#: functions.php:2924 functions.php:3347 functions.php:4144
+#: functions.php:2919 functions.php:3342 functions.php:4127
#: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
#: offline.js:1425
msgid "Starred articles"
msgstr "星级文章"
-#: functions.php:2926 functions.php:3351 functions.php:4151
-#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
+#: functions.php:2921 functions.php:3346 functions.php:4134
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "已发布文章"
-#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
+#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
#: mobile/functions.php:52
#, fuzzy
msgid "Fresh articles"
msgstr "星级文章"
-#: functions.php:2930 functions.php:3360 functions.php:4122
+#: functions.php:2925 functions.php:3355 functions.php:4105
#: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
#: offline.js:1427
#, fuzzy
msgid "All articles"
msgstr "所有文章"
-#: functions.php:3311 functions.php:3313
+#: functions.php:3306 functions.php:3308
msgid "Search results"
msgstr "搜索结果"
-#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
-#: functions.php:3358 functions.php:3361 functions.php:3369
+#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
+#: functions.php:3353 functions.php:3356 functions.php:3364
msgid "Searched for"
msgstr "搜索"
-#: functions.php:4001
+#: functions.php:3984
msgid "Generated feed"
msgstr "产生feed"
-#: functions.php:4006 functions.php:5292 localized_js.php:148
-#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
+#: functions.php:3989 functions.php:5253 localized_js.php:148
+#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
#: modules/pref-filters.php:366 modules/pref-labels.php:163
#: modules/pref-users.php:401 offline.js:409
msgid "Select:"
msgstr "选择:"
-#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
-#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
+#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
+#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
#: modules/pref-labels.php:164 modules/pref-users.php:402
#: mobile/functions.php:570
msgid "All"
msgstr "所有"
-#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
+#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "未读"
-#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
+#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(逆)"
-#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
-#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
+#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
+#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
#: modules/pref-labels.php:165 modules/pref-users.php:403
#: mobile/functions.php:572
msgid "None"
msgstr "无"
-#: functions.php:4018 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1378 offline.js:185
+#: functions.php:4001 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1371 offline.js:185
msgid "Actions..."
msgstr "激活..."
-#: functions.php:4023 localized_js.php:150
+#: functions.php:4006 localized_js.php:150
#, fuzzy
msgid "Selection toggle:"
msgstr "选择:"
-#: functions.php:4025 localized_js.php:152 tt-rss.php:238
+#: functions.php:4008 localized_js.php:152 tt-rss.php:239
#: mobile/functions.php:459
msgid "Starred"
msgstr "星级"
-#: functions.php:4026
+#: functions.php:4009
msgid "Published"
msgstr "已发布"
-#: functions.php:4028 localized_js.php:85
+#: functions.php:4011 localized_js.php:85
msgid "Mark as read:"
msgstr "标记为已读:"
-#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
msgid "Selection"
msgstr "选择:"
-#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
msgid "Entire feed"
msgstr "输入feed"
-#: functions.php:4035
+#: functions.php:4018
#, fuzzy
msgid "Assign label:"
msgstr "指定标签"
-#: functions.php:4076 localized_js.php:56
+#: functions.php:4059 localized_js.php:56
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4342
+#: functions.php:4325
msgid "No feeds to display."
msgstr "无feed显示。"
-#: functions.php:4359 mobile/functions.php:12
+#: functions.php:4342 mobile/functions.php:12
msgid "Tags"
msgstr "标签"
-#: functions.php:4596
+#: functions.php:4578
#, fuzzy
msgid " - "
msgstr ", 由 - "
-#: functions.php:4620 functions.php:5320
+#: functions.php:4602 functions.php:5272
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4628
+#: functions.php:4610
#, fuzzy
msgid "Display original article content"
msgstr "显示最近文章时间"
-#: functions.php:4635 functions.php:5302
+#: functions.php:4617 functions.php:5263
#, fuzzy
msgid "Show article summary in new window"
msgstr "新窗口打开文章连结"
-#: functions.php:4642 functions.php:5309
-#, fuzzy
-msgid "Publish article with a note"
-msgstr "发布文章"
-
-#: functions.php:4682 functions.php:5226
+#: functions.php:4650 functions.php:5187
#, fuzzy
msgid "unknown type"
msgstr "未知错误"
-#: functions.php:4688 functions.php:5232
+#: functions.php:4656 functions.php:5193
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4724 functions.php:5266
+#: functions.php:4692 functions.php:5227
msgid "Attachment:"
msgstr ""
-#: functions.php:4726 functions.php:5268
+#: functions.php:4694 functions.php:5229
msgid "Attachments:"
msgstr ""
-#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
+#: functions.php:4714 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:4802
+#: functions.php:4770
msgid "Feed not found."
msgstr "未找到Feed."
-#: functions.php:4871 mobile/functions.php:423
+#: functions.php:4839 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
-#: functions.php:5193
+#: functions.php:5161
#, fuzzy
msgid "Click to expand article"
msgstr "星级文章"
-#: functions.php:5327
-#, fuzzy
-msgid "toggle unread"
-msgstr "触发开关"
-
-#: functions.php:5346
+#: functions.php:5298
#, fuzzy
msgid "No unread articles found to display."
msgstr "未找到文章。"
-#: functions.php:5349
+#: functions.php:5301
#, fuzzy
msgid "No updated articles found to display."
msgstr "未找到文章。"
-#: functions.php:5352
+#: functions.php:5304
#, fuzzy
msgid "No starred articles found to display."
msgstr "未找到文章。"
-#: functions.php:5356
+#: functions.php:5308
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:5358 localized_js.php:92 offline.js:444
+#: functions.php:5310 localized_js.php:92 offline.js:444
#, fuzzy
msgid "No articles found to display."
msgstr "未找到文章。"
-#: functions.php:6049 tt-rss.php:204
+#: functions.php:5984 tt-rss.php:206
#, fuzzy
msgid "Create label..."
msgstr "创建标记"
-#: functions.php:6062
+#: functions.php:5997
#, fuzzy
msgid "(remove)"
msgstr "移除"
-#: functions.php:6106
+#: functions.php:6041
msgid "no tags"
msgstr "无标签"
-#: functions.php:6134
-msgid "edit note"
-msgstr ""
-
#: localized_js.php:36
msgid "Adding feed..."
msgstr "添加feed中..."
@@ -601,17 +583,17 @@ msgstr "标记 %s 中所有访问过的主题为已读"
msgid "Mark all articles in %s as read?"
msgstr "标记 %s 中所有访问过的主题为已读"
-#: localized_js.php:84 viewfeed.js:1250
+#: localized_js.php:84 viewfeed.js:1212
#, php-format
msgid "Mark all visible articles in %s as read?"
msgstr "标记 %s 中所有访问过的主题为已读"
-#: localized_js.php:86 viewfeed.js:1923
+#: localized_js.php:86 viewfeed.js:1885
#, fuzzy, php-format
msgid "Mark %d article(s) as read?"
msgstr "标记 %s 中所有所选Feed为已读..."
-#: localized_js.php:87 viewfeed.js:1289
+#: localized_js.php:87 viewfeed.js:1251
#, fuzzy, php-format
msgid "Mark %d selected articles in %s as read?"
msgstr "标记 %s 中所有所选Feed为已读..."
@@ -624,17 +606,17 @@ msgstr "标记所有Feed未已读..."
msgid "New password cannot be blank."
msgstr "新密码不可留空."
-#: localized_js.php:90 viewfeed.js:1880
+#: localized_js.php:90 viewfeed.js:1842
#, fuzzy
msgid "No article is selected."
msgstr "无选定文章。"
-#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
-#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
+#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
+#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
msgid "No articles are selected."
msgstr "无选定文章。"
-#: localized_js.php:93 viewfeed.js:1921
+#: localized_js.php:93 viewfeed.js:1883
#, fuzzy
msgid "No articles found to mark"
msgstr "未找到文章。"
@@ -648,7 +630,7 @@ msgstr "未选定分类。"
msgid "No feeds are selected."
msgstr "未选择feed."
-#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
+#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
msgid "No feed selected."
msgstr "无选定feed."
@@ -713,7 +695,7 @@ msgstr "请只选择一个用户."
msgid "Please select some feed first."
msgstr "请先选择若干feed"
-#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
+#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
#, fuzzy
msgid "Please wait..."
msgstr "读取中,请等待..."
@@ -722,8 +704,8 @@ msgstr "读取中,请等待..."
msgid "Please wait until operation finishes."
msgstr ""
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
-#: viewfeed.js:669
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
+#: viewfeed.js:631
msgid "Publish article"
msgstr "发布文章"
@@ -874,7 +856,7 @@ msgstr "保存过滤器..."
msgid "Saving user..."
msgstr "保存用户..."
-#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
+#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
#, fuzzy
msgid "Star article"
msgstr "星级文章"
@@ -954,12 +936,12 @@ msgstr "尝试更改e-mail..."
msgid "Trying to change password..."
msgstr "尝试更改密码..."
-#: localized_js.php:170 viewfeed.js:657
+#: localized_js.php:170 viewfeed.js:618
#, fuzzy
msgid "Unpublish article"
msgstr "发布文章"
-#: localized_js.php:172 viewfeed.js:586
+#: localized_js.php:172 viewfeed.js:553
#, fuzzy
msgid "Unstar article"
msgstr "星级文章"
@@ -1005,8 +987,8 @@ msgid ""
"switch it into offline mode again. Go online?"
msgstr ""
-#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
+#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "标题"
@@ -1032,7 +1014,7 @@ msgstr ""
msgid "Filter article"
msgstr "过滤文章"
-#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
msgid "Mark as read"
msgstr "标记为已读"
@@ -1360,12 +1342,12 @@ msgstr "退出我的最爱"
msgid "Logout"
msgstr "注销"
-#: prefs.php:117 tt-rss.php:208
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "&nbsp;&nbsp;创建过滤器"
-#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "我的最爱"
@@ -1390,7 +1372,7 @@ msgstr "Feed 浏览器有限制"
#: 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 modules/pref-feeds.php:869
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "返回Tiny Tiny RSS"
@@ -1490,117 +1472,122 @@ msgstr "移除feed中..."
msgid "Search..."
msgstr "搜索"
-#: tt-rss.php:191
+#: tt-rss.php:193
msgid "Feed actions:"
msgstr "Feed 操作:"
-#: tt-rss.php:192
+#: tt-rss.php:194
#, fuzzy
msgid "Subscribe to feed..."
msgstr "订阅feed"
-#: tt-rss.php:193
+#: tt-rss.php:195
#, fuzzy
msgid "Edit this feed..."
msgstr "输入feed"
-#: tt-rss.php:194
+#: tt-rss.php:196
#, fuzzy
msgid "Clear articles"
msgstr "过滤文章"
-#: tt-rss.php:195
+#: tt-rss.php:197
#, fuzzy
msgid "Rescore feed"
msgstr "移除feed中..."
-#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
+#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "退订"
-#: tt-rss.php:198
+#: tt-rss.php:200
msgid "All feeds:"
msgstr "所有feed:"
-#: tt-rss.php:200 help/3.php:44
+#: tt-rss.php:202 help/3.php:44
#, fuzzy
msgid "(Un)hide read feeds"
msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
-#: tt-rss.php:202
+#: tt-rss.php:204
msgid "Other actions:"
msgstr "其他操作:"
-#: tt-rss.php:205
+#: tt-rss.php:207
#, fuzzy
msgid "Create filter..."
msgstr "创建过滤器"
-#: tt-rss.php:206
+#: tt-rss.php:208
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;订阅feed"
-#: tt-rss.php:207
+#: tt-rss.php:209
#, fuzzy
msgid "Reset category order"
msgstr "移除选定分类?"
-#: tt-rss.php:218
+#: tt-rss.php:210
+#, fuzzy
+msgid "&nbsp;&nbsp;Keyboard shortcuts"
+msgstr "&nbsp;&nbsp;创建过滤器"
+
+#: tt-rss.php:219
#, fuzzy
msgid "Collapse feedlist"
msgstr "隐藏我的Feed列表"
-#: tt-rss.php:220
+#: tt-rss.php:221
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:228 mobile/functions.php:738
+#: tt-rss.php:229 mobile/functions.php:738
msgid "Search:"
msgstr "搜索:"
-#: tt-rss.php:236 mobile/functions.php:456
+#: tt-rss.php:237 mobile/functions.php:456
msgid "Adaptive"
msgstr "自适应"
-#: tt-rss.php:237 mobile/functions.php:457
+#: tt-rss.php:238 mobile/functions.php:457
msgid "All Articles"
msgstr "所有文章"
-#: tt-rss.php:240
+#: tt-rss.php:241
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
+#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "已更新"
-#: tt-rss.php:244
+#: tt-rss.php:245
#, fuzzy
msgid "Order:"
msgstr "地点:"
-#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:461
#, fuzzy
msgid "Date"
msgstr "更新"
-#: tt-rss.php:250
+#: tt-rss.php:251
msgid "Score"
msgstr ""
-#: tt-rss.php:254
+#: tt-rss.php:255
msgid "Limit:"
msgstr "限制:"
-#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "更新"
-#: tt-rss.php:297
+#: tt-rss.php:298
msgid "Drag me to resize panels"
msgstr ""
@@ -1798,7 +1785,7 @@ msgstr "取消"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
@@ -1827,6 +1814,11 @@ msgstr "本feed"
msgid "Create Filter"
msgstr "创建过滤器"
+#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
+#: modules/pref-filters.php:39 modules/pref-filters.php:96
+msgid "description"
+msgstr "描述"
+
#: modules/popup-dialog.php:245 modules/pref-filters.php:42
#: modules/pref-filters.php:402
msgid "Match"
@@ -1995,172 +1987,172 @@ msgstr ""
msgid "Multiple Feed Editor"
msgstr "Feed编辑"
-#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:840
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "订阅到 <b>%s</b>."
-#: modules/pref-feeds.php:842
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "已经订阅到 <b>%s</b>."
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:860
msgid "Edit subscription options"
msgstr ""
-#: modules/pref-feeds.php:950
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "分类编辑"
-#: modules/pref-feeds.php:973
+#: 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:1004
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr "不能删除非空分类。"
-#: modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "创建分类"
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "未定义feed分类"
-#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
#: modules/pref-filters.php:505 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "移除"
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr "有些feed更新错误(点击了解详情) "
-#: modules/pref-feeds.php:1136 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:1141
+#: modules/pref-feeds.php:1134
#, fuzzy
msgid "More Feeds"
msgstr "移除feed中..."
-#: modules/pref-feeds.php:1215
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "显示最近文章时间"
-#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "最后&nbsp;文章"
-#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
#: modules/pref-users.php:449
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1327
+#: modules/pref-feeds.php:1320
msgid "(Hidden)"
msgstr ""
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1333
#, php-format
msgid "(linked to %s)"
msgstr ""
-#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
#, fuzzy
msgid "Selection:"
msgstr "选择:"
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "再分类"
-#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
#: modules/pref-users.php:472
msgid "Edit"
msgstr "编辑"
-#: modules/pref-feeds.php:1384
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1382
#, fuzzy
msgid "Clear feed data"
msgstr "所有Feed已更新。"
-#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
#, fuzzy
msgid "Rescore articles"
msgstr "星级文章"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1389
#, fuzzy
msgid "Other:"
msgstr "地点:"
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "编辑分类"
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1401
#, fuzzy
msgid "File:"
msgstr "标题:"
-#: modules/pref-feeds.php:1413
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "导入"
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "导出OPML"
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1425
+#: 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:1429
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1438
+#: 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:1442
+#: modules/pref-feeds.php:1433
#, fuzzy
msgid "Link to published articles feed."
msgstr "已发布文章"
-#: modules/pref-feeds.php:1445
+#: modules/pref-feeds.php:1436
#, fuzzy
msgid "Generate another link"
msgstr "生成另一个地址"
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1502
#, fuzzy
msgid "No feeds found."
msgstr "无feed可订阅。"
@@ -2184,6 +2176,15 @@ msgstr "创建过滤器 <b>%s</b>"
msgid "Create filter"
msgstr "创建过滤器"
+#: modules/pref-filters.php:392
+msgid "filter_type_descr"
+msgstr ""
+
+#: modules/pref-filters.php:393
+#, fuzzy
+msgid "action_description"
+msgstr "描述"
+
#: modules/pref-filters.php:404
#, fuzzy
msgid "Field"
@@ -2329,6 +2330,10 @@ msgstr "选择模板"
msgid "Change theme"
msgstr "更改模板"
+#: modules/pref-prefs.php:388
+msgid "short_desc"
+msgstr "short_desc"
+
#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "是"
@@ -2721,31 +2726,6 @@ msgstr "匹配:"
msgid "Internal error: Function not implemented"
msgstr ""
-#: viewfeed.js:2193
-#, fuzzy
-msgid "Please enter a note for this article:"
-msgstr "请输入标签主题"
-
-#~ msgid "This program requires XmlHttpRequest "
-#~ msgstr "本程序需要xmlhttprequest支持"
-
-#~ msgid "This program requires cookies "
-#~ msgstr "本程序需要开启cookies"
-
-#, fuzzy
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;创建过滤器"
-
-#~ msgid "description"
-#~ msgstr "描述"
-
-#, fuzzy
-#~ msgid "action_description"
-#~ msgstr "描述"
-
-#~ msgid "short_desc"
-#~ msgstr "short_desc"
-
#~ msgid "display tags"
#~ msgstr "显示标签"
@@ -2770,6 +2750,9 @@ msgstr "请输入标签主题"
#~ msgid "Address changed."
#~ msgstr "地址已经变更"
+#~ msgid "Please enter label title:"
+#~ msgstr "请输入标签主题"
+
#, fuzzy
#~ msgid "Rescoring feeds..."
#~ msgstr "移除feed中..."