summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2009-01-18 10:24:56 +0100
committerAndrew Dolgov <[email protected]>2009-01-18 10:24:56 +0100
commit097c6b00bf8cc67374b6694f8e3c28c10551f74e (patch)
tree7f4572e3c5bec6f855a606a439b066cc6421d374 /locale
parentaf03c001e406fdfab8a5b1f0702630aa5c9c9096 (diff)
update translations
Diffstat (limited to 'locale')
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin35850 -> 35766 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po407
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.mobin11520 -> 11485 bytes
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.po402
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.mobin50709 -> 50474 bytes
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.po404
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.mobin40313 -> 40059 bytes
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.po404
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.mobin48076 -> 47844 bytes
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.po404
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.mobin12586 -> 12559 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.po398
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin53243 -> 52932 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po404
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin25759 -> 25677 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po409
16 files changed, 1669 insertions, 1563 deletions
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 8149ed925..8f8a9fd34 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 5e60a7552..edc950a7a 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 17:20+0300\n"
+"POT-Creation-Date: 2009-01-18 15:24+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"
@@ -172,205 +172,198 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2628 functions.php:2992 functions.php:3373 functions.php:4237
-#: help/3.php:57 mobile/functions.php:52
-msgid "Starred articles"
-msgstr "Articles remarquables"
-
-#: functions.php:2644 functions.php:2994 functions.php:3376 functions.php:4244
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
-msgid "Published articles"
-msgstr "Articles publiés"
-
-#: functions.php:2660 functions.php:2996 functions.php:3379 functions.php:4222
-#: help/3.php:58 mobile/functions.php:43
-msgid "Fresh articles"
-msgstr "Nouveaux articles"
-
-#: functions.php:2914 modules/popup-dialog.php:175
-#: modules/pref-filters.php:388 mobile/functions.php:741
+#: functions.php:2883 modules/popup-dialog.php:175
+#: modules/pref-filters.php:405 mobile/functions.php:735
msgid "All feeds"
msgstr "Tous les flux"
-#: functions.php:2943 functions.php:2982 functions.php:3351 functions.php:4398
-#: functions.php:4428 modules/pref-feeds.php:1244
+#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1244
msgid "Uncategorized"
msgstr "Sans catégorie"
-#: functions.php:2972 functions.php:3540 mobile/functions.php:33
+#: functions.php:2941 functions.php:3508 mobile/functions.php:33
msgid "Special"
msgstr "Spécial"
-#: functions.php:2974 functions.php:3542 mobile/functions.php:75
+#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
msgid "Labels"
msgstr "Intitulé"
-#: functions.php:3337 functions.php:3339
+#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
+#: mobile/functions.php:52
+msgid "Starred articles"
+msgstr "Articles remarquables"
+
+#: functions.php:2963 functions.php:3344 functions.php:4212
+#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+msgid "Published articles"
+msgstr "Articles publiés"
+
+#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
+#: mobile/functions.php:43
+msgid "Fresh articles"
+msgstr "Nouveaux articles"
+
+#: functions.php:3305 functions.php:3307
msgid "Search results"
msgstr "Résultats de recherche"
-#: functions.php:3355 functions.php:3368 functions.php:3374 functions.php:3377
-#: functions.php:3380 functions.php:3388
+#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
+#: functions.php:3348 functions.php:3356
msgid "Searched for"
msgstr "Recherché"
-#: functions.php:4014 functions.php:4064 functions.php:5416
+#: functions.php:3989 functions.php:4045 functions.php:5368
#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:341 modules/pref-labels.php:275
-#: modules/pref-users.php:408
+#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
+#: modules/pref-labels.php:136 modules/pref-users.php:408
msgid "Select:"
msgstr "Sélectionner&nbsp;:"
-#: functions.php:4015 functions.php:4065 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:342
-#: modules/pref-labels.php:276 modules/pref-users.php:409
-#: mobile/functions.php:567
+#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
+#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
+#: modules/pref-users.php:409 mobile/functions.php:561
msgid "All"
msgstr "Tout"
-#: functions.php:4016 functions.php:4022 functions.php:4066 functions.php:4069
-#: tt-rss.php:196 mobile/functions.php:455 mobile/functions.php:568
+#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
+#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
msgid "Unread"
msgstr "Non lus"
-#: functions.php:4017 mobile/functions.php:570
+#: functions.php:3992 mobile/functions.php:564
#, fuzzy
msgid "Invert"
msgstr "(Inverse)"
-#: functions.php:4018 functions.php:4067 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:343
-#: modules/pref-labels.php:277 modules/pref-users.php:410
-#: mobile/functions.php:569
+#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
+#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
+#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
+#: modules/pref-users.php:410 mobile/functions.php:563
msgid "None"
msgstr "Aucun"
-#: functions.php:4020 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
msgid "Actions..."
msgstr "Actions..."
-#: functions.php:4021
+#: functions.php:3996
#, fuzzy
msgid "Selection toggle:"
msgstr "Sélection&nbsp;:"
-#: functions.php:4023 functions.php:4070 tt-rss.php:195
-#: mobile/functions.php:456
+#: functions.php:3998 functions.php:4051 tt-rss.php:195
+#: mobile/functions.php:450
msgid "Starred"
msgstr "Remarquables"
-#: functions.php:4024
+#: functions.php:3999
msgid "Published"
msgstr "Publiés"
-#: functions.php:4026 functions.php:4072
+#: functions.php:4001 functions.php:4053
msgid "Mark as read:"
msgstr "Marquer comme lu&nbsp;:"
-#: functions.php:4027 mobile/functions.php:575
+#: functions.php:4002 mobile/functions.php:569
msgid "Selection"
msgstr "La sélection"
-#: functions.php:4041 mobile/functions.php:577
+#: functions.php:4016 mobile/functions.php:571
msgid "Entire feed"
msgstr "Tout le flux"
-#: functions.php:4044 tt-rss.php:162
-msgid "Other actions:"
-msgstr "Autres actions&nbsp;:"
+#: functions.php:4019
+#, fuzzy
+msgid "Assign label:"
+msgstr "Attribuer des étiquettes"
-#: functions.php:4051 functions.php:4053
+#: functions.php:4031
#, fuzzy
-msgid "Search to label"
-msgstr "Convertir en intitulé"
+msgid "(remove)"
+msgstr "Supprimer"
-#: functions.php:4069
+#: functions.php:4050
msgid "Toggle:"
msgstr "Marquages spéciaux&nbsp;:"
-#: functions.php:4073 mobile/functions.php:576
+#: functions.php:4054 mobile/functions.php:570
msgid "Page"
msgstr "Page"
-#: functions.php:4074 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:378
+#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:395
msgid "Feed"
msgstr "Flux"
-#: functions.php:4081
-msgid "Convert to label"
-msgstr "Convertir en intitulé"
-
-#: functions.php:4128
+#: functions.php:4096
msgid "Generated feed"
msgstr "Flux généré"
-#: functions.php:4172
+#: functions.php:4145
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4210
-msgid "Dashboard"
-msgstr ""
-
-#: functions.php:4448
+#: functions.php:4398
msgid "No feeds to display."
msgstr "Aucun flux à afficher."
-#: functions.php:4465 mobile/functions.php:12
+#: functions.php:4415 mobile/functions.php:12
msgid "Tags"
msgstr "Étiquettes"
-#: functions.php:4705
+#: functions.php:4657
#, fuzzy
msgid " - "
msgstr "- par "
-#: functions.php:4764 functions.php:4765
+#: functions.php:4716 functions.php:4717
msgid "no tags"
msgstr "aucune étiquette"
-#: functions.php:4772
+#: functions.php:4724
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4780
+#: functions.php:4732
#, fuzzy
msgid "Display original article content"
msgstr "Afficher l'heure du dernier article"
-#: functions.php:4787 functions.php:5426
+#: functions.php:4739 functions.php:5378
#, fuzzy
msgid "Show article summary in new window"
msgstr "Ouvrir les liens des articles dans une nouvelle fenêtre"
-#: functions.php:4823 functions.php:5350
+#: functions.php:4775 functions.php:5302
#, fuzzy
msgid "unknown type"
msgstr "Erreur inconnue"
-#: functions.php:4829 functions.php:5356
+#: functions.php:4781 functions.php:5308
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4865 functions.php:5390
+#: functions.php:4817 functions.php:5342
msgid "Attachment:"
msgstr ""
-#: functions.php:4867 functions.php:5392
+#: functions.php:4819 functions.php:5344
msgid "Attachments:"
msgstr ""
-#: functions.php:4887 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
msgid "Close this window"
msgstr "Fermer cette fenêtre"
-#: functions.php:4943 modules/pref-feed-browser.php:75
+#: functions.php:4895 modules/pref-feed-browser.php:75
msgid "Feed not found."
msgstr "Flux non trouvé."
-#: functions.php:5012 mobile/functions.php:420
+#: functions.php:4964 mobile/functions.php:414
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -378,76 +371,76 @@ msgstr ""
"Impossible d'afficher le flux (la requête l'a pas abouti). Veuillez vérifier "
"la syntaxe de son intitulé ou la configuration locale."
-#: functions.php:5125
+#: functions.php:5077
msgid "(Click to change)"
msgstr ""
-#: functions.php:5324
+#: functions.php:5276
#, fuzzy
msgid "Click to expand article"
msgstr "Articles mémorisés"
-#: functions.php:5488
+#: functions.php:5440
#, fuzzy
msgid "No unread articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5491
+#: functions.php:5443
#, fuzzy
msgid "No starred articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5494
+#: functions.php:5446
#, fuzzy
msgid "No articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5862
+#: functions.php:5793
#, fuzzy
msgid "Match "
msgstr "Correspondance"
-#: functions.php:5870
+#: functions.php:5801
#, fuzzy
msgid "Unread articles"
msgstr "Articles mémorisés"
-#: functions.php:5871
+#: functions.php:5802
#, fuzzy
msgid "Updated articles"
msgstr "Articles mémorisés"
-#: functions.php:5872
+#: functions.php:5803
#, fuzzy
msgid "Title contains"
msgstr "Titre ou contenu"
-#: functions.php:5873
+#: functions.php:5804
#, fuzzy
msgid "Content contains"
msgstr "Filtrage de contenu"
-#: functions.php:5874
+#: functions.php:5805
msgid "Score equals"
msgstr ""
-#: functions.php:5875
+#: functions.php:5806
msgid "Score is greater than"
msgstr ""
-#: functions.php:5876
+#: functions.php:5807
msgid "Score is less than"
msgstr ""
-#: functions.php:5877
+#: functions.php:5808
msgid "Articles newer than X hours"
msgstr ""
-#: functions.php:5878
+#: functions.php:5809
msgid "Articles newer than X days"
msgstr ""
-#: functions.php:5887
+#: functions.php:5818
msgid "Add"
msgstr ""
@@ -459,7 +452,7 @@ msgstr "afficher les flux"
msgid "display tags"
msgstr "afficher les étiquettes"
-#: localized_js.php:37 prefs.php:69 prefs.php:155 tt-rss.php:71
+#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
msgid "Loading, please wait..."
msgstr "Ouverture en cours, veuillez patienter..."
@@ -839,7 +832,7 @@ msgstr "Enregistrement d'un flux..."
#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:772
+#: mobile/functions.php:766
msgid "Title"
msgstr "Titre"
@@ -852,7 +845,7 @@ msgid "Link"
msgstr "Lien"
#: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:773
+#: mobile/functions.php:767
msgid "Content"
msgstr "Contenu"
@@ -864,7 +857,7 @@ msgstr ""
msgid "Filter article"
msgstr "Filtrer l'article"
-#: localized_schema.php:16 mobile/functions.php:580
+#: localized_schema.php:16 mobile/functions.php:574
msgid "Mark as read"
msgstr "Marquer comme lu"
@@ -1235,7 +1228,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Revenir à la configuration"
-#: prefs.php:77 prefs.php:158 tt-rss.php:79
+#: prefs.php:77 prefs.php:156 tt-rss.php:79
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1282,17 +1275,15 @@ msgstr "Autres flux"
msgid "Published Articles"
msgstr "Articles publiés"
-#: prefs.php:142 help/4.php:11
-msgid "Content Filtering"
-msgstr "Filtrage de contenu"
-
-#: prefs.php:145 help/4.php:12
-msgid "Label Editor"
-msgstr "Éditeur d'intitulé"
+#: prefs.php:142
+#, fuzzy
+msgid "Filters"
+msgstr "Fichier&nbsp;:"
-#: prefs.php:149 help/4.php:13
-msgid "User Manager"
-msgstr "Gestionnaire d'utilisateurs"
+#: prefs.php:147
+#, fuzzy
+msgid "Users"
+msgstr "Utilisateur"
#: sanity_check.php:8
msgid ""
@@ -1410,9 +1401,10 @@ msgstr "Nuage d'étiquettes"
#: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:282 modules/pref-labels.php:239
-#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:432
-#: mobile/functions.php:726 mobile/functions.php:780
+#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
+#: modules/pref-labels.php:103 modules/pref-users.php:364
+#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
+#: mobile/functions.php:774
msgid "Search"
msgstr "Rechercher"
@@ -1453,6 +1445,10 @@ msgstr "Marquer comme lus"
msgid "&nbsp;&nbsp;(Un)hide read feeds"
msgstr "(Dé)Masquer les flux lus"
+#: tt-rss.php:162
+msgid "Other actions:"
+msgstr "Autres actions&nbsp;:"
+
#: tt-rss.php:163
msgid "&nbsp;&nbsp;Create filter"
msgstr "&nbsp;&nbsp;Créer un filtre"
@@ -1481,15 +1477,15 @@ msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:185 mobile/functions.php:735
+#: tt-rss.php:185 mobile/functions.php:729
msgid "Search:"
msgstr "Rechercher&nbsp;:"
-#: tt-rss.php:193 mobile/functions.php:453
+#: tt-rss.php:193 mobile/functions.php:447
msgid "Adaptive"
msgstr "Adaptatif"
-#: tt-rss.php:194 mobile/functions.php:454
+#: tt-rss.php:194 mobile/functions.php:448
msgid "All Articles"
msgstr "Tous les articles"
@@ -1503,7 +1499,7 @@ msgid "Order:"
msgstr "Autre&nbsp;:"
#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:418
+#: modules/pref-filters.php:435
#, fuzzy
msgid "Date"
msgstr "Mettre à jour"
@@ -1517,7 +1513,7 @@ msgid "Limit:"
msgstr "Limite&nbsp;:"
#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:433
+#: mobile/functions.php:427
msgid "Update"
msgstr "Mettre à jour"
@@ -1690,10 +1686,10 @@ msgid "Subscribe"
msgstr "S'inscrire"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:279 modules/popup-dialog.php:446
-#: modules/popup-dialog.php:541 modules/pref-feeds.php:130
-#: modules/pref-feeds.php:395 modules/pref-feeds.php:546
-#: modules/pref-filters.php:157 modules/pref-users.php:184
+#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/pref-feeds.php:130 modules/pref-feeds.php:395
+#: modules/pref-feeds.php:546 modules/pref-filters.php:166
+#: modules/pref-users.php:184
msgid "Cancel"
msgstr "Annuler"
@@ -1702,7 +1698,7 @@ msgstr "Annuler"
msgid "match on:"
msgstr "Correspondance sur&nbsp;:"
-#: modules/popup-dialog.php:167 mobile/functions.php:774
+#: modules/popup-dialog.php:167 mobile/functions.php:768
msgid "Title or content"
msgstr "Titre ou contenu"
@@ -1710,38 +1706,10 @@ msgstr "Titre ou contenu"
msgid "Limit search to:"
msgstr ""
-#: modules/popup-dialog.php:188 mobile/functions.php:754
+#: modules/popup-dialog.php:188 mobile/functions.php:748
msgid "This feed"
msgstr "Ce flux"
-#: modules/popup-dialog.php:223
-#, fuzzy
-msgid "Create Label"
-msgstr "Créer un intitulé"
-
-#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:282
-msgid "Caption"
-msgstr "Descriptif"
-
-#: modules/popup-dialog.php:241 modules/pref-labels.php:46
-#, fuzzy
-msgid "Match SQL"
-msgstr "Correspondance"
-
-#: modules/popup-dialog.php:265 modules/pref-labels.php:68
-#, fuzzy
-msgid "Help"
-msgstr "Bonjour,"
-
-#: modules/popup-dialog.php:268
-msgid "Test"
-msgstr "Tester"
-
-#: modules/popup-dialog.php:275 modules/popup-dialog.php:442
-msgid "Create"
-msgstr "Créer"
-
#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
@@ -1753,17 +1721,17 @@ msgid "description"
msgstr "description"
#: modules/popup-dialog.php:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:377
+#: modules/pref-filters.php:394
msgid "Match"
msgstr "Correspondance"
#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:425
msgid "before"
msgstr ""
#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:409
+#: modules/pref-filters.php:426
#, fuzzy
msgid "after"
msgstr "Mettre à jour"
@@ -1792,20 +1760,24 @@ msgid "with parameters:"
msgstr ""
#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
-#: modules/pref-feeds.php:500 modules/pref-filters.php:114
+#: modules/pref-feeds.php:500 modules/pref-filters.php:123
#: modules/pref-users.php:165
#, fuzzy
msgid "Options"
msgstr "Options&nbsp;:"
-#: modules/popup-dialog.php:427 modules/pref-filters.php:126
+#: modules/popup-dialog.php:427 modules/pref-filters.php:135
msgid "Enabled"
msgstr "Activé"
-#: modules/popup-dialog.php:430 modules/pref-filters.php:135
+#: modules/popup-dialog.php:430 modules/pref-filters.php:144
msgid "Inverse match"
msgstr "Correspondance inverse"
+#: modules/popup-dialog.php:442
+msgid "Create"
+msgstr "Créer"
+
#: modules/popup-dialog.php:457
msgid "Update Errors"
msgstr "Erreurs de mise à jour"
@@ -1827,7 +1799,7 @@ msgid "Tags for this article (separated by commas):"
msgstr "Étiquettes pour cet article (séparées par des virgules)&nbsp;:"
#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
-#: modules/pref-feeds.php:544 modules/pref-filters.php:153
+#: modules/pref-feeds.php:544 modules/pref-filters.php:162
#: modules/pref-users.php:181
msgid "Save"
msgstr "Enregistrer"
@@ -2001,9 +1973,9 @@ msgstr "Créer la catégorie"
msgid "No feed categories defined."
msgstr "Aucune catégorie de flux définie."
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:147
-#: modules/pref-filters.php:462 modules/pref-labels.php:330
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
+#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
+#: modules/pref-labels.php:176 modules/pref-users.php:481
msgid "Remove"
msgstr "Supprimer"
@@ -2030,12 +2002,12 @@ msgid "Last&nbsp;Article"
msgstr "Dernier&nbsp;article"
#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:498 mobile/functions.php:501
+#: mobile/functions.php:492 mobile/functions.php:495
msgid "Updated"
msgstr "Mis à jour"
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:436
-#: modules/pref-labels.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
+#: modules/pref-labels-old.php:310 modules/pref-users.php:456
msgid "Click to edit"
msgstr ""
@@ -2047,8 +2019,8 @@ msgstr "Sélection&nbsp;:"
msgid "Recategorize"
msgstr "Changer de catégorie"
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:460
-#: modules/pref-labels.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
+#: modules/pref-labels-old.php:328 modules/pref-users.php:479
msgid "Edit"
msgstr "Modifier"
@@ -2060,7 +2032,7 @@ msgstr "Purger manuellement"
msgid "Clear feed data"
msgstr "Purger les données de flux"
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:299
+#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
#, fuzzy
msgid "Rescore articles"
msgstr "Articles mémorisés"
@@ -2129,94 +2101,109 @@ msgstr "Générer une autre adresse"
msgid "Filter Editor"
msgstr "Éditeur de filtre"
-#: modules/pref-filters.php:197
+#: modules/pref-filters.php:214
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "Filtre <b>%s</b> enregistré"
-#: modules/pref-filters.php:239
+#: modules/pref-filters.php:256
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Filtre <b>%s</b> créé"
-#: modules/pref-filters.php:292 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
msgid "Create filter"
msgstr "Créer un filtre"
-#: modules/pref-filters.php:367
+#: modules/pref-filters.php:384
msgid "filter_type_descr"
msgstr ""
-#: modules/pref-filters.php:368
+#: modules/pref-filters.php:385
msgid "action_description"
msgstr ""
-#: modules/pref-filters.php:379
+#: modules/pref-filters.php:396
#, fuzzy
msgid "Field"
msgstr "Flux"
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:397
#, fuzzy
msgid "Params"
msgstr "Paramètres&nbsp;:"
-#: modules/pref-filters.php:425
+#: modules/pref-filters.php:442
msgid "(Disabled)"
msgstr "(Désactivé)"
-#: modules/pref-filters.php:441
+#: modules/pref-filters.php:458
msgid "(Inverse)"
msgstr "(Inverse)"
-#: modules/pref-filters.php:470
+#: modules/pref-filters.php:487
msgid "No filters defined."
msgstr "Aucun filtre défini."
-#: modules/pref-filters.php:472
+#: modules/pref-filters.php:489
#, fuzzy
msgid "No matching filters found."
msgstr "Aucun article trouvé."
-#: modules/pref-labels.php:9
+#: modules/pref-labels-old.php:9
msgid ""
"Sorry, labels have been administratively disabled for this installation. "
"Please contact instance owner or edit configuration file to enable this "
"functionality."
msgstr ""
-#: modules/pref-labels.php:99
+#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
+#: modules/pref-labels.php:143
+msgid "Caption"
+msgstr "Descriptif"
+
+#: modules/pref-labels-old.php:46
+#, fuzzy
+msgid "Match SQL"
+msgstr "Correspondance"
+
+#: modules/pref-labels-old.php:68
+#, fuzzy
+msgid "Help"
+msgstr "Bonjour,"
+
+#: modules/pref-labels-old.php:99
msgid "Error: SQL expression is blank."
msgstr ""
-#: modules/pref-labels.php:179
+#: modules/pref-labels-old.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "Intitulé <b>%s</b> enregistré"
-#: modules/pref-labels.php:211
+#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Intitulé <b>%s</b> créé"
-#: modules/pref-labels.php:249 help/4.php:26
+#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
msgid "Create label"
msgstr "Créer un intitulé"
-#: modules/pref-labels.php:283
+#: modules/pref-labels-old.php:283
msgid "SQL Expression"
msgstr "Expression SQL"
-#: modules/pref-labels.php:308
+#: modules/pref-labels-old.php:308
#, fuzzy
msgid "[No caption]"
msgstr "Descriptif"
-#: modules/pref-labels.php:335
+#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
msgid "No labels defined."
msgstr "Aucun intitulé défini."
-#: modules/pref-labels.php:337
+#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
#, fuzzy
msgid "No matching labels found."
msgstr "Aucun article trouvé."
@@ -2644,6 +2631,18 @@ msgstr ""
msgid "Press any key to close this window."
msgstr "Fermer cette fenêtre"
+#: help/4.php:11
+msgid "Content Filtering"
+msgstr "Filtrage de contenu"
+
+#: help/4.php:12
+msgid "Label Editor"
+msgstr "Éditeur d'intitulé"
+
+#: help/4.php:13
+msgid "User Manager"
+msgstr "Gestionnaire d'utilisateurs"
+
#: help/4.php:19
#, fuzzy
msgid "Panel actions"
@@ -2678,32 +2677,32 @@ msgstr "Flux"
msgid "View tags"
msgstr "Modifier les étiquettes"
-#: mobile/functions.php:431
+#: mobile/functions.php:425
msgid "Back"
msgstr ""
-#: mobile/functions.php:441
+#: mobile/functions.php:435
msgid "View:"
msgstr "Afficher&nbsp;:"
-#: mobile/functions.php:463
+#: mobile/functions.php:457
msgid "Refresh"
msgstr ""
-#: mobile/functions.php:695
+#: mobile/functions.php:689
#, fuzzy
msgid "Tags:"
msgstr "Étiquettes"
-#: mobile/functions.php:727
+#: mobile/functions.php:721
msgid "Go back"
msgstr ""
-#: mobile/functions.php:738
+#: mobile/functions.php:732
msgid "Where:"
msgstr "Emplacement&nbsp;:"
-#: mobile/functions.php:769
+#: mobile/functions.php:763
#, fuzzy
msgid "Match on:"
msgstr "Correspondance sur&nbsp;:"
@@ -2713,6 +2712,20 @@ msgid "Internal error: Function not implemented"
msgstr ""
#, fuzzy
+#~ msgid "Search to label"
+#~ msgstr "Convertir en intitulé"
+
+#~ msgid "Convert to label"
+#~ msgstr "Convertir en intitulé"
+
+#, fuzzy
+#~ msgid "Create Label"
+#~ msgstr "Créer un intitulé"
+
+#~ msgid "Test"
+#~ msgstr "Tester"
+
+#, fuzzy
#~ msgid "Perform action"
#~ msgstr "Exécuter les mises à jour"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 2cfbcd644..a9fbef5c0 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 d1350a5a6..1605e57d3 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.2.19\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 17:20+0300\n"
+"POT-Creation-Date: 2009-01-18 15:24+0300\n"
"PO-Revision-Date: 2008-02-03 22:22::+0100\n"
"Last-Translator: MiszterX <[email protected]>\n"
"Language-Team: HUNGARIAN <[email protected]>\n"
@@ -164,278 +164,271 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2628 functions.php:2992 functions.php:3373 functions.php:4237
-#: help/3.php:57 mobile/functions.php:52
-msgid "Starred articles"
-msgstr "Csillagost hírek"
-
-#: functions.php:2644 functions.php:2994 functions.php:3376 functions.php:4244
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
-msgid "Published articles"
-msgstr "Publikált hírek"
-
-#: functions.php:2660 functions.php:2996 functions.php:3379 functions.php:4222
-#: help/3.php:58 mobile/functions.php:43
-msgid "Fresh articles"
-msgstr "Olvasatlan hírek"
-
-#: functions.php:2914 modules/popup-dialog.php:175
-#: modules/pref-filters.php:388 mobile/functions.php:741
+#: functions.php:2883 modules/popup-dialog.php:175
+#: modules/pref-filters.php:405 mobile/functions.php:735
msgid "All feeds"
msgstr "Minden feed"
-#: functions.php:2943 functions.php:2982 functions.php:3351 functions.php:4398
-#: functions.php:4428 modules/pref-feeds.php:1244
+#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1244
msgid "Uncategorized"
msgstr "Kategorizálatlan"
-#: functions.php:2972 functions.php:3540 mobile/functions.php:33
+#: functions.php:2941 functions.php:3508 mobile/functions.php:33
msgid "Special"
msgstr "Speciális"
-#: functions.php:2974 functions.php:3542 mobile/functions.php:75
+#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
msgid "Labels"
msgstr "Címkék"
-#: functions.php:3337 functions.php:3339
+#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
+#: mobile/functions.php:52
+msgid "Starred articles"
+msgstr "Csillagost hírek"
+
+#: functions.php:2963 functions.php:3344 functions.php:4212
+#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+msgid "Published articles"
+msgstr "Publikált hírek"
+
+#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
+#: mobile/functions.php:43
+msgid "Fresh articles"
+msgstr "Olvasatlan hírek"
+
+#: functions.php:3305 functions.php:3307
msgid "Search results"
msgstr "Keresési találatok"
-#: functions.php:3355 functions.php:3368 functions.php:3374 functions.php:3377
-#: functions.php:3380 functions.php:3388
+#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
+#: functions.php:3348 functions.php:3356
msgid "Searched for"
msgstr ""
-#: functions.php:4014 functions.php:4064 functions.php:5416
+#: functions.php:3989 functions.php:4045 functions.php:5368
#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:341 modules/pref-labels.php:275
-#: modules/pref-users.php:408
+#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
+#: modules/pref-labels.php:136 modules/pref-users.php:408
msgid "Select:"
msgstr "Kiválaszt:"
-#: functions.php:4015 functions.php:4065 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:342
-#: modules/pref-labels.php:276 modules/pref-users.php:409
-#: mobile/functions.php:567
+#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
+#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
+#: modules/pref-users.php:409 mobile/functions.php:561
msgid "All"
msgstr "Mind"
-#: functions.php:4016 functions.php:4022 functions.php:4066 functions.php:4069
-#: tt-rss.php:196 mobile/functions.php:455 mobile/functions.php:568
+#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
+#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
msgid "Unread"
msgstr "Olvasatlan"
-#: functions.php:4017 mobile/functions.php:570
+#: functions.php:3992 mobile/functions.php:564
#, fuzzy
msgid "Invert"
msgstr "(ellentét)"
-#: functions.php:4018 functions.php:4067 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:343
-#: modules/pref-labels.php:277 modules/pref-users.php:410
-#: mobile/functions.php:569
+#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
+#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
+#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
+#: modules/pref-users.php:410 mobile/functions.php:563
msgid "None"
msgstr "Egyiksem"
-#: functions.php:4020 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
msgid "Actions..."
msgstr "Műveletek"
-#: functions.php:4021
+#: functions.php:3996
#, fuzzy
msgid "Selection toggle:"
msgstr "Kiválaszt:"
-#: functions.php:4023 functions.php:4070 tt-rss.php:195
-#: mobile/functions.php:456
+#: functions.php:3998 functions.php:4051 tt-rss.php:195
+#: mobile/functions.php:450
msgid "Starred"
msgstr "Csillagoz"
-#: functions.php:4024
+#: functions.php:3999
msgid "Published"
msgstr "Publikál"
-#: functions.php:4026 functions.php:4072
+#: functions.php:4001 functions.php:4053
msgid "Mark as read:"
msgstr ""
-#: functions.php:4027 mobile/functions.php:575
+#: functions.php:4002 mobile/functions.php:569
msgid "Selection"
msgstr "Kiválasztottakat"
-#: functions.php:4041 mobile/functions.php:577
+#: functions.php:4016 mobile/functions.php:571
msgid "Entire feed"
msgstr "Összes feed"
-#: functions.php:4044 tt-rss.php:162
-msgid "Other actions:"
-msgstr "Más művelet:"
+#: functions.php:4019
+#, fuzzy
+msgid "Assign label:"
+msgstr "Tag felajánlása"
-#: functions.php:4051 functions.php:4053
+#: functions.php:4031
#, fuzzy
-msgid "Search to label"
-msgstr "Címke készítése"
+msgid "(remove)"
+msgstr "Eltávolít"
-#: functions.php:4069
+#: functions.php:4050
msgid "Toggle:"
msgstr "Megjelöl:"
-#: functions.php:4073 mobile/functions.php:576
+#: functions.php:4054 mobile/functions.php:570
msgid "Page"
msgstr "Oldal"
-#: functions.php:4074 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:378
+#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:395
msgid "Feed"
msgstr ""
-#: functions.php:4081
-msgid "Convert to label"
-msgstr ""
-
-#: functions.php:4128
+#: functions.php:4096
msgid "Generated feed"
msgstr ""
-#: functions.php:4172
+#: functions.php:4145
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4210
-msgid "Dashboard"
-msgstr ""
-
-#: functions.php:4448
+#: functions.php:4398
msgid "No feeds to display."
msgstr ""
-#: functions.php:4465 mobile/functions.php:12
+#: functions.php:4415 mobile/functions.php:12
msgid "Tags"
msgstr ""
-#: functions.php:4705
+#: functions.php:4657
msgid " - "
msgstr ""
-#: functions.php:4764 functions.php:4765
+#: functions.php:4716 functions.php:4717
msgid "no tags"
msgstr ""
-#: functions.php:4772
+#: functions.php:4724
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4780
+#: functions.php:4732
#, fuzzy
msgid "Display original article content"
msgstr "Mutasd az utolsó hír időpontját"
-#: functions.php:4787 functions.php:5426
+#: functions.php:4739 functions.php:5378
msgid "Show article summary in new window"
msgstr ""
-#: functions.php:4823 functions.php:5350
+#: functions.php:4775 functions.php:5302
#, fuzzy
msgid "unknown type"
msgstr "Ismeretlen hiba"
-#: functions.php:4829 functions.php:5356
+#: functions.php:4781 functions.php:5308
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4865 functions.php:5390
+#: functions.php:4817 functions.php:5342
msgid "Attachment:"
msgstr "Csatolmány:"
-#: functions.php:4867 functions.php:5392
+#: functions.php:4819 functions.php:5344
msgid "Attachments:"
msgstr "Csatolmányok:"
-#: functions.php:4887 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
msgid "Close this window"
msgstr ""
-#: functions.php:4943 modules/pref-feed-browser.php:75
+#: functions.php:4895 modules/pref-feed-browser.php:75
msgid "Feed not found."
msgstr "Feed nem található"
-#: functions.php:5012 mobile/functions.php:420
+#: functions.php:4964 mobile/functions.php:414
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5125
+#: functions.php:5077
msgid "(Click to change)"
msgstr ""
-#: functions.php:5324
+#: functions.php:5276
#, fuzzy
msgid "Click to expand article"
msgstr "Tárolt hírek"
-#: functions.php:5488
+#: functions.php:5440
#, fuzzy
msgid "No unread articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5491
+#: functions.php:5443
#, fuzzy
msgid "No starred articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5494
+#: functions.php:5446
#, fuzzy
msgid "No articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5862
+#: functions.php:5793
#, fuzzy
msgid "Match "
msgstr "Egyezés"
-#: functions.php:5870
+#: functions.php:5801
#, fuzzy
msgid "Unread articles"
msgstr "Tárolt hírek"
-#: functions.php:5871
+#: functions.php:5802
#, fuzzy
msgid "Updated articles"
msgstr "Tárolt hírek"
-#: functions.php:5872
+#: functions.php:5803
#, fuzzy
msgid "Title contains"
msgstr "Cím vagy tartalom"
-#: functions.php:5873
+#: functions.php:5804
#, fuzzy
msgid "Content contains"
msgstr "Tartalomszűrő"
-#: functions.php:5874
+#: functions.php:5805
msgid "Score equals"
msgstr ""
-#: functions.php:5875
+#: functions.php:5806
msgid "Score is greater than"
msgstr ""
-#: functions.php:5876
+#: functions.php:5807
msgid "Score is less than"
msgstr ""
-#: functions.php:5877
+#: functions.php:5808
msgid "Articles newer than X hours"
msgstr ""
-#: functions.php:5878
+#: functions.php:5809
msgid "Articles newer than X days"
msgstr ""
-#: functions.php:5887
+#: functions.php:5818
msgid "Add"
msgstr ""
@@ -447,7 +440,7 @@ msgstr ""
msgid "display tags"
msgstr ""
-#: localized_js.php:37 prefs.php:69 prefs.php:155 tt-rss.php:71
+#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
msgid "Loading, please wait..."
msgstr "Töltés, kérem várjon..."
@@ -825,7 +818,7 @@ msgstr "Címke mentése"
#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:772
+#: mobile/functions.php:766
msgid "Title"
msgstr "Cím"
@@ -838,7 +831,7 @@ msgid "Link"
msgstr "Link"
#: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:773
+#: mobile/functions.php:767
msgid "Content"
msgstr "Tartalom"
@@ -850,7 +843,7 @@ msgstr ""
msgid "Filter article"
msgstr ""
-#: localized_schema.php:16 mobile/functions.php:580
+#: localized_schema.php:16 mobile/functions.php:574
msgid "Mark as read"
msgstr "Olvasottá tesz"
@@ -1182,7 +1175,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "VIssza a beállításokhoz"
-#: prefs.php:77 prefs.php:158 tt-rss.php:79
+#: prefs.php:77 prefs.php:156 tt-rss.php:79
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1226,17 +1219,15 @@ msgstr "Mások Feedjei"
msgid "Published Articles"
msgstr "Publikált Hírek"
-#: prefs.php:142 help/4.php:11
-msgid "Content Filtering"
-msgstr "Tartalomszűrő"
-
-#: prefs.php:145 help/4.php:12
-msgid "Label Editor"
-msgstr "Címke Szerkesztő"
+#: prefs.php:142
+#, fuzzy
+msgid "Filters"
+msgstr "File:"
-#: prefs.php:149 help/4.php:13
-msgid "User Manager"
-msgstr "Felhasználók kezelése"
+#: prefs.php:147
+#, fuzzy
+msgid "Users"
+msgstr "Felhasználó"
#: sanity_check.php:8
msgid ""
@@ -1325,9 +1316,10 @@ msgstr "tag felhő"
#: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:282 modules/pref-labels.php:239
-#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:432
-#: mobile/functions.php:726 mobile/functions.php:780
+#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
+#: modules/pref-labels.php:103 modules/pref-users.php:364
+#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
+#: mobile/functions.php:774
msgid "Search"
msgstr "Keresés"
@@ -1368,6 +1360,10 @@ msgstr "&nbsp;&nbsp;Olvasottá tesz"
msgid "&nbsp;&nbsp;(Un)hide read feeds"
msgstr "&nbsp;&nbsp;Megmutatja/elrejti az olvasott feedeket"
+#: tt-rss.php:162
+msgid "Other actions:"
+msgstr "Más művelet:"
+
#: tt-rss.php:163
msgid "&nbsp;&nbsp;Create filter"
msgstr "&nbsp;&nbsp;Szűrők létrehozása"
@@ -1396,15 +1392,15 @@ msgstr "Minden feed"
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:185 mobile/functions.php:735
+#: tt-rss.php:185 mobile/functions.php:729
msgid "Search:"
msgstr "Keresés"
-#: tt-rss.php:193 mobile/functions.php:453
+#: tt-rss.php:193 mobile/functions.php:447
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:194 mobile/functions.php:454
+#: tt-rss.php:194 mobile/functions.php:448
msgid "All Articles"
msgstr "Minden hír"
@@ -1418,7 +1414,7 @@ msgid "Order:"
msgstr "Más:"
#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:418
+#: modules/pref-filters.php:435
#, fuzzy
msgid "Date"
msgstr "Frissítés"
@@ -1432,7 +1428,7 @@ msgid "Limit:"
msgstr "Limit:"
#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:433
+#: mobile/functions.php:427
msgid "Update"
msgstr "Frissítés"
@@ -1592,10 +1588,10 @@ msgid "Subscribe"
msgstr "Feliratkozás"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:279 modules/popup-dialog.php:446
-#: modules/popup-dialog.php:541 modules/pref-feeds.php:130
-#: modules/pref-feeds.php:395 modules/pref-feeds.php:546
-#: modules/pref-filters.php:157 modules/pref-users.php:184
+#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/pref-feeds.php:130 modules/pref-feeds.php:395
+#: modules/pref-feeds.php:546 modules/pref-filters.php:166
+#: modules/pref-users.php:184
msgid "Cancel"
msgstr "Mégse"
@@ -1604,7 +1600,7 @@ msgstr "Mégse"
msgid "match on:"
msgstr "Egyezés ezzel:"
-#: modules/popup-dialog.php:167 mobile/functions.php:774
+#: modules/popup-dialog.php:167 mobile/functions.php:768
msgid "Title or content"
msgstr "Cím vagy tartalom"
@@ -1612,37 +1608,10 @@ msgstr "Cím vagy tartalom"
msgid "Limit search to:"
msgstr ""
-#: modules/popup-dialog.php:188 mobile/functions.php:754
+#: modules/popup-dialog.php:188 mobile/functions.php:748
msgid "This feed"
msgstr "Ez a feed"
-#: modules/popup-dialog.php:223
-#, fuzzy
-msgid "Create Label"
-msgstr "Címke készítése"
-
-#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:282
-msgid "Caption"
-msgstr "Aláírás"
-
-#: modules/popup-dialog.php:241 modules/pref-labels.php:46
-#, fuzzy
-msgid "Match SQL"
-msgstr "Egyezés"
-
-#: modules/popup-dialog.php:265 modules/pref-labels.php:68
-msgid "Help"
-msgstr "Segítség"
-
-#: modules/popup-dialog.php:268
-msgid "Test"
-msgstr "Teszt"
-
-#: modules/popup-dialog.php:275 modules/popup-dialog.php:442
-msgid "Create"
-msgstr "Készít"
-
#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
@@ -1655,17 +1624,17 @@ msgid "description"
msgstr "Kiválasztottakat"
#: modules/popup-dialog.php:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:377
+#: modules/pref-filters.php:394
msgid "Match"
msgstr "Egyezés"
#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:425
msgid "before"
msgstr ""
#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:409
+#: modules/pref-filters.php:426
#, fuzzy
msgid "after"
msgstr "Frissítés"
@@ -1694,20 +1663,24 @@ msgid "with parameters:"
msgstr ""
#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
-#: modules/pref-feeds.php:500 modules/pref-filters.php:114
+#: modules/pref-feeds.php:500 modules/pref-filters.php:123
#: modules/pref-users.php:165
#, fuzzy
msgid "Options"
msgstr "Beállítások:"
-#: modules/popup-dialog.php:427 modules/pref-filters.php:126
+#: modules/popup-dialog.php:427 modules/pref-filters.php:135
msgid "Enabled"
msgstr "Engedélyez"
-#: modules/popup-dialog.php:430 modules/pref-filters.php:135
+#: modules/popup-dialog.php:430 modules/pref-filters.php:144
msgid "Inverse match"
msgstr ""
+#: modules/popup-dialog.php:442
+msgid "Create"
+msgstr "Készít"
+
#: modules/popup-dialog.php:457
msgid "Update Errors"
msgstr "Frissítési hiba"
@@ -1729,7 +1702,7 @@ msgid "Tags for this article (separated by commas):"
msgstr ""
#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
-#: modules/pref-feeds.php:544 modules/pref-filters.php:153
+#: modules/pref-feeds.php:544 modules/pref-filters.php:162
#: modules/pref-users.php:181
msgid "Save"
msgstr "Mentés"
@@ -1900,9 +1873,9 @@ msgstr "Kategória létrehozása"
msgid "No feed categories defined."
msgstr "Nincs feed kategória definiálva"
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:147
-#: modules/pref-filters.php:462 modules/pref-labels.php:330
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
+#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
+#: modules/pref-labels.php:176 modules/pref-users.php:481
msgid "Remove"
msgstr "Eltávolít"
@@ -1927,12 +1900,12 @@ msgid "Last&nbsp;Article"
msgstr "Utolsó&nbsp;Hír"
#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:498 mobile/functions.php:501
+#: mobile/functions.php:492 mobile/functions.php:495
msgid "Updated"
msgstr "Frissítve"
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:436
-#: modules/pref-labels.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
+#: modules/pref-labels-old.php:310 modules/pref-users.php:456
msgid "Click to edit"
msgstr ""
@@ -1944,8 +1917,8 @@ msgstr "Kiválaszt:"
msgid "Recategorize"
msgstr "Újrakategorizál"
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:460
-#: modules/pref-labels.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
+#: modules/pref-labels-old.php:328 modules/pref-users.php:479
msgid "Edit"
msgstr "Szerkesztés"
@@ -1957,7 +1930,7 @@ msgstr ""
msgid "Clear feed data"
msgstr "Feed adatok törlése"
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:299
+#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
#, fuzzy
msgid "Rescore articles"
msgstr "Tárolt hírek"
@@ -2021,94 +1994,108 @@ msgstr "Másik cím genrálása"
msgid "Filter Editor"
msgstr "Szűrő módosítása"
-#: modules/pref-filters.php:197
+#: modules/pref-filters.php:214
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr ""
-#: modules/pref-filters.php:239
+#: modules/pref-filters.php:256
#, php-format
msgid "Created filter <b>%s</b>"
msgstr ""
-#: modules/pref-filters.php:292 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
msgid "Create filter"
msgstr "Szárő készítése"
-#: modules/pref-filters.php:367
+#: modules/pref-filters.php:384
msgid "filter_type_descr"
msgstr ""
-#: modules/pref-filters.php:368
+#: modules/pref-filters.php:385
msgid "action_description"
msgstr ""
-#: modules/pref-filters.php:379
+#: modules/pref-filters.php:396
#, fuzzy
msgid "Field"
msgstr "Ebben a mezőben:"
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:397
#, fuzzy
msgid "Params"
msgstr "Paraméterek"
-#: modules/pref-filters.php:425
+#: modules/pref-filters.php:442
msgid "(Disabled)"
msgstr "(Kikapcsolva)"
-#: modules/pref-filters.php:441
+#: modules/pref-filters.php:458
msgid "(Inverse)"
msgstr "(ellentét)"
-#: modules/pref-filters.php:470
+#: modules/pref-filters.php:487
msgid "No filters defined."
msgstr "Nincs szűrő definiálva."
-#: modules/pref-filters.php:472
+#: modules/pref-filters.php:489
#, fuzzy
msgid "No matching filters found."
msgstr "Nincs szűrő definiálva."
-#: modules/pref-labels.php:9
+#: modules/pref-labels-old.php:9
msgid ""
"Sorry, labels have been administratively disabled for this installation. "
"Please contact instance owner or edit configuration file to enable this "
"functionality."
msgstr ""
-#: modules/pref-labels.php:99
+#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
+#: modules/pref-labels.php:143
+msgid "Caption"
+msgstr "Aláírás"
+
+#: modules/pref-labels-old.php:46
+#, fuzzy
+msgid "Match SQL"
+msgstr "Egyezés"
+
+#: modules/pref-labels-old.php:68
+msgid "Help"
+msgstr "Segítség"
+
+#: modules/pref-labels-old.php:99
msgid "Error: SQL expression is blank."
msgstr ""
-#: modules/pref-labels.php:179
+#: modules/pref-labels-old.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:211
+#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
#, php-format
msgid "Created label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:249 help/4.php:26
+#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
msgid "Create label"
msgstr "Címke készítése"
-#: modules/pref-labels.php:283
+#: modules/pref-labels-old.php:283
msgid "SQL Expression"
msgstr ""
-#: modules/pref-labels.php:308
+#: modules/pref-labels-old.php:308
#, fuzzy
msgid "[No caption]"
msgstr "Aláírás"
-#: modules/pref-labels.php:335
+#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
msgid "No labels defined."
msgstr "Nincs címke definiálva."
-#: modules/pref-labels.php:337
+#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
#, fuzzy
msgid "No matching labels found."
msgstr "Nincs címke definiálva."
@@ -2525,6 +2512,18 @@ msgstr ""
msgid "Press any key to close this window."
msgstr ""
+#: help/4.php:11
+msgid "Content Filtering"
+msgstr "Tartalomszűrő"
+
+#: help/4.php:12
+msgid "Label Editor"
+msgstr "Címke Szerkesztő"
+
+#: help/4.php:13
+msgid "User Manager"
+msgstr "Felhasználók kezelése"
+
#: help/4.php:19
#, fuzzy
msgid "Panel actions"
@@ -2559,31 +2558,31 @@ msgstr "Feed:"
msgid "View tags"
msgstr "Tegek szerkesztése"
-#: mobile/functions.php:431
+#: mobile/functions.php:425
msgid "Back"
msgstr ""
-#: mobile/functions.php:441
+#: mobile/functions.php:435
msgid "View:"
msgstr "Nézet"
-#: mobile/functions.php:463
+#: mobile/functions.php:457
msgid "Refresh"
msgstr ""
-#: mobile/functions.php:695
+#: mobile/functions.php:689
msgid "Tags:"
msgstr ""
-#: mobile/functions.php:727
+#: mobile/functions.php:721
msgid "Go back"
msgstr ""
-#: mobile/functions.php:738
+#: mobile/functions.php:732
msgid "Where:"
msgstr "Ahol:"
-#: mobile/functions.php:769
+#: mobile/functions.php:763
#, fuzzy
msgid "Match on:"
msgstr "Egyezés ezzel:"
@@ -2593,6 +2592,17 @@ msgid "Internal error: Function not implemented"
msgstr ""
#, fuzzy
+#~ msgid "Search to label"
+#~ msgstr "Címke készítése"
+
+#, fuzzy
+#~ msgid "Create Label"
+#~ msgstr "Címke készítése"
+
+#~ msgid "Test"
+#~ msgstr "Teszt"
+
+#, fuzzy
#~ msgid "Perform action"
#~ msgstr "Művelet"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 79baae95a..bb97f69b7 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 f743d8621..02963492a 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ttrss-1.2.30\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 17:20+0300\n"
+"POT-Creation-Date: 2009-01-18 15:24+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"
@@ -169,198 +169,192 @@ msgstr ""
"Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
"configurazione del PHP"
-#: functions.php:2628 functions.php:2992 functions.php:3373 functions.php:4237
-#: help/3.php:57 mobile/functions.php:52
-msgid "Starred articles"
-msgstr "Articoli con stella"
-
-#: functions.php:2644 functions.php:2994 functions.php:3376 functions.php:4244
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
-msgid "Published articles"
-msgstr "Articoli pubblicati"
-
-#: functions.php:2660 functions.php:2996 functions.php:3379 functions.php:4222
-#: help/3.php:58 mobile/functions.php:43
-msgid "Fresh articles"
-msgstr "Articoli nuovi"
-
-#: functions.php:2914 modules/popup-dialog.php:175
-#: modules/pref-filters.php:388 mobile/functions.php:741
+#: functions.php:2883 modules/popup-dialog.php:175
+#: modules/pref-filters.php:405 mobile/functions.php:735
msgid "All feeds"
msgstr "Tutti i notiziari"
-#: functions.php:2943 functions.php:2982 functions.php:3351 functions.php:4398
-#: functions.php:4428 modules/pref-feeds.php:1244
+#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1244
msgid "Uncategorized"
msgstr "Senza categoria"
-#: functions.php:2972 functions.php:3540 mobile/functions.php:33
+#: functions.php:2941 functions.php:3508 mobile/functions.php:33
msgid "Special"
msgstr "Speciale"
-#: functions.php:2974 functions.php:3542 mobile/functions.php:75
+#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
msgid "Labels"
msgstr "Etichette"
-#: functions.php:3337 functions.php:3339
+#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
+#: mobile/functions.php:52
+msgid "Starred articles"
+msgstr "Articoli con stella"
+
+#: functions.php:2963 functions.php:3344 functions.php:4212
+#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+msgid "Published articles"
+msgstr "Articoli pubblicati"
+
+#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
+#: mobile/functions.php:43
+msgid "Fresh articles"
+msgstr "Articoli nuovi"
+
+#: functions.php:3305 functions.php:3307
msgid "Search results"
msgstr "Risultati della ricerca"
-#: functions.php:3355 functions.php:3368 functions.php:3374 functions.php:3377
-#: functions.php:3380 functions.php:3388
+#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
+#: functions.php:3348 functions.php:3356
msgid "Searched for"
msgstr "Ricerca"
-#: functions.php:4014 functions.php:4064 functions.php:5416
+#: functions.php:3989 functions.php:4045 functions.php:5368
#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:341 modules/pref-labels.php:275
-#: modules/pref-users.php:408
+#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
+#: modules/pref-labels.php:136 modules/pref-users.php:408
msgid "Select:"
msgstr "Seleziona:"
-#: functions.php:4015 functions.php:4065 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:342
-#: modules/pref-labels.php:276 modules/pref-users.php:409
-#: mobile/functions.php:567
+#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
+#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
+#: modules/pref-users.php:409 mobile/functions.php:561
msgid "All"
msgstr "Tutti"
-#: functions.php:4016 functions.php:4022 functions.php:4066 functions.php:4069
-#: tt-rss.php:196 mobile/functions.php:455 mobile/functions.php:568
+#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
+#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
msgid "Unread"
msgstr "Non letti"
-#: functions.php:4017 mobile/functions.php:570
+#: functions.php:3992 mobile/functions.php:564
msgid "Invert"
msgstr "Inverti"
-#: functions.php:4018 functions.php:4067 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:343
-#: modules/pref-labels.php:277 modules/pref-users.php:410
-#: mobile/functions.php:569
+#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
+#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
+#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
+#: modules/pref-users.php:410 mobile/functions.php:563
msgid "None"
msgstr "Nessuno"
-#: functions.php:4020 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
msgid "Actions..."
msgstr "Azioni..."
-#: functions.php:4021
+#: functions.php:3996
msgid "Selection toggle:"
msgstr "Inverti selezione:"
-#: functions.php:4023 functions.php:4070 tt-rss.php:195
-#: mobile/functions.php:456
+#: functions.php:3998 functions.php:4051 tt-rss.php:195
+#: mobile/functions.php:450
msgid "Starred"
msgstr "Con stella"
-#: functions.php:4024
+#: functions.php:3999
msgid "Published"
msgstr "Pubblicati"
-#: functions.php:4026 functions.php:4072
+#: functions.php:4001 functions.php:4053
msgid "Mark as read:"
msgstr "Segna come letti:"
-#: functions.php:4027 mobile/functions.php:575
+#: functions.php:4002 mobile/functions.php:569
msgid "Selection"
msgstr "Selezione"
-#: functions.php:4041 mobile/functions.php:577
+#: functions.php:4016 mobile/functions.php:571
msgid "Entire feed"
msgstr "Intero notiziario"
-#: functions.php:4044 tt-rss.php:162
-msgid "Other actions:"
-msgstr "Altre azioni:"
+#: functions.php:4019
+#, fuzzy
+msgid "Assign label:"
+msgstr "Assegna etichette"
-#: functions.php:4051 functions.php:4053
-msgid "Search to label"
-msgstr "Cerca per etichetta"
+#: functions.php:4031
+#, fuzzy
+msgid "(remove)"
+msgstr "Rimuovi"
-#: functions.php:4069
+#: functions.php:4050
msgid "Toggle:"
msgstr "Inverti:"
-#: functions.php:4073 mobile/functions.php:576
+#: functions.php:4054 mobile/functions.php:570
msgid "Page"
msgstr "Pagina"
-#: functions.php:4074 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:378
+#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:395
msgid "Feed"
msgstr "Notiziario"
-#: functions.php:4081
-msgid "Convert to label"
-msgstr "Converti a etichetta"
-
-#: functions.php:4128
+#: functions.php:4096
msgid "Generated feed"
msgstr "Notiziario generato"
-#: functions.php:4172
+#: functions.php:4145
msgid "Click to collapse category"
msgstr "Fare clic per contrarre la categoria"
-#: functions.php:4210
-msgid "Dashboard"
-msgstr "Bacheca"
-
-#: functions.php:4448
+#: functions.php:4398
msgid "No feeds to display."
msgstr "Nessun notiziario da visualizzare."
-#: functions.php:4465 mobile/functions.php:12
+#: functions.php:4415 mobile/functions.php:12
msgid "Tags"
msgstr "Etichette"
-#: functions.php:4705
+#: functions.php:4657
msgid " - "
msgstr " - "
-#: functions.php:4764 functions.php:4765
+#: functions.php:4716 functions.php:4717
msgid "no tags"
msgstr "nessuna etichetta"
-#: functions.php:4772
+#: functions.php:4724
msgid "Edit tags for this article"
msgstr "Modifica le etichette per questo articolo"
-#: functions.php:4780
+#: functions.php:4732
msgid "Display original article content"
msgstr "Visualizza il contenuto originale dell&apos;articolo"
-#: functions.php:4787 functions.php:5426
+#: functions.php:4739 functions.php:5378
msgid "Show article summary in new window"
msgstr "Mostra il sommario dell&apos;articolo in una nuova finestra"
-#: functions.php:4823 functions.php:5350
+#: functions.php:4775 functions.php:5302
msgid "unknown type"
msgstr "tipo sconosciuto"
-#: functions.php:4829 functions.php:5356
+#: functions.php:4781 functions.php:5308
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4865 functions.php:5390
+#: functions.php:4817 functions.php:5342
msgid "Attachment:"
msgstr "Allegato:"
-#: functions.php:4867 functions.php:5392
+#: functions.php:4819 functions.php:5344
msgid "Attachments:"
msgstr "Allegati:"
-#: functions.php:4887 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
msgid "Close this window"
msgstr "Chiudi questa finestra"
-#: functions.php:4943 modules/pref-feed-browser.php:75
+#: functions.php:4895 modules/pref-feed-browser.php:75
msgid "Feed not found."
msgstr "Notiziario non trovato."
-#: functions.php:5012 mobile/functions.php:420
+#: functions.php:4964 mobile/functions.php:414
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -368,67 +362,67 @@ msgstr ""
"Impossibile visualizzare il notiziario (interrogazione fallita). Controllare "
"che l&apos;etichetta corrisponda alla sintassi o la configurazione locale."
-#: functions.php:5125
+#: functions.php:5077
msgid "(Click to change)"
msgstr "(Fare clic per cambiare)"
-#: functions.php:5324
+#: functions.php:5276
msgid "Click to expand article"
msgstr "Fare clic per espandere l&apos;articolo"
-#: functions.php:5488
+#: functions.php:5440
msgid "No unread articles found to display."
msgstr "Nessun articolo non letto trovato da visualizzare."
-#: functions.php:5491
+#: functions.php:5443
msgid "No starred articles found to display."
msgstr "Nessun articolo con stella trovato da visualizzare."
-#: functions.php:5494
+#: functions.php:5446
msgid "No articles found to display."
msgstr "Nessun articolo trovato da visualizzare."
-#: functions.php:5862
+#: functions.php:5793
msgid "Match "
msgstr "Corrisponde "
-#: functions.php:5870
+#: functions.php:5801
msgid "Unread articles"
msgstr "Articoli non letti"
-#: functions.php:5871
+#: functions.php:5802
msgid "Updated articles"
msgstr "Articoli aggiornati"
-#: functions.php:5872
+#: functions.php:5803
msgid "Title contains"
msgstr "Il titolo contiene"
-#: functions.php:5873
+#: functions.php:5804
msgid "Content contains"
msgstr "Il contenuto contiene"
-#: functions.php:5874
+#: functions.php:5805
msgid "Score equals"
msgstr "Il punteggio è"
-#: functions.php:5875
+#: functions.php:5806
msgid "Score is greater than"
msgstr "Il punteggio è maggiore di"
-#: functions.php:5876
+#: functions.php:5807
msgid "Score is less than"
msgstr "Il punteggio è minore di"
-#: functions.php:5877
+#: functions.php:5808
msgid "Articles newer than X hours"
msgstr "Articoli più recenti di X ore"
-#: functions.php:5878
+#: functions.php:5809
msgid "Articles newer than X days"
msgstr "Articoli più recenti di X giorni"
-#: functions.php:5887
+#: functions.php:5818
msgid "Add"
msgstr "Aggiungi"
@@ -440,7 +434,7 @@ msgstr "visualizza notiziari"
msgid "display tags"
msgstr "visualizza etichette"
-#: localized_js.php:37 prefs.php:69 prefs.php:155 tt-rss.php:71
+#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
msgid "Loading, please wait..."
msgstr "Caricamento, attendere prego..."
@@ -815,7 +809,7 @@ msgstr "Salvataggio notiziari..."
#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:772
+#: mobile/functions.php:766
msgid "Title"
msgstr "Titolo"
@@ -828,7 +822,7 @@ msgid "Link"
msgstr "Collegamento"
#: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:773
+#: mobile/functions.php:767
msgid "Content"
msgstr "Contenuto"
@@ -840,7 +834,7 @@ msgstr "Data dell&apos;articolo"
msgid "Filter article"
msgstr "Filtra articoli"
-#: localized_schema.php:16 mobile/functions.php:580
+#: localized_schema.php:16 mobile/functions.php:574
msgid "Mark as read"
msgstr "Segna come letto"
@@ -1213,7 +1207,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Ritorna alle preferenze"
-#: prefs.php:77 prefs.php:158 tt-rss.php:79
+#: prefs.php:77 prefs.php:156 tt-rss.php:79
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1259,17 +1253,15 @@ msgstr "Altri notiziari"
msgid "Published Articles"
msgstr "Articoli pubblicati"
-#: prefs.php:142 help/4.php:11
-msgid "Content Filtering"
-msgstr "Filtro contenuti"
-
-#: prefs.php:145 help/4.php:12
-msgid "Label Editor"
-msgstr "Editor etichette"
+#: prefs.php:142
+#, fuzzy
+msgid "Filters"
+msgstr "File:"
-#: prefs.php:149 help/4.php:13
-msgid "User Manager"
-msgstr "Gestore utenti"
+#: prefs.php:147
+#, fuzzy
+msgid "Users"
+msgstr "Utente"
#: sanity_check.php:8
msgid ""
@@ -1385,9 +1377,10 @@ msgstr "nuvola etichette"
#: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:282 modules/pref-labels.php:239
-#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:432
-#: mobile/functions.php:726 mobile/functions.php:780
+#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
+#: modules/pref-labels.php:103 modules/pref-users.php:364
+#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
+#: mobile/functions.php:774
msgid "Search"
msgstr "Cerca"
@@ -1427,6 +1420,10 @@ msgstr "&nbsp;&nbsp;Segna come letto"
msgid "&nbsp;&nbsp;(Un)hide read feeds"
msgstr "&nbsp;&nbsp;Visualizza/Nascondi notiziari letti"
+#: tt-rss.php:162
+msgid "Other actions:"
+msgstr "Altre azioni:"
+
#: tt-rss.php:163
msgid "&nbsp;&nbsp;Create filter"
msgstr "&nbsp;&nbsp;Crea filtro"
@@ -1451,15 +1448,15 @@ msgstr "Contrai elenco notiziari"
msgid "Toggle Feedlist"
msgstr "Inverti elenco notiziari"
-#: tt-rss.php:185 mobile/functions.php:735
+#: tt-rss.php:185 mobile/functions.php:729
msgid "Search:"
msgstr "Cerca:"
-#: tt-rss.php:193 mobile/functions.php:453
+#: tt-rss.php:193 mobile/functions.php:447
msgid "Adaptive"
msgstr "Adattivo"
-#: tt-rss.php:194 mobile/functions.php:454
+#: tt-rss.php:194 mobile/functions.php:448
msgid "All Articles"
msgstr "Tutti gli articoli"
@@ -1472,7 +1469,7 @@ msgid "Order:"
msgstr "Ordine:"
#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:418
+#: modules/pref-filters.php:435
msgid "Date"
msgstr "Data"
@@ -1485,7 +1482,7 @@ msgid "Limit:"
msgstr "Limite:"
#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:433
+#: mobile/functions.php:427
msgid "Update"
msgstr "Aggiorna"
@@ -1660,10 +1657,10 @@ msgid "Subscribe"
msgstr "Sottoscrivi"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:279 modules/popup-dialog.php:446
-#: modules/popup-dialog.php:541 modules/pref-feeds.php:130
-#: modules/pref-feeds.php:395 modules/pref-feeds.php:546
-#: modules/pref-filters.php:157 modules/pref-users.php:184
+#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/pref-feeds.php:130 modules/pref-feeds.php:395
+#: modules/pref-feeds.php:546 modules/pref-filters.php:166
+#: modules/pref-users.php:184
msgid "Cancel"
msgstr "Annulla"
@@ -1671,7 +1668,7 @@ msgstr "Annulla"
msgid "match on:"
msgstr "corrisponde a:"
-#: modules/popup-dialog.php:167 mobile/functions.php:774
+#: modules/popup-dialog.php:167 mobile/functions.php:768
msgid "Title or content"
msgstr "Titolo o contenuto"
@@ -1679,35 +1676,10 @@ msgstr "Titolo o contenuto"
msgid "Limit search to:"
msgstr "Limitare la ricerca a:"
-#: modules/popup-dialog.php:188 mobile/functions.php:754
+#: modules/popup-dialog.php:188 mobile/functions.php:748
msgid "This feed"
msgstr "Questo notiziario"
-#: modules/popup-dialog.php:223
-msgid "Create Label"
-msgstr "Crea etichetta"
-
-#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:282
-msgid "Caption"
-msgstr "Intestazione"
-
-#: modules/popup-dialog.php:241 modules/pref-labels.php:46
-msgid "Match SQL"
-msgstr "SQL di corrispondenza"
-
-#: modules/popup-dialog.php:265 modules/pref-labels.php:68
-msgid "Help"
-msgstr "Aiuto"
-
-#: modules/popup-dialog.php:268
-msgid "Test"
-msgstr "Prova"
-
-#: modules/popup-dialog.php:275 modules/popup-dialog.php:442
-msgid "Create"
-msgstr "Crea"
-
#: modules/popup-dialog.php:288
msgid "Create Filter"
msgstr "Crea filtro"
@@ -1719,17 +1691,17 @@ msgid "description"
msgstr "Selezione"
#: modules/popup-dialog.php:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:377
+#: modules/pref-filters.php:394
msgid "Match"
msgstr "Corrisponde"
#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:425
msgid "before"
msgstr "prima"
#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:409
+#: modules/pref-filters.php:426
msgid "after"
msgstr "dopo"
@@ -1754,19 +1726,23 @@ msgid "with parameters:"
msgstr "con parametri:"
#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
-#: modules/pref-feeds.php:500 modules/pref-filters.php:114
+#: modules/pref-feeds.php:500 modules/pref-filters.php:123
#: modules/pref-users.php:165
msgid "Options"
msgstr "Opzioni"
-#: modules/popup-dialog.php:427 modules/pref-filters.php:126
+#: modules/popup-dialog.php:427 modules/pref-filters.php:135
msgid "Enabled"
msgstr "Abilitato"
-#: modules/popup-dialog.php:430 modules/pref-filters.php:135
+#: modules/popup-dialog.php:430 modules/pref-filters.php:144
msgid "Inverse match"
msgstr "Corrispondenza inversa"
+#: modules/popup-dialog.php:442
+msgid "Create"
+msgstr "Crea"
+
#: modules/popup-dialog.php:457
msgid "Update Errors"
msgstr "Errori di aggiornamento"
@@ -1788,7 +1764,7 @@ msgid "Tags for this article (separated by commas):"
msgstr "Etichette per questo articolo (separate da virgole):"
#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
-#: modules/pref-feeds.php:544 modules/pref-filters.php:153
+#: modules/pref-feeds.php:544 modules/pref-filters.php:162
#: modules/pref-users.php:181
msgid "Save"
msgstr "Salva"
@@ -1955,9 +1931,9 @@ msgstr "Crea categoria"
msgid "No feed categories defined."
msgstr "Nessuna categoria notiziari definita."
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:147
-#: modules/pref-filters.php:462 modules/pref-labels.php:330
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
+#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
+#: modules/pref-labels.php:176 modules/pref-users.php:481
msgid "Remove"
msgstr "Rimuovi"
@@ -1983,12 +1959,12 @@ msgid "Last&nbsp;Article"
msgstr "Ultimo&nbsp;articolo"
#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:498 mobile/functions.php:501
+#: mobile/functions.php:492 mobile/functions.php:495
msgid "Updated"
msgstr "Aggiornato"
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:436
-#: modules/pref-labels.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
+#: modules/pref-labels-old.php:310 modules/pref-users.php:456
msgid "Click to edit"
msgstr "Fare clic per modificare"
@@ -2000,8 +1976,8 @@ msgstr "Selezione:"
msgid "Recategorize"
msgstr "Reimposta categoria"
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:460
-#: modules/pref-labels.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
+#: modules/pref-labels-old.php:328 modules/pref-users.php:479
msgid "Edit"
msgstr "Modifica"
@@ -2013,7 +1989,7 @@ msgstr "Eliminazione manuale"
msgid "Clear feed data"
msgstr "Pulisci i dati del notiziario"
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:299
+#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
msgid "Rescore articles"
msgstr "Cambio punteggio degli articoli"
@@ -2078,53 +2054,53 @@ msgstr "Genera altro collegamento"
msgid "Filter Editor"
msgstr "Editor filtri"
-#: modules/pref-filters.php:197
+#: modules/pref-filters.php:214
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "Filtro <b>%s</b> salvato"
-#: modules/pref-filters.php:239
+#: modules/pref-filters.php:256
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Filtro <b>%s</b> creato"
-#: modules/pref-filters.php:292 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
msgid "Create filter"
msgstr "Crea filtro"
-#: modules/pref-filters.php:367
+#: modules/pref-filters.php:384
msgid "filter_type_descr"
msgstr ""
-#: modules/pref-filters.php:368
+#: modules/pref-filters.php:385
msgid "action_description"
msgstr ""
-#: modules/pref-filters.php:379
+#: modules/pref-filters.php:396
msgid "Field"
msgstr "Campo"
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:397
msgid "Params"
msgstr "Parametri"
-#: modules/pref-filters.php:425
+#: modules/pref-filters.php:442
msgid "(Disabled)"
msgstr "(disabilitato)"
-#: modules/pref-filters.php:441
+#: modules/pref-filters.php:458
msgid "(Inverse)"
msgstr "(inverso)"
-#: modules/pref-filters.php:470
+#: modules/pref-filters.php:487
msgid "No filters defined."
msgstr "Nessun filtro definito."
-#: modules/pref-filters.php:472
+#: modules/pref-filters.php:489
msgid "No matching filters found."
msgstr "Nessun filtro trovato che corrisponde."
-#: modules/pref-labels.php:9
+#: modules/pref-labels-old.php:9
msgid ""
"Sorry, labels have been administratively disabled for this installation. "
"Please contact instance owner or edit configuration file to enable this "
@@ -2134,37 +2110,50 @@ msgstr ""
"installazione. Contattare il proprietario dell&apos;istanza o modificare il "
"file di configurazione per abilitare questa funzionalità."
-#: modules/pref-labels.php:99
+#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
+#: modules/pref-labels.php:143
+msgid "Caption"
+msgstr "Intestazione"
+
+#: modules/pref-labels-old.php:46
+msgid "Match SQL"
+msgstr "SQL di corrispondenza"
+
+#: modules/pref-labels-old.php:68
+msgid "Help"
+msgstr "Aiuto"
+
+#: modules/pref-labels-old.php:99
msgid "Error: SQL expression is blank."
msgstr "Errore: l&apos;espressione SQL è vuota."
-#: modules/pref-labels.php:179
+#: modules/pref-labels-old.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "Etichetta <b>%s</b> salvata"
-#: modules/pref-labels.php:211
+#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Etichetta <b>%s</b> creata"
-#: modules/pref-labels.php:249 help/4.php:26
+#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
msgid "Create label"
msgstr "Crea etichetta"
-#: modules/pref-labels.php:283
+#: modules/pref-labels-old.php:283
msgid "SQL Expression"
msgstr "Espressione SQL"
-#: modules/pref-labels.php:308
+#: modules/pref-labels-old.php:308
msgid "[No caption]"
msgstr "[Nessuna intestazione]"
-#: modules/pref-labels.php:335
+#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
msgid "No labels defined."
msgstr "Nessuna etichetta definita."
-#: modules/pref-labels.php:337
+#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
msgid "No matching labels found."
msgstr "Nessuna etichetta corrispondente trovata."
@@ -2577,6 +2566,18 @@ msgstr "Vai a..."
msgid "Press any key to close this window."
msgstr "Premere qualsiasi tasto per chiudere questa finestra."
+#: help/4.php:11
+msgid "Content Filtering"
+msgstr "Filtro contenuti"
+
+#: help/4.php:12
+msgid "Label Editor"
+msgstr "Editor etichette"
+
+#: help/4.php:13
+msgid "User Manager"
+msgstr "Gestore utenti"
+
#: help/4.php:19
msgid "Panel actions"
msgstr "Riquadro azioni"
@@ -2605,31 +2606,31 @@ msgstr "Notiziari"
msgid "View tags"
msgstr "Visualizza etichette"
-#: mobile/functions.php:431
+#: mobile/functions.php:425
msgid "Back"
msgstr "Indietro"
-#: mobile/functions.php:441
+#: mobile/functions.php:435
msgid "View:"
msgstr "Vista:"
-#: mobile/functions.php:463
+#: mobile/functions.php:457
msgid "Refresh"
msgstr "Aggiorna"
-#: mobile/functions.php:695
+#: mobile/functions.php:689
msgid "Tags:"
msgstr "Etichette:"
-#: mobile/functions.php:727
+#: mobile/functions.php:721
msgid "Go back"
msgstr "Vai indietro"
-#: mobile/functions.php:738
+#: mobile/functions.php:732
msgid "Where:"
msgstr "Dove:"
-#: mobile/functions.php:769
+#: mobile/functions.php:763
msgid "Match on:"
msgstr "Corrisponde a:"
@@ -2637,6 +2638,21 @@ msgstr "Corrisponde a:"
msgid "Internal error: Function not implemented"
msgstr "Errore interno: funzione non implementata"
+#~ msgid "Search to label"
+#~ msgstr "Cerca per etichetta"
+
+#~ msgid "Convert to label"
+#~ msgstr "Converti a etichetta"
+
+#~ msgid "Dashboard"
+#~ msgstr "Bacheca"
+
+#~ msgid "Create Label"
+#~ msgstr "Crea etichetta"
+
+#~ msgid "Test"
+#~ msgstr "Prova"
+
#~ msgid ""
#~ "This program requires XmlHttpRequest to function properly. Your browser "
#~ "doesn't seem to support it."
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 52a132c23..c25b50057 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 bac68634c..13f86d4cd 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss unstable\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 17:20+0300\n"
+"POT-Creation-Date: 2009-01-18 15:24+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"
@@ -166,266 +166,260 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2628 functions.php:2992 functions.php:3373 functions.php:4237
-#: help/3.php:57 mobile/functions.php:52
-msgid "Starred articles"
-msgstr "お気に入りの記事"
-
-#: functions.php:2644 functions.php:2994 functions.php:3376 functions.php:4244
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
-msgid "Published articles"
-msgstr "公開済みの記事"
-
-#: functions.php:2660 functions.php:2996 functions.php:3379 functions.php:4222
-#: help/3.php:58 mobile/functions.php:43
-msgid "Fresh articles"
-msgstr "新しい記事"
-
-#: functions.php:2914 modules/popup-dialog.php:175
-#: modules/pref-filters.php:388 mobile/functions.php:741
+#: functions.php:2883 modules/popup-dialog.php:175
+#: modules/pref-filters.php:405 mobile/functions.php:735
msgid "All feeds"
msgstr "すべてのフィード"
-#: functions.php:2943 functions.php:2982 functions.php:3351 functions.php:4398
-#: functions.php:4428 modules/pref-feeds.php:1244
+#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1244
msgid "Uncategorized"
msgstr "カテゴリー割り当てなし"
-#: functions.php:2972 functions.php:3540 mobile/functions.php:33
+#: functions.php:2941 functions.php:3508 mobile/functions.php:33
msgid "Special"
msgstr "特別"
-#: functions.php:2974 functions.php:3542 mobile/functions.php:75
+#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
msgid "Labels"
msgstr "ラベル"
-#: functions.php:3337 functions.php:3339
+#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
+#: mobile/functions.php:52
+msgid "Starred articles"
+msgstr "お気に入りの記事"
+
+#: functions.php:2963 functions.php:3344 functions.php:4212
+#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+msgid "Published articles"
+msgstr "公開済みの記事"
+
+#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
+#: mobile/functions.php:43
+msgid "Fresh articles"
+msgstr "新しい記事"
+
+#: functions.php:3305 functions.php:3307
msgid "Search results"
msgstr "検索結果"
-#: functions.php:3355 functions.php:3368 functions.php:3374 functions.php:3377
-#: functions.php:3380 functions.php:3388
+#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
+#: functions.php:3348 functions.php:3356
#, fuzzy
msgid "Searched for"
msgstr "検索"
-#: functions.php:4014 functions.php:4064 functions.php:5416
+#: functions.php:3989 functions.php:4045 functions.php:5368
#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:341 modules/pref-labels.php:275
-#: modules/pref-users.php:408
+#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
+#: modules/pref-labels.php:136 modules/pref-users.php:408
msgid "Select:"
msgstr "選択:"
-#: functions.php:4015 functions.php:4065 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:342
-#: modules/pref-labels.php:276 modules/pref-users.php:409
-#: mobile/functions.php:567
+#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
+#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
+#: modules/pref-users.php:409 mobile/functions.php:561
msgid "All"
msgstr "すべて"
-#: functions.php:4016 functions.php:4022 functions.php:4066 functions.php:4069
-#: tt-rss.php:196 mobile/functions.php:455 mobile/functions.php:568
+#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
+#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
msgid "Unread"
msgstr "未読"
-#: functions.php:4017 mobile/functions.php:570
+#: functions.php:3992 mobile/functions.php:564
msgid "Invert"
msgstr "反転"
-#: functions.php:4018 functions.php:4067 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:343
-#: modules/pref-labels.php:277 modules/pref-users.php:410
-#: mobile/functions.php:569
+#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
+#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
+#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
+#: modules/pref-users.php:410 mobile/functions.php:563
msgid "None"
msgstr "なし"
-#: functions.php:4020 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
msgid "Actions..."
msgstr "操作..."
-#: functions.php:4021
+#: functions.php:3996
msgid "Selection toggle:"
msgstr "選択の切り替え:"
-#: functions.php:4023 functions.php:4070 tt-rss.php:195
-#: mobile/functions.php:456
+#: functions.php:3998 functions.php:4051 tt-rss.php:195
+#: mobile/functions.php:450
msgid "Starred"
msgstr "お気に入り"
-#: functions.php:4024
+#: functions.php:3999
msgid "Published"
msgstr "公開済み"
-#: functions.php:4026 functions.php:4072
+#: functions.php:4001 functions.php:4053
msgid "Mark as read:"
msgstr "既読にする:"
-#: functions.php:4027 mobile/functions.php:575
+#: functions.php:4002 mobile/functions.php:569
msgid "Selection"
msgstr "選択"
-#: functions.php:4041 mobile/functions.php:577
+#: functions.php:4016 mobile/functions.php:571
msgid "Entire feed"
msgstr "フィードの入力"
-#: functions.php:4044 tt-rss.php:162
-msgid "Other actions:"
-msgstr "その他の操作:"
+#: functions.php:4019
+#, fuzzy
+msgid "Assign label:"
+msgstr "タグの割り当て"
-#: functions.php:4051 functions.php:4053
-msgid "Search to label"
-msgstr "ラベルの検索"
+#: functions.php:4031
+#, fuzzy
+msgid "(remove)"
+msgstr "削除"
-#: functions.php:4069
+#: functions.php:4050
msgid "Toggle:"
msgstr "トグル"
-#: functions.php:4073 mobile/functions.php:576
+#: functions.php:4054 mobile/functions.php:570
msgid "Page"
msgstr "ページ"
-#: functions.php:4074 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:378
+#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:395
msgid "Feed"
msgstr "フィード"
-#: functions.php:4081
-msgid "Convert to label"
-msgstr "ラベルの変換"
-
-#: functions.php:4128
+#: functions.php:4096
msgid "Generated feed"
msgstr "生成したフィード"
-#: functions.php:4172
+#: functions.php:4145
msgid "Click to collapse category"
msgstr "閉じたカテゴリーのクリック"
-#: functions.php:4210
-msgid "Dashboard"
-msgstr "ダッシュボード"
-
-#: functions.php:4448
+#: functions.php:4398
msgid "No feeds to display."
msgstr "表示するフィードがありません。"
-#: functions.php:4465 mobile/functions.php:12
+#: functions.php:4415 mobile/functions.php:12
msgid "Tags"
msgstr "タグ"
-#: functions.php:4705
+#: functions.php:4657
msgid " - "
msgstr " - "
-#: functions.php:4764 functions.php:4765
+#: functions.php:4716 functions.php:4717
msgid "no tags"
msgstr "タグがありません"
-#: functions.php:4772
+#: functions.php:4724
msgid "Edit tags for this article"
msgstr "この記事のタグを編集する"
-#: functions.php:4780
+#: functions.php:4732
#, fuzzy
msgid "Display original article content"
msgstr "記事の内容をスクロールする"
-#: functions.php:4787 functions.php:5426
+#: functions.php:4739 functions.php:5378
msgid "Show article summary in new window"
msgstr "記事の要約を新しいウィンドウで表示する"
-#: functions.php:4823 functions.php:5350
+#: functions.php:4775 functions.php:5302
msgid "unknown type"
msgstr "未知の種類"
-#: functions.php:4829 functions.php:5356
+#: functions.php:4781 functions.php:5308
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4865 functions.php:5390
+#: functions.php:4817 functions.php:5342
msgid "Attachment:"
msgstr "添付: "
-#: functions.php:4867 functions.php:5392
+#: functions.php:4819 functions.php:5344
msgid "Attachments:"
msgstr "添付:"
-#: functions.php:4887 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
msgid "Close this window"
msgstr "このウィンドウを閉じる"
-#: functions.php:4943 modules/pref-feed-browser.php:75
+#: functions.php:4895 modules/pref-feed-browser.php:75
msgid "Feed not found."
msgstr "フィードが見つかりません。"
-#: functions.php:5012 mobile/functions.php:420
+#: functions.php:4964 mobile/functions.php:414
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5125
+#: functions.php:5077
msgid "(Click to change)"
msgstr "(クリックで変更)"
-#: functions.php:5324
+#: functions.php:5276
msgid "Click to expand article"
msgstr "開いた記事のクリック"
-#: functions.php:5488
+#: functions.php:5440
msgid "No unread articles found to display."
msgstr "表示する未読記事が見つかりませんでした。"
-#: functions.php:5491
+#: functions.php:5443
msgid "No starred articles found to display."
msgstr "表示するお気に入りの記事が見つかりませんでした。"
-#: functions.php:5494
+#: functions.php:5446
msgid "No articles found to display."
msgstr "表示する記事が見つかりません。"
-#: functions.php:5862
+#: functions.php:5793
msgid "Match "
msgstr "一致 "
-#: functions.php:5870
+#: functions.php:5801
msgid "Unread articles"
msgstr "未読記事"
-#: functions.php:5871
+#: functions.php:5802
msgid "Updated articles"
msgstr "更新済み記事"
-#: functions.php:5872
+#: functions.php:5803
msgid "Title contains"
msgstr "題名の内容"
-#: functions.php:5873
+#: functions.php:5804
msgid "Content contains"
msgstr "コンテンツの内容"
-#: functions.php:5874
+#: functions.php:5805
msgid "Score equals"
msgstr "スコアと同じ"
-#: functions.php:5875
+#: functions.php:5806
msgid "Score is greater than"
msgstr "スコア以上"
-#: functions.php:5876
+#: functions.php:5807
msgid "Score is less than"
msgstr "スコア以下"
-#: functions.php:5877
+#: functions.php:5808
msgid "Articles newer than X hours"
msgstr "記事が X 時間より新しい"
-#: functions.php:5878
+#: functions.php:5809
msgid "Articles newer than X days"
msgstr "記事が X 日より新しい"
-#: functions.php:5887
+#: functions.php:5818
msgid "Add"
msgstr "追加"
@@ -437,7 +431,7 @@ msgstr "フィードの表示"
msgid "display tags"
msgstr "タグの表示"
-#: localized_js.php:37 prefs.php:69 prefs.php:155 tt-rss.php:71
+#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
msgid "Loading, please wait..."
msgstr "読み込み中です。しばらくお待ちください。"
@@ -810,7 +804,7 @@ msgstr "フィードの保存中..."
#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:772
+#: mobile/functions.php:766
msgid "Title"
msgstr "題名"
@@ -823,7 +817,7 @@ msgid "Link"
msgstr "リンク"
#: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:773
+#: mobile/functions.php:767
msgid "Content"
msgstr "内容"
@@ -835,7 +829,7 @@ msgstr ""
msgid "Filter article"
msgstr "記事フィルター"
-#: localized_schema.php:16 mobile/functions.php:580
+#: localized_schema.php:16 mobile/functions.php:574
msgid "Mark as read"
msgstr "既読にする"
@@ -1171,7 +1165,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "設定に戻る"
-#: prefs.php:77 prefs.php:158 tt-rss.php:79
+#: prefs.php:77 prefs.php:156 tt-rss.php:79
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1215,17 +1209,15 @@ msgstr "その他のフィード"
msgid "Published Articles"
msgstr "公開された記事"
-#: prefs.php:142 help/4.php:11
-msgid "Content Filtering"
-msgstr "コンテンツフィルタリング"
-
-#: prefs.php:145 help/4.php:12
-msgid "Label Editor"
-msgstr "ラベルエディター"
+#: prefs.php:142
+#, fuzzy
+msgid "Filters"
+msgstr "ファイル:"
-#: prefs.php:149 help/4.php:13
-msgid "User Manager"
-msgstr "ユーザー管理"
+#: prefs.php:147
+#, fuzzy
+msgid "Users"
+msgstr "ユーザー"
#: sanity_check.php:8
msgid ""
@@ -1325,9 +1317,10 @@ msgstr "タグクラウド"
#: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:282 modules/pref-labels.php:239
-#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:432
-#: mobile/functions.php:726 mobile/functions.php:780
+#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
+#: modules/pref-labels.php:103 modules/pref-users.php:364
+#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
+#: mobile/functions.php:774
msgid "Search"
msgstr "検索"
@@ -1367,6 +1360,10 @@ msgstr "&nbsp;&nbsp;既読として設定する"
msgid "&nbsp;&nbsp;(Un)hide read feeds"
msgstr "&nbsp;&nbsp;読んだフィードを隠す/再表示する"
+#: tt-rss.php:162
+msgid "Other actions:"
+msgstr "その他の操作:"
+
#: tt-rss.php:163
msgid "&nbsp;&nbsp;Create filter"
msgstr "&nbsp;&nbsp;フィルターを作成する"
@@ -1391,15 +1388,15 @@ msgstr "フィード一覧を閉じる"
msgid "Toggle Feedlist"
msgstr "フィード一覧を切り替える"
-#: tt-rss.php:185 mobile/functions.php:735
+#: tt-rss.php:185 mobile/functions.php:729
msgid "Search:"
msgstr "検索:"
-#: tt-rss.php:193 mobile/functions.php:453
+#: tt-rss.php:193 mobile/functions.php:447
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:194 mobile/functions.php:454
+#: tt-rss.php:194 mobile/functions.php:448
msgid "All Articles"
msgstr "すべての記事"
@@ -1412,7 +1409,7 @@ msgid "Order:"
msgstr "並べ替え:"
#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:418
+#: modules/pref-filters.php:435
msgid "Date"
msgstr "日付"
@@ -1425,7 +1422,7 @@ msgid "Limit:"
msgstr "制限:"
#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:433
+#: mobile/functions.php:427
msgid "Update"
msgstr "更新"
@@ -1587,10 +1584,10 @@ msgid "Subscribe"
msgstr "購読"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:279 modules/popup-dialog.php:446
-#: modules/popup-dialog.php:541 modules/pref-feeds.php:130
-#: modules/pref-feeds.php:395 modules/pref-feeds.php:546
-#: modules/pref-filters.php:157 modules/pref-users.php:184
+#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/pref-feeds.php:130 modules/pref-feeds.php:395
+#: modules/pref-feeds.php:546 modules/pref-filters.php:166
+#: modules/pref-users.php:184
msgid "Cancel"
msgstr "取り消し"
@@ -1598,7 +1595,7 @@ msgstr "取り消し"
msgid "match on:"
msgstr "対象項目:"
-#: modules/popup-dialog.php:167 mobile/functions.php:774
+#: modules/popup-dialog.php:167 mobile/functions.php:768
msgid "Title or content"
msgstr "題名か内容"
@@ -1606,35 +1603,10 @@ msgstr "題名か内容"
msgid "Limit search to:"
msgstr "対象範囲"
-#: modules/popup-dialog.php:188 mobile/functions.php:754
+#: modules/popup-dialog.php:188 mobile/functions.php:748
msgid "This feed"
msgstr "このフィード"
-#: modules/popup-dialog.php:223
-msgid "Create Label"
-msgstr "ラベルの作成"
-
-#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:282
-msgid "Caption"
-msgstr "キャプション"
-
-#: modules/popup-dialog.php:241 modules/pref-labels.php:46
-msgid "Match SQL"
-msgstr "SQL の一致"
-
-#: modules/popup-dialog.php:265 modules/pref-labels.php:68
-msgid "Help"
-msgstr "ヘルプ"
-
-#: modules/popup-dialog.php:268
-msgid "Test"
-msgstr "テスト"
-
-#: modules/popup-dialog.php:275 modules/popup-dialog.php:442
-msgid "Create"
-msgstr "作成"
-
#: modules/popup-dialog.php:288
msgid "Create Filter"
msgstr "フィルターを作成する"
@@ -1645,18 +1617,18 @@ msgid "description"
msgstr "説明"
#: modules/popup-dialog.php:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:377
+#: modules/pref-filters.php:394
msgid "Match"
msgstr "一致"
#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:425
#, fuzzy
msgid "before"
msgstr "再描画"
#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:409
+#: modules/pref-filters.php:426
#, fuzzy
msgid "after"
msgstr "日付"
@@ -1683,19 +1655,23 @@ msgid "with parameters:"
msgstr "パラメーター:"
#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
-#: modules/pref-feeds.php:500 modules/pref-filters.php:114
+#: modules/pref-feeds.php:500 modules/pref-filters.php:123
#: modules/pref-users.php:165
msgid "Options"
msgstr "オプション"
-#: modules/popup-dialog.php:427 modules/pref-filters.php:126
+#: modules/popup-dialog.php:427 modules/pref-filters.php:135
msgid "Enabled"
msgstr "有効にする"
-#: modules/popup-dialog.php:430 modules/pref-filters.php:135
+#: modules/popup-dialog.php:430 modules/pref-filters.php:144
msgid "Inverse match"
msgstr "一致しない"
+#: modules/popup-dialog.php:442
+msgid "Create"
+msgstr "作成"
+
#: modules/popup-dialog.php:457
msgid "Update Errors"
msgstr "更新エラー"
@@ -1717,7 +1693,7 @@ msgid "Tags for this article (separated by commas):"
msgstr "この記事のタグ (カンマで区切ります):"
#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
-#: modules/pref-feeds.php:544 modules/pref-filters.php:153
+#: modules/pref-feeds.php:544 modules/pref-filters.php:162
#: modules/pref-users.php:181
msgid "Save"
msgstr "保存"
@@ -1882,9 +1858,9 @@ msgstr "カテゴリーの作成"
msgid "No feed categories defined."
msgstr "フィードカテゴリーが定義されていません。"
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:147
-#: modules/pref-filters.php:462 modules/pref-labels.php:330
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
+#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
+#: modules/pref-labels.php:176 modules/pref-users.php:481
msgid "Remove"
msgstr "削除"
@@ -1909,12 +1885,12 @@ msgid "Last&nbsp;Article"
msgstr "最後の記事"
#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:498 mobile/functions.php:501
+#: mobile/functions.php:492 mobile/functions.php:495
msgid "Updated"
msgstr "更新日時"
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:436
-#: modules/pref-labels.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
+#: modules/pref-labels-old.php:310 modules/pref-users.php:456
msgid "Click to edit"
msgstr "編集するにはクリック"
@@ -1926,8 +1902,8 @@ msgstr "選択:"
msgid "Recategorize"
msgstr "カテゴリー再設定"
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:460
-#: modules/pref-labels.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
+#: modules/pref-labels-old.php:328 modules/pref-users.php:479
msgid "Edit"
msgstr "編集"
@@ -1939,7 +1915,7 @@ msgstr "手動削除"
msgid "Clear feed data"
msgstr "フィードデータの消去"
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:299
+#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
msgid "Rescore articles"
msgstr "記事のスコアの再集計"
@@ -2002,91 +1978,104 @@ msgstr "別のリンクを生成する"
msgid "Filter Editor"
msgstr "フィルターエディター"
-#: modules/pref-filters.php:197
+#: modules/pref-filters.php:214
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "フィルター <b>%s</b> を保存しました"
-#: modules/pref-filters.php:239
+#: modules/pref-filters.php:256
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "フィルター <b>%s</b> を作成しました"
-#: modules/pref-filters.php:292 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
msgid "Create filter"
msgstr "フィルターを作成する"
-#: modules/pref-filters.php:367
+#: modules/pref-filters.php:384
msgid "filter_type_descr"
msgstr "filter_type_descr"
-#: modules/pref-filters.php:368
+#: modules/pref-filters.php:385
msgid "action_description"
msgstr "action_description"
-#: modules/pref-filters.php:379
+#: modules/pref-filters.php:396
#, fuzzy
msgid "Field"
msgstr "フィード"
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:397
msgid "Params"
msgstr "パラメーター"
-#: modules/pref-filters.php:425
+#: modules/pref-filters.php:442
msgid "(Disabled)"
msgstr ""
-#: modules/pref-filters.php:441
+#: modules/pref-filters.php:458
msgid "(Inverse)"
msgstr ""
-#: modules/pref-filters.php:470
+#: modules/pref-filters.php:487
msgid "No filters defined."
msgstr "フィルターが定義されていません。"
-#: modules/pref-filters.php:472
+#: modules/pref-filters.php:489
msgid "No matching filters found."
msgstr "一致するフィルターが見つかりません。"
-#: modules/pref-labels.php:9
+#: modules/pref-labels-old.php:9
msgid ""
"Sorry, labels have been administratively disabled for this installation. "
"Please contact instance owner or edit configuration file to enable this "
"functionality."
msgstr ""
-#: modules/pref-labels.php:99
+#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
+#: modules/pref-labels.php:143
+msgid "Caption"
+msgstr "キャプション"
+
+#: modules/pref-labels-old.php:46
+msgid "Match SQL"
+msgstr "SQL の一致"
+
+#: modules/pref-labels-old.php:68
+msgid "Help"
+msgstr "ヘルプ"
+
+#: modules/pref-labels-old.php:99
msgid "Error: SQL expression is blank."
msgstr "エラー: SQL 表記が空です。"
-#: modules/pref-labels.php:179
+#: modules/pref-labels-old.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "ラベル <b>%s</b> を保存しました"
-#: modules/pref-labels.php:211
+#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
#, php-format
msgid "Created label <b>%s</b>"
msgstr "ラベル <b>%s</b> を作成しました"
-#: modules/pref-labels.php:249 help/4.php:26
+#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
msgid "Create label"
msgstr "ラベルを作成する"
-#: modules/pref-labels.php:283
+#: modules/pref-labels-old.php:283
msgid "SQL Expression"
msgstr "SQL 表記"
-#: modules/pref-labels.php:308
+#: modules/pref-labels-old.php:308
msgid "[No caption]"
msgstr "[キャプションなし]"
-#: modules/pref-labels.php:335
+#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
msgid "No labels defined."
msgstr "ラベルが定義されていません。"
-#: modules/pref-labels.php:337
+#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
msgid "No matching labels found."
msgstr "一致するラベルが見つかりません。"
@@ -2477,6 +2466,18 @@ msgstr "移動..."
msgid "Press any key to close this window."
msgstr "何かキーを押して、このウィンドウを閉じてください。"
+#: help/4.php:11
+msgid "Content Filtering"
+msgstr "コンテンツフィルタリング"
+
+#: help/4.php:12
+msgid "Label Editor"
+msgstr "ラベルエディター"
+
+#: help/4.php:13
+msgid "User Manager"
+msgstr "ユーザー管理"
+
#: help/4.php:19
msgid "Panel actions"
msgstr "パネル操作"
@@ -2508,35 +2509,35 @@ msgstr "フィード"
msgid "View tags"
msgstr "タグを編集する"
-#: mobile/functions.php:431
+#: mobile/functions.php:425
msgid "Back"
msgstr ""
-#: mobile/functions.php:441
+#: mobile/functions.php:435
#, fuzzy
msgid "View:"
msgstr "サイト:"
-#: mobile/functions.php:463
+#: mobile/functions.php:457
#, fuzzy
msgid "Refresh"
msgstr "再描画"
-#: mobile/functions.php:695
+#: mobile/functions.php:689
#, fuzzy
msgid "Tags:"
msgstr "タグ"
-#: mobile/functions.php:727
+#: mobile/functions.php:721
msgid "Go back"
msgstr ""
-#: mobile/functions.php:738
+#: mobile/functions.php:732
#, fuzzy
msgid "Where:"
msgstr "その他:"
-#: mobile/functions.php:769
+#: mobile/functions.php:763
#, fuzzy
msgid "Match on:"
msgstr "対象項目:"
@@ -2545,6 +2546,21 @@ msgstr "対象項目:"
msgid "Internal error: Function not implemented"
msgstr "インターナルエラー: 機能が実装されていません"
+#~ msgid "Search to label"
+#~ msgstr "ラベルの検索"
+
+#~ msgid "Convert to label"
+#~ msgstr "ラベルの変換"
+
+#~ msgid "Dashboard"
+#~ msgstr "ダッシュボード"
+
+#~ msgid "Create Label"
+#~ msgstr "ラベルの作成"
+
+#~ msgid "Test"
+#~ msgstr "テスト"
+
#, fuzzy
#~ msgid "Perform action"
#~ msgstr "操作の実行"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 306888a0d..776649b53 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 46dc131a5..bcf8eb632 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS 1.2.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 17:20+0300\n"
+"POT-Creation-Date: 2009-01-18 15:24+0300\n"
"PO-Revision-Date: 2008-11-29 20:45+0100\n"
"Last-Translator: Christian Lomsdalen <[email protected]>\n"
"Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -169,198 +169,192 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
"SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
-#: functions.php:2628 functions.php:2992 functions.php:3373 functions.php:4237
-#: help/3.php:57 mobile/functions.php:52
-msgid "Starred articles"
-msgstr "Favorittartikler"
-
-#: functions.php:2644 functions.php:2994 functions.php:3376 functions.php:4244
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
-msgid "Published articles"
-msgstr "Publiserte artikler"
-
-#: functions.php:2660 functions.php:2996 functions.php:3379 functions.php:4222
-#: help/3.php:58 mobile/functions.php:43
-msgid "Fresh articles"
-msgstr "Ferske artikler"
-
-#: functions.php:2914 modules/popup-dialog.php:175
-#: modules/pref-filters.php:388 mobile/functions.php:741
+#: functions.php:2883 modules/popup-dialog.php:175
+#: modules/pref-filters.php:405 mobile/functions.php:735
msgid "All feeds"
msgstr "Alle Nyhetsstrømmer"
-#: functions.php:2943 functions.php:2982 functions.php:3351 functions.php:4398
-#: functions.php:4428 modules/pref-feeds.php:1244
+#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1244
msgid "Uncategorized"
msgstr "Ukategorisert"
-#: functions.php:2972 functions.php:3540 mobile/functions.php:33
+#: functions.php:2941 functions.php:3508 mobile/functions.php:33
msgid "Special"
msgstr "Snarveier"
-#: functions.php:2974 functions.php:3542 mobile/functions.php:75
+#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
msgid "Labels"
msgstr "Merkelapper"
-#: functions.php:3337 functions.php:3339
+#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
+#: mobile/functions.php:52
+msgid "Starred articles"
+msgstr "Favorittartikler"
+
+#: functions.php:2963 functions.php:3344 functions.php:4212
+#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+msgid "Published articles"
+msgstr "Publiserte artikler"
+
+#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
+#: mobile/functions.php:43
+msgid "Fresh articles"
+msgstr "Ferske artikler"
+
+#: functions.php:3305 functions.php:3307
msgid "Search results"
msgstr "Søkeresultat"
-#: functions.php:3355 functions.php:3368 functions.php:3374 functions.php:3377
-#: functions.php:3380 functions.php:3388
+#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
+#: functions.php:3348 functions.php:3356
msgid "Searched for"
msgstr "Søkte etter"
-#: functions.php:4014 functions.php:4064 functions.php:5416
+#: functions.php:3989 functions.php:4045 functions.php:5368
#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:341 modules/pref-labels.php:275
-#: modules/pref-users.php:408
+#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
+#: modules/pref-labels.php:136 modules/pref-users.php:408
msgid "Select:"
msgstr "Velg:"
-#: functions.php:4015 functions.php:4065 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:342
-#: modules/pref-labels.php:276 modules/pref-users.php:409
-#: mobile/functions.php:567
+#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
+#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
+#: modules/pref-users.php:409 mobile/functions.php:561
msgid "All"
msgstr "Alle"
-#: functions.php:4016 functions.php:4022 functions.php:4066 functions.php:4069
-#: tt-rss.php:196 mobile/functions.php:455 mobile/functions.php:568
+#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
+#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
msgid "Unread"
msgstr "Ulest"
-#: functions.php:4017 mobile/functions.php:570
+#: functions.php:3992 mobile/functions.php:564
msgid "Invert"
msgstr "Motsatt"
-#: functions.php:4018 functions.php:4067 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:343
-#: modules/pref-labels.php:277 modules/pref-users.php:410
-#: mobile/functions.php:569
+#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
+#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
+#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
+#: modules/pref-users.php:410 mobile/functions.php:563
msgid "None"
msgstr "Ingen"
-#: functions.php:4020 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
msgid "Actions..."
msgstr "Handlinger..."
-#: functions.php:4021
+#: functions.php:3996
msgid "Selection toggle:"
msgstr "Marker utvalg:"
-#: functions.php:4023 functions.php:4070 tt-rss.php:195
-#: mobile/functions.php:456
+#: functions.php:3998 functions.php:4051 tt-rss.php:195
+#: mobile/functions.php:450
msgid "Starred"
msgstr "Favoritter"
-#: functions.php:4024
+#: functions.php:3999
msgid "Published"
msgstr "Publisert"
-#: functions.php:4026 functions.php:4072
+#: functions.php:4001 functions.php:4053
msgid "Mark as read:"
msgstr "Marker som lest:"
-#: functions.php:4027 mobile/functions.php:575
+#: functions.php:4002 mobile/functions.php:569
msgid "Selection"
msgstr "Utvalg"
-#: functions.php:4041 mobile/functions.php:577
+#: functions.php:4016 mobile/functions.php:571
msgid "Entire feed"
msgstr "Hele nyhetsstrømmen"
-#: functions.php:4044 tt-rss.php:162
-msgid "Other actions:"
-msgstr "Andre handlinger:"
+#: functions.php:4019
+#, fuzzy
+msgid "Assign label:"
+msgstr "Tildel stikkord"
-#: functions.php:4051 functions.php:4053
-msgid "Search to label"
-msgstr "Søk etter merkelapp"
+#: functions.php:4031
+#, fuzzy
+msgid "(remove)"
+msgstr "Fjern"
-#: functions.php:4069
+#: functions.php:4050
msgid "Toggle:"
msgstr "Vis:"
-#: functions.php:4073 mobile/functions.php:576
+#: functions.php:4054 mobile/functions.php:570
msgid "Page"
msgstr "Side"
-#: functions.php:4074 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:378
+#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:395
msgid "Feed"
msgstr "Nyhetsstrøm"
-#: functions.php:4081
-msgid "Convert to label"
-msgstr "Konverter til merkelapp"
-
-#: functions.php:4128
+#: functions.php:4096
msgid "Generated feed"
msgstr "Generert nyhetsstrøm"
-#: functions.php:4172
+#: functions.php:4145
msgid "Click to collapse category"
msgstr "Velg for å slå sammen kategorien"
-#: functions.php:4210
-msgid "Dashboard"
-msgstr "Skrivebord"
-
-#: functions.php:4448
+#: functions.php:4398
msgid "No feeds to display."
msgstr "Ingen nyhetstrømmer å vise"
-#: functions.php:4465 mobile/functions.php:12
+#: functions.php:4415 mobile/functions.php:12
msgid "Tags"
msgstr "Stikkord"
-#: functions.php:4705
+#: functions.php:4657
msgid " - "
msgstr "-"
-#: functions.php:4764 functions.php:4765
+#: functions.php:4716 functions.php:4717
msgid "no tags"
msgstr "Ingen stikkord"
-#: functions.php:4772
+#: functions.php:4724
msgid "Edit tags for this article"
msgstr "Rediger stikkordene for denne artikkelen"
-#: functions.php:4780
+#: functions.php:4732
msgid "Display original article content"
msgstr "Vis opprinnelig artikkelinnhold"
-#: functions.php:4787 functions.php:5426
+#: functions.php:4739 functions.php:5378
msgid "Show article summary in new window"
msgstr "Åpne artikkelsammendraget i nytt nettleservindu"
-#: functions.php:4823 functions.php:5350
+#: functions.php:4775 functions.php:5302
msgid "unknown type"
msgstr "Ukjent type"
-#: functions.php:4829 functions.php:5356
+#: functions.php:4781 functions.php:5308
msgid "audio/mpeg"
msgstr "Lyd/mpeg"
-#: functions.php:4865 functions.php:5390
+#: functions.php:4817 functions.php:5342
msgid "Attachment:"
msgstr "Vedlegg:"
-#: functions.php:4867 functions.php:5392
+#: functions.php:4819 functions.php:5344
msgid "Attachments:"
msgstr "Vedlegg:"
-#: functions.php:4887 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
msgid "Close this window"
msgstr "Lukk dette vinduet"
-#: functions.php:4943 modules/pref-feed-browser.php:75
+#: functions.php:4895 modules/pref-feed-browser.php:75
msgid "Feed not found."
msgstr "Nyhetsstrømmen ble ikke funnet"
-#: functions.php:5012 mobile/functions.php:420
+#: functions.php:4964 mobile/functions.php:414
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -368,67 +362,67 @@ msgstr ""
"Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
"merkelappsyntaksen eller lokal konfigurasjon."
-#: functions.php:5125
+#: functions.php:5077
msgid "(Click to change)"
msgstr "(Trykk for å endre)"
-#: functions.php:5324
+#: functions.php:5276
msgid "Click to expand article"
msgstr "Trykk for å utvide artikkel"
-#: functions.php:5488
+#: functions.php:5440
msgid "No unread articles found to display."
msgstr "Ingen uleste artikler funnet som kunne vises"
-#: functions.php:5491
+#: functions.php:5443
msgid "No starred articles found to display."
msgstr "Ingen markerte artikler som kan vises"
-#: functions.php:5494
+#: functions.php:5446
msgid "No articles found to display."
msgstr "Ingen artikler funnet som kan vises"
-#: functions.php:5862
+#: functions.php:5793
msgid "Match "
msgstr "Match"
-#: functions.php:5870
+#: functions.php:5801
msgid "Unread articles"
msgstr "Uleste artikler"
-#: functions.php:5871
+#: functions.php:5802
msgid "Updated articles"
msgstr "Oppdaterte artikler"
-#: functions.php:5872
+#: functions.php:5803
msgid "Title contains"
msgstr "Tittel inneholder"
-#: functions.php:5873
+#: functions.php:5804
msgid "Content contains"
msgstr "Innholdet inneholder"
-#: functions.php:5874
+#: functions.php:5805
msgid "Score equals"
msgstr "Poeng er lik"
-#: functions.php:5875
+#: functions.php:5806
msgid "Score is greater than"
msgstr "Fler poeng enn"
-#: functions.php:5876
+#: functions.php:5807
msgid "Score is less than"
msgstr "Færre poeng enn"
-#: functions.php:5877
+#: functions.php:5808
msgid "Articles newer than X hours"
msgstr "Artikler nyere enn X timer"
-#: functions.php:5878
+#: functions.php:5809
msgid "Articles newer than X days"
msgstr "Artikler nyere enn X dager"
-#: functions.php:5887
+#: functions.php:5818
msgid "Add"
msgstr "Legg til"
@@ -440,7 +434,7 @@ msgstr "Vis nyhetsstrømmer"
msgid "display tags"
msgstr "Vis stikkord"
-#: localized_js.php:37 prefs.php:69 prefs.php:155 tt-rss.php:71
+#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
msgid "Loading, please wait..."
msgstr "laster, vennligst vent"
@@ -812,7 +806,7 @@ msgstr "Lagrer Nyhetsstrømmene..."
#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:772
+#: mobile/functions.php:766
msgid "Title"
msgstr "Tittel"
@@ -825,7 +819,7 @@ msgid "Link"
msgstr "Lenke"
#: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:773
+#: mobile/functions.php:767
msgid "Content"
msgstr "Innhold"
@@ -837,7 +831,7 @@ msgstr ""
msgid "Filter article"
msgstr "Filtrer artikkel"
-#: localized_schema.php:16 mobile/functions.php:580
+#: localized_schema.php:16 mobile/functions.php:574
msgid "Mark as read"
msgstr "Marker som lest"
@@ -1204,7 +1198,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Returner til innstillinger"
-#: prefs.php:77 prefs.php:158 tt-rss.php:79
+#: prefs.php:77 prefs.php:156 tt-rss.php:79
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1251,17 +1245,15 @@ msgstr "Andres nyhetsstrømmer"
msgid "Published Articles"
msgstr "Publiserte artikler"
-#: prefs.php:142 help/4.php:11
-msgid "Content Filtering"
-msgstr "Innholdsfilter"
-
-#: prefs.php:145 help/4.php:12
-msgid "Label Editor"
-msgstr "Merkelappredigerer"
+#: prefs.php:142
+#, fuzzy
+msgid "Filters"
+msgstr "Fil:"
-#: prefs.php:149 help/4.php:13
-msgid "User Manager"
-msgstr "Brukeradministrering"
+#: prefs.php:147
+#, fuzzy
+msgid "Users"
+msgstr "Bruker"
#: sanity_check.php:8
msgid ""
@@ -1372,9 +1364,10 @@ msgstr "Tag-sky"
#: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:282 modules/pref-labels.php:239
-#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:432
-#: mobile/functions.php:726 mobile/functions.php:780
+#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
+#: modules/pref-labels.php:103 modules/pref-users.php:364
+#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
+#: mobile/functions.php:774
msgid "Search"
msgstr "Søk"
@@ -1414,6 +1407,10 @@ msgstr "&nbsp;&nbsp;Marker som lest"
msgid "&nbsp;&nbsp;(Un)hide read feeds"
msgstr "&nbsp;&nbsp;Skjul/vis leste nyhetsstrømmer"
+#: tt-rss.php:162
+msgid "Other actions:"
+msgstr "Andre handlinger:"
+
#: tt-rss.php:163
msgid "&nbsp;&nbsp;Create filter"
msgstr "&nbsp;&nbsp;Lag filter"
@@ -1438,15 +1435,15 @@ msgstr "Skjul nyhetskanalsslisten"
msgid "Toggle Feedlist"
msgstr "Vis nyhetskanallisten"
-#: tt-rss.php:185 mobile/functions.php:735
+#: tt-rss.php:185 mobile/functions.php:729
msgid "Search:"
msgstr "Søk:"
-#: tt-rss.php:193 mobile/functions.php:453
+#: tt-rss.php:193 mobile/functions.php:447
msgid "Adaptive"
msgstr "Tilpasset"
-#: tt-rss.php:194 mobile/functions.php:454
+#: tt-rss.php:194 mobile/functions.php:448
msgid "All Articles"
msgstr "Alle artikler"
@@ -1459,7 +1456,7 @@ msgid "Order:"
msgstr "Rekkefølge:"
#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:418
+#: modules/pref-filters.php:435
msgid "Date"
msgstr "Dato"
@@ -1472,7 +1469,7 @@ msgid "Limit:"
msgstr "Antall:"
#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:433
+#: mobile/functions.php:427
msgid "Update"
msgstr "Oppdater"
@@ -1643,10 +1640,10 @@ msgid "Subscribe"
msgstr "Abonner"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:279 modules/popup-dialog.php:446
-#: modules/popup-dialog.php:541 modules/pref-feeds.php:130
-#: modules/pref-feeds.php:395 modules/pref-feeds.php:546
-#: modules/pref-filters.php:157 modules/pref-users.php:184
+#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/pref-feeds.php:130 modules/pref-feeds.php:395
+#: modules/pref-feeds.php:546 modules/pref-filters.php:166
+#: modules/pref-users.php:184
msgid "Cancel"
msgstr "Avbryt"
@@ -1654,7 +1651,7 @@ msgstr "Avbryt"
msgid "match on:"
msgstr "Match på:"
-#: modules/popup-dialog.php:167 mobile/functions.php:774
+#: modules/popup-dialog.php:167 mobile/functions.php:768
msgid "Title or content"
msgstr "Tittel eller innhold"
@@ -1662,35 +1659,10 @@ msgstr "Tittel eller innhold"
msgid "Limit search to:"
msgstr "Begrens søket til:"
-#: modules/popup-dialog.php:188 mobile/functions.php:754
+#: modules/popup-dialog.php:188 mobile/functions.php:748
msgid "This feed"
msgstr "Denne nyhetsstrømmen"
-#: modules/popup-dialog.php:223
-msgid "Create Label"
-msgstr "Lag merkelapp"
-
-#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:282
-msgid "Caption"
-msgstr "Overskrift"
-
-#: modules/popup-dialog.php:241 modules/pref-labels.php:46
-msgid "Match SQL"
-msgstr "Match SQL"
-
-#: modules/popup-dialog.php:265 modules/pref-labels.php:68
-msgid "Help"
-msgstr "Hjelp"
-
-#: modules/popup-dialog.php:268
-msgid "Test"
-msgstr "Test"
-
-#: modules/popup-dialog.php:275 modules/popup-dialog.php:442
-msgid "Create"
-msgstr "Lag"
-
#: modules/popup-dialog.php:288
msgid "Create Filter"
msgstr "Lag filter"
@@ -1701,17 +1673,17 @@ msgid "description"
msgstr "beskrivelse"
#: modules/popup-dialog.php:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:377
+#: modules/pref-filters.php:394
msgid "Match"
msgstr "Match"
#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:425
msgid "before"
msgstr ""
#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:409
+#: modules/pref-filters.php:426
#, fuzzy
msgid "after"
msgstr "Dato"
@@ -1737,19 +1709,23 @@ msgid "with parameters:"
msgstr "med parametrene:"
#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
-#: modules/pref-feeds.php:500 modules/pref-filters.php:114
+#: modules/pref-feeds.php:500 modules/pref-filters.php:123
#: modules/pref-users.php:165
msgid "Options"
msgstr "Alternativer:"
-#: modules/popup-dialog.php:427 modules/pref-filters.php:126
+#: modules/popup-dialog.php:427 modules/pref-filters.php:135
msgid "Enabled"
msgstr "Tillatt"
-#: modules/popup-dialog.php:430 modules/pref-filters.php:135
+#: modules/popup-dialog.php:430 modules/pref-filters.php:144
msgid "Inverse match"
msgstr "Motsatt markering"
+#: modules/popup-dialog.php:442
+msgid "Create"
+msgstr "Lag"
+
#: modules/popup-dialog.php:457
msgid "Update Errors"
msgstr "Oppdaterer feil"
@@ -1771,7 +1747,7 @@ msgid "Tags for this article (separated by commas):"
msgstr "Denne artikkelens stikkord (separert med kommaer):"
#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
-#: modules/pref-feeds.php:544 modules/pref-filters.php:153
+#: modules/pref-feeds.php:544 modules/pref-filters.php:162
#: modules/pref-users.php:181
msgid "Save"
msgstr "Lagre"
@@ -1938,9 +1914,9 @@ msgstr "Lag kategori"
msgid "No feed categories defined."
msgstr "Ingen kategorier ble markert"
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:147
-#: modules/pref-filters.php:462 modules/pref-labels.php:330
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
+#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
+#: modules/pref-labels.php:176 modules/pref-users.php:481
msgid "Remove"
msgstr "Fjern"
@@ -1965,12 +1941,12 @@ msgid "Last&nbsp;Article"
msgstr "Siste&nbsp;Artikkel"
#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:498 mobile/functions.php:501
+#: mobile/functions.php:492 mobile/functions.php:495
msgid "Updated"
msgstr "Oppdatert"
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:436
-#: modules/pref-labels.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
+#: modules/pref-labels-old.php:310 modules/pref-users.php:456
msgid "Click to edit"
msgstr "Trykk for å endre"
@@ -1982,8 +1958,8 @@ msgstr "Utvalg:"
msgid "Recategorize"
msgstr "Rekategoriser"
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:460
-#: modules/pref-labels.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
+#: modules/pref-labels-old.php:328 modules/pref-users.php:479
msgid "Edit"
msgstr "Rediger"
@@ -1995,7 +1971,7 @@ msgstr "Slett manuelt"
msgid "Clear feed data"
msgstr "Slett nyhetsstrømsdata"
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:299
+#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
msgid "Rescore articles"
msgstr "Tilbakestill poengsummene for artiklene"
@@ -2060,54 +2036,54 @@ msgstr "Genererer en ny adresse"
msgid "Filter Editor"
msgstr "Filteradministrering"
-#: modules/pref-filters.php:197
+#: modules/pref-filters.php:214
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "Lagret filter <b>%s</b>"
-#: modules/pref-filters.php:239
+#: modules/pref-filters.php:256
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Laget filter <b>%s</b>"
-#: modules/pref-filters.php:292 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
msgid "Create filter"
msgstr "Lag filter"
-#: modules/pref-filters.php:367
+#: modules/pref-filters.php:384
msgid "filter_type_descr"
msgstr "Beskrivelse av filtertype"
-#: modules/pref-filters.php:368
+#: modules/pref-filters.php:385
msgid "action_description"
msgstr "Handlingsbeskrivelse"
-#: modules/pref-filters.php:379
+#: modules/pref-filters.php:396
#, fuzzy
msgid "Field"
msgstr "Nyhetsstrøm"
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:397
msgid "Params"
msgstr "Parametre"
-#: modules/pref-filters.php:425
+#: modules/pref-filters.php:442
msgid "(Disabled)"
msgstr "(Avskrudd)"
-#: modules/pref-filters.php:441
+#: modules/pref-filters.php:458
msgid "(Inverse)"
msgstr "(Motsatt)"
-#: modules/pref-filters.php:470
+#: modules/pref-filters.php:487
msgid "No filters defined."
msgstr "Ingen filtre er valgt"
-#: modules/pref-filters.php:472
+#: modules/pref-filters.php:489
msgid "No matching filters found."
msgstr "Ingen filtre ble funnet."
-#: modules/pref-labels.php:9
+#: modules/pref-labels-old.php:9
msgid ""
"Sorry, labels have been administratively disabled for this installation. "
"Please contact instance owner or edit configuration file to enable this "
@@ -2117,37 +2093,50 @@ msgstr ""
"installasjonen. Vennligst kontakt sideadministratoren eller rediger "
"konfigurasjonsfilen for å åpne for denne funksjonaliteten."
-#: modules/pref-labels.php:99
+#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
+#: modules/pref-labels.php:143
+msgid "Caption"
+msgstr "Overskrift"
+
+#: modules/pref-labels-old.php:46
+msgid "Match SQL"
+msgstr "Match SQL"
+
+#: modules/pref-labels-old.php:68
+msgid "Help"
+msgstr "Hjelp"
+
+#: modules/pref-labels-old.php:99
msgid "Error: SQL expression is blank."
msgstr "Feil: SQL uttrykket er blankt."
-#: modules/pref-labels.php:179
+#: modules/pref-labels-old.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "Lagret merkelapp <b>%s</b>"
-#: modules/pref-labels.php:211
+#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Laget merkelappen <b>%s</b>"
-#: modules/pref-labels.php:249 help/4.php:26
+#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
msgid "Create label"
msgstr "Lag merkelapp"
-#: modules/pref-labels.php:283
+#: modules/pref-labels-old.php:283
msgid "SQL Expression"
msgstr "SQL-uttrykk"
-#: modules/pref-labels.php:308
+#: modules/pref-labels-old.php:308
msgid "[No caption]"
msgstr "Ingen bildetekst"
-#: modules/pref-labels.php:335
+#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
msgid "No labels defined."
msgstr "Ingen merkelapper er valgt"
-#: modules/pref-labels.php:337
+#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
msgid "No matching labels found."
msgstr "Ingen passende merkelapper ble funnet."
@@ -2557,6 +2546,18 @@ msgstr "Gå til..."
msgid "Press any key to close this window."
msgstr "Trykk på en knapp for å lukk dette vinduet"
+#: help/4.php:11
+msgid "Content Filtering"
+msgstr "Innholdsfilter"
+
+#: help/4.php:12
+msgid "Label Editor"
+msgstr "Merkelappredigerer"
+
+#: help/4.php:13
+msgid "User Manager"
+msgstr "Brukeradministrering"
+
#: help/4.php:19
msgid "Panel actions"
msgstr "Panelhandlinger"
@@ -2588,32 +2589,32 @@ msgstr "Nyhetsstrøm"
msgid "View tags"
msgstr "Endre stikkord"
-#: mobile/functions.php:431
+#: mobile/functions.php:425
msgid "Back"
msgstr ""
-#: mobile/functions.php:441
+#: mobile/functions.php:435
msgid "View:"
msgstr "Vis:"
-#: mobile/functions.php:463
+#: mobile/functions.php:457
msgid "Refresh"
msgstr ""
-#: mobile/functions.php:695
+#: mobile/functions.php:689
#, fuzzy
msgid "Tags:"
msgstr "Stikkord"
-#: mobile/functions.php:727
+#: mobile/functions.php:721
msgid "Go back"
msgstr ""
-#: mobile/functions.php:738
+#: mobile/functions.php:732
msgid "Where:"
msgstr "Hvor:"
-#: mobile/functions.php:769
+#: mobile/functions.php:763
#, fuzzy
msgid "Match on:"
msgstr "Match på:"
@@ -2622,6 +2623,21 @@ msgstr "Match på:"
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid "Search to label"
+#~ msgstr "Søk etter merkelapp"
+
+#~ msgid "Convert to label"
+#~ msgstr "Konverter til merkelapp"
+
+#~ msgid "Dashboard"
+#~ msgstr "Skrivebord"
+
+#~ msgid "Create Label"
+#~ msgstr "Lag merkelapp"
+
+#~ msgid "Test"
+#~ msgstr "Test"
+
#, fuzzy
#~ msgid "Perform action"
#~ msgstr "Utfør handlingen"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index ad95b8c76..ea54b3de0 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 1133c8bdc..c9441e595 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss 1.2.14.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 17:20+0300\n"
+"POT-Creation-Date: 2009-01-18 15:24+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"
@@ -166,276 +166,269 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2628 functions.php:2992 functions.php:3373 functions.php:4237
-#: help/3.php:57 mobile/functions.php:52
-msgid "Starred articles"
-msgstr ""
-
-#: functions.php:2644 functions.php:2994 functions.php:3376 functions.php:4244
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
-msgid "Published articles"
-msgstr ""
-
-#: functions.php:2660 functions.php:2996 functions.php:3379 functions.php:4222
-#: help/3.php:58 mobile/functions.php:43
-msgid "Fresh articles"
-msgstr ""
-
-#: functions.php:2914 modules/popup-dialog.php:175
-#: modules/pref-filters.php:388 mobile/functions.php:741
+#: functions.php:2883 modules/popup-dialog.php:175
+#: modules/pref-filters.php:405 mobile/functions.php:735
msgid "All feeds"
msgstr "Todos os feeds"
-#: functions.php:2943 functions.php:2982 functions.php:3351 functions.php:4398
-#: functions.php:4428 modules/pref-feeds.php:1244
+#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1244
msgid "Uncategorized"
msgstr "Não Categorizado"
-#: functions.php:2972 functions.php:3540 mobile/functions.php:33
+#: functions.php:2941 functions.php:3508 mobile/functions.php:33
msgid "Special"
msgstr "Especial"
-#: functions.php:2974 functions.php:3542 mobile/functions.php:75
+#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
msgid "Labels"
msgstr ""
-#: functions.php:3337 functions.php:3339
+#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
+#: mobile/functions.php:52
+msgid "Starred articles"
+msgstr ""
+
+#: functions.php:2963 functions.php:3344 functions.php:4212
+#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+msgid "Published articles"
+msgstr ""
+
+#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
+#: mobile/functions.php:43
+msgid "Fresh articles"
+msgstr ""
+
+#: functions.php:3305 functions.php:3307
msgid "Search results"
msgstr ""
-#: functions.php:3355 functions.php:3368 functions.php:3374 functions.php:3377
-#: functions.php:3380 functions.php:3388
+#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
+#: functions.php:3348 functions.php:3356
msgid "Searched for"
msgstr ""
-#: functions.php:4014 functions.php:4064 functions.php:5416
+#: functions.php:3989 functions.php:4045 functions.php:5368
#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:341 modules/pref-labels.php:275
-#: modules/pref-users.php:408
+#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
+#: modules/pref-labels.php:136 modules/pref-users.php:408
msgid "Select:"
msgstr "Selecione:"
-#: functions.php:4015 functions.php:4065 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:342
-#: modules/pref-labels.php:276 modules/pref-users.php:409
-#: mobile/functions.php:567
+#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
+#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
+#: modules/pref-users.php:409 mobile/functions.php:561
msgid "All"
msgstr "Todos"
-#: functions.php:4016 functions.php:4022 functions.php:4066 functions.php:4069
-#: tt-rss.php:196 mobile/functions.php:455 mobile/functions.php:568
+#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
+#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
msgid "Unread"
msgstr "Não Lido"
-#: functions.php:4017 mobile/functions.php:570
+#: functions.php:3992 mobile/functions.php:564
#, fuzzy
msgid "Invert"
msgstr "(Inverso)"
-#: functions.php:4018 functions.php:4067 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:343
-#: modules/pref-labels.php:277 modules/pref-users.php:410
-#: mobile/functions.php:569
+#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
+#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
+#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
+#: modules/pref-users.php:410 mobile/functions.php:563
msgid "None"
msgstr "Nenhum"
-#: functions.php:4020 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
msgid "Actions..."
msgstr "Ações..."
-#: functions.php:4021
+#: functions.php:3996
#, fuzzy
msgid "Selection toggle:"
msgstr "Seleção"
-#: functions.php:4023 functions.php:4070 tt-rss.php:195
-#: mobile/functions.php:456
+#: functions.php:3998 functions.php:4051 tt-rss.php:195
+#: mobile/functions.php:450
msgid "Starred"
msgstr "Favoritos"
-#: functions.php:4024
+#: functions.php:3999
msgid "Published"
msgstr "Publicado"
-#: functions.php:4026 functions.php:4072
+#: functions.php:4001 functions.php:4053
msgid "Mark as read:"
msgstr "Marcar como lido:"
-#: functions.php:4027 mobile/functions.php:575
+#: functions.php:4002 mobile/functions.php:569
msgid "Selection"
msgstr "Seleção"
-#: functions.php:4041 mobile/functions.php:577
+#: functions.php:4016 mobile/functions.php:571
msgid "Entire feed"
msgstr ""
-#: functions.php:4044 tt-rss.php:162
-msgid "Other actions:"
-msgstr "Outras ações:"
-
-#: functions.php:4051 functions.php:4053
-msgid "Search to label"
+#: functions.php:4019
+msgid "Assign label:"
msgstr ""
-#: functions.php:4069
+#: functions.php:4031
+#, fuzzy
+msgid "(remove)"
+msgstr "Remover"
+
+#: functions.php:4050
msgid "Toggle:"
msgstr ""
-#: functions.php:4073 mobile/functions.php:576
+#: functions.php:4054 mobile/functions.php:570
msgid "Page"
msgstr "Página"
-#: functions.php:4074 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:378
+#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:395
msgid "Feed"
msgstr "Feed"
-#: functions.php:4081
-msgid "Convert to label"
-msgstr ""
-
-#: functions.php:4128
+#: functions.php:4096
msgid "Generated feed"
msgstr ""
-#: functions.php:4172
+#: functions.php:4145
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4210
-msgid "Dashboard"
-msgstr ""
-
-#: functions.php:4448
+#: functions.php:4398
msgid "No feeds to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:4465 mobile/functions.php:12
+#: functions.php:4415 mobile/functions.php:12
msgid "Tags"
msgstr "Tags"
-#: functions.php:4705
+#: functions.php:4657
#, fuzzy
msgid " - "
msgstr " - por "
-#: functions.php:4764 functions.php:4765
+#: functions.php:4716 functions.php:4717
msgid "no tags"
msgstr "sem tags"
-#: functions.php:4772
+#: functions.php:4724
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4780
+#: functions.php:4732
msgid "Display original article content"
msgstr ""
-#: functions.php:4787 functions.php:5426
+#: functions.php:4739 functions.php:5378
msgid "Show article summary in new window"
msgstr ""
-#: functions.php:4823 functions.php:5350
+#: functions.php:4775 functions.php:5302
#, fuzzy
msgid "unknown type"
msgstr "Erro desconhecido"
-#: functions.php:4829 functions.php:5356
+#: functions.php:4781 functions.php:5308
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4865 functions.php:5390
+#: functions.php:4817 functions.php:5342
msgid "Attachment:"
msgstr ""
-#: functions.php:4867 functions.php:5392
+#: functions.php:4819 functions.php:5344
msgid "Attachments:"
msgstr ""
-#: functions.php:4887 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
msgid "Close this window"
msgstr "Fechar esta janela"
-#: functions.php:4943 modules/pref-feed-browser.php:75
+#: functions.php:4895 modules/pref-feed-browser.php:75
msgid "Feed not found."
msgstr "Feed não encontrado."
-#: functions.php:5012 mobile/functions.php:420
+#: functions.php:4964 mobile/functions.php:414
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5125
+#: functions.php:5077
msgid "(Click to change)"
msgstr ""
-#: functions.php:5324
+#: functions.php:5276
#, fuzzy
msgid "Click to expand article"
msgstr "Favoritos"
-#: functions.php:5488
+#: functions.php:5440
#, fuzzy
msgid "No unread articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5491
+#: functions.php:5443
#, fuzzy
msgid "No starred articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5494
+#: functions.php:5446
#, fuzzy
msgid "No articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5862
+#: functions.php:5793
msgid "Match "
msgstr ""
-#: functions.php:5870
+#: functions.php:5801
#, fuzzy
msgid "Unread articles"
msgstr "Favoritos"
-#: functions.php:5871
+#: functions.php:5802
#, fuzzy
msgid "Updated articles"
msgstr "Favoritos"
-#: functions.php:5872
+#: functions.php:5803
#, fuzzy
msgid "Title contains"
msgstr "Título ou conteúdo"
-#: functions.php:5873
+#: functions.php:5804
#, fuzzy
msgid "Content contains"
msgstr "Filtrando o conteúdo"
-#: functions.php:5874
+#: functions.php:5805
msgid "Score equals"
msgstr ""
-#: functions.php:5875
+#: functions.php:5806
msgid "Score is greater than"
msgstr ""
-#: functions.php:5876
+#: functions.php:5807
msgid "Score is less than"
msgstr ""
-#: functions.php:5877
+#: functions.php:5808
msgid "Articles newer than X hours"
msgstr ""
-#: functions.php:5878
+#: functions.php:5809
msgid "Articles newer than X days"
msgstr ""
-#: functions.php:5887
+#: functions.php:5818
msgid "Add"
msgstr ""
@@ -447,7 +440,7 @@ msgstr ""
msgid "display tags"
msgstr ""
-#: localized_js.php:37 prefs.php:69 prefs.php:155 tt-rss.php:71
+#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
msgid "Loading, please wait..."
msgstr ""
@@ -827,7 +820,7 @@ msgstr "Salvando o Feed..."
#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:772
+#: mobile/functions.php:766
msgid "Title"
msgstr "Título"
@@ -840,7 +833,7 @@ msgid "Link"
msgstr "Link"
#: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:773
+#: mobile/functions.php:767
msgid "Content"
msgstr "Conteúdo"
@@ -852,7 +845,7 @@ msgstr ""
msgid "Filter article"
msgstr ""
-#: localized_schema.php:16 mobile/functions.php:580
+#: localized_schema.php:16 mobile/functions.php:574
msgid "Mark as read"
msgstr "Marcar como lido"
@@ -1187,7 +1180,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Retornar às preferências"
-#: prefs.php:77 prefs.php:158 tt-rss.php:79
+#: prefs.php:77 prefs.php:156 tt-rss.php:79
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1231,17 +1224,15 @@ msgstr "Outros Feeds"
msgid "Published Articles"
msgstr ""
-#: prefs.php:142 help/4.php:11
-msgid "Content Filtering"
-msgstr "Filtrando o conteúdo"
-
-#: prefs.php:145 help/4.php:12
-msgid "Label Editor"
-msgstr ""
+#: prefs.php:142
+#, fuzzy
+msgid "Filters"
+msgstr "Arquivo:"
-#: prefs.php:149 help/4.php:13
-msgid "User Manager"
-msgstr "Gerência de usuário"
+#: prefs.php:147
+#, fuzzy
+msgid "Users"
+msgstr "Usuário"
#: sanity_check.php:8
msgid ""
@@ -1333,9 +1324,10 @@ msgstr "núvem de tags"
#: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:282 modules/pref-labels.php:239
-#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:432
-#: mobile/functions.php:726 mobile/functions.php:780
+#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
+#: modules/pref-labels.php:103 modules/pref-users.php:364
+#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
+#: mobile/functions.php:774
msgid "Search"
msgstr ""
@@ -1377,6 +1369,10 @@ msgstr "&nbsp;&nbsp;Marcar como lido"
msgid "&nbsp;&nbsp;(Un)hide read feeds"
msgstr ""
+#: tt-rss.php:162
+msgid "Other actions:"
+msgstr "Outras ações:"
+
#: tt-rss.php:163
msgid "&nbsp;&nbsp;Create filter"
msgstr "&nbsp;&nbsp;Criar filtro"
@@ -1405,15 +1401,15 @@ msgstr "Todos os feeds"
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:185 mobile/functions.php:735
+#: tt-rss.php:185 mobile/functions.php:729
msgid "Search:"
msgstr ""
-#: tt-rss.php:193 mobile/functions.php:453
+#: tt-rss.php:193 mobile/functions.php:447
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:194 mobile/functions.php:454
+#: tt-rss.php:194 mobile/functions.php:448
msgid "All Articles"
msgstr ""
@@ -1427,7 +1423,7 @@ msgid "Order:"
msgstr "Onde:"
#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:418
+#: modules/pref-filters.php:435
#, fuzzy
msgid "Date"
msgstr "Atualizar"
@@ -1441,7 +1437,7 @@ msgid "Limit:"
msgstr "Limite:"
#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:433
+#: mobile/functions.php:427
msgid "Update"
msgstr "Atualizar"
@@ -1600,10 +1596,10 @@ msgid "Subscribe"
msgstr ""
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:279 modules/popup-dialog.php:446
-#: modules/popup-dialog.php:541 modules/pref-feeds.php:130
-#: modules/pref-feeds.php:395 modules/pref-feeds.php:546
-#: modules/pref-filters.php:157 modules/pref-users.php:184
+#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/pref-feeds.php:130 modules/pref-feeds.php:395
+#: modules/pref-feeds.php:546 modules/pref-filters.php:166
+#: modules/pref-users.php:184
msgid "Cancel"
msgstr "Cancelar"
@@ -1611,7 +1607,7 @@ msgstr "Cancelar"
msgid "match on:"
msgstr ""
-#: modules/popup-dialog.php:167 mobile/functions.php:774
+#: modules/popup-dialog.php:167 mobile/functions.php:768
msgid "Title or content"
msgstr "Título ou conteúdo"
@@ -1619,37 +1615,10 @@ msgstr "Título ou conteúdo"
msgid "Limit search to:"
msgstr ""
-#: modules/popup-dialog.php:188 mobile/functions.php:754
+#: modules/popup-dialog.php:188 mobile/functions.php:748
msgid "This feed"
msgstr ""
-#: modules/popup-dialog.php:223
-#, fuzzy
-msgid "Create Label"
-msgstr "Criar um usuário"
-
-#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:282
-msgid "Caption"
-msgstr ""
-
-#: modules/popup-dialog.php:241 modules/pref-labels.php:46
-msgid "Match SQL"
-msgstr ""
-
-#: modules/popup-dialog.php:265 modules/pref-labels.php:68
-#, fuzzy
-msgid "Help"
-msgstr "Olá,"
-
-#: modules/popup-dialog.php:268
-msgid "Test"
-msgstr "Teste"
-
-#: modules/popup-dialog.php:275 modules/popup-dialog.php:442
-msgid "Create"
-msgstr "Criar"
-
#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
@@ -1661,17 +1630,17 @@ msgid "description"
msgstr "descrição"
#: modules/popup-dialog.php:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:377
+#: modules/pref-filters.php:394
msgid "Match"
msgstr ""
#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:425
msgid "before"
msgstr ""
#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:409
+#: modules/pref-filters.php:426
#, fuzzy
msgid "after"
msgstr "Atualizar"
@@ -1699,20 +1668,24 @@ msgid "with parameters:"
msgstr ""
#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
-#: modules/pref-feeds.php:500 modules/pref-filters.php:114
+#: modules/pref-feeds.php:500 modules/pref-filters.php:123
#: modules/pref-users.php:165
#, fuzzy
msgid "Options"
msgstr "Opções:"
-#: modules/popup-dialog.php:427 modules/pref-filters.php:126
+#: modules/popup-dialog.php:427 modules/pref-filters.php:135
msgid "Enabled"
msgstr "Ativado"
-#: modules/popup-dialog.php:430 modules/pref-filters.php:135
+#: modules/popup-dialog.php:430 modules/pref-filters.php:144
msgid "Inverse match"
msgstr ""
+#: modules/popup-dialog.php:442
+msgid "Create"
+msgstr "Criar"
+
#: modules/popup-dialog.php:457
msgid "Update Errors"
msgstr ""
@@ -1734,7 +1707,7 @@ msgid "Tags for this article (separated by commas):"
msgstr ""
#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
-#: modules/pref-feeds.php:544 modules/pref-filters.php:153
+#: modules/pref-feeds.php:544 modules/pref-filters.php:162
#: modules/pref-users.php:181
msgid "Save"
msgstr "Salvar"
@@ -1904,9 +1877,9 @@ msgstr "Criar categoria"
msgid "No feed categories defined."
msgstr ""
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:147
-#: modules/pref-filters.php:462 modules/pref-labels.php:330
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
+#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
+#: modules/pref-labels.php:176 modules/pref-users.php:481
msgid "Remove"
msgstr "Remover"
@@ -1931,12 +1904,12 @@ msgid "Last&nbsp;Article"
msgstr ""
#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:498 mobile/functions.php:501
+#: mobile/functions.php:492 mobile/functions.php:495
msgid "Updated"
msgstr "Atualizado"
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:436
-#: modules/pref-labels.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
+#: modules/pref-labels-old.php:310 modules/pref-users.php:456
msgid "Click to edit"
msgstr ""
@@ -1949,8 +1922,8 @@ msgstr "Seleção"
msgid "Recategorize"
msgstr ""
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:460
-#: modules/pref-labels.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
+#: modules/pref-labels-old.php:328 modules/pref-users.php:479
msgid "Edit"
msgstr "Editar"
@@ -1962,7 +1935,7 @@ msgstr ""
msgid "Clear feed data"
msgstr ""
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:299
+#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
#, fuzzy
msgid "Rescore articles"
msgstr "Favoritos"
@@ -2026,91 +1999,105 @@ msgstr "Gerar um outro endereço"
msgid "Filter Editor"
msgstr "Editor de Feed"
-#: modules/pref-filters.php:197
+#: modules/pref-filters.php:214
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr ""
-#: modules/pref-filters.php:239
+#: modules/pref-filters.php:256
#, php-format
msgid "Created filter <b>%s</b>"
msgstr ""
-#: modules/pref-filters.php:292 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
msgid "Create filter"
msgstr ""
-#: modules/pref-filters.php:367
+#: modules/pref-filters.php:384
msgid "filter_type_descr"
msgstr "filter_type_descr"
-#: modules/pref-filters.php:368
+#: modules/pref-filters.php:385
msgid "action_description"
msgstr "action_description"
-#: modules/pref-filters.php:379
+#: modules/pref-filters.php:396
#, fuzzy
msgid "Field"
msgstr "Feed"
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:397
msgid "Params"
msgstr ""
-#: modules/pref-filters.php:425
+#: modules/pref-filters.php:442
msgid "(Disabled)"
msgstr "(Desativado)"
-#: modules/pref-filters.php:441
+#: modules/pref-filters.php:458
msgid "(Inverse)"
msgstr "(Inverso)"
-#: modules/pref-filters.php:470
+#: modules/pref-filters.php:487
msgid "No filters defined."
msgstr ""
-#: modules/pref-filters.php:472
+#: modules/pref-filters.php:489
msgid "No matching filters found."
msgstr ""
-#: modules/pref-labels.php:9
+#: modules/pref-labels-old.php:9
msgid ""
"Sorry, labels have been administratively disabled for this installation. "
"Please contact instance owner or edit configuration file to enable this "
"functionality."
msgstr ""
-#: modules/pref-labels.php:99
+#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
+#: modules/pref-labels.php:143
+msgid "Caption"
+msgstr ""
+
+#: modules/pref-labels-old.php:46
+msgid "Match SQL"
+msgstr ""
+
+#: modules/pref-labels-old.php:68
+#, fuzzy
+msgid "Help"
+msgstr "Olá,"
+
+#: modules/pref-labels-old.php:99
msgid "Error: SQL expression is blank."
msgstr ""
-#: modules/pref-labels.php:179
+#: modules/pref-labels-old.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:211
+#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
#, php-format
msgid "Created label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:249 help/4.php:26
+#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
msgid "Create label"
msgstr ""
-#: modules/pref-labels.php:283
+#: modules/pref-labels-old.php:283
msgid "SQL Expression"
msgstr "Expressão SQL"
-#: modules/pref-labels.php:308
+#: modules/pref-labels-old.php:308
msgid "[No caption]"
msgstr ""
-#: modules/pref-labels.php:335
+#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
msgid "No labels defined."
msgstr ""
-#: modules/pref-labels.php:337
+#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
msgid "No matching labels found."
msgstr ""
@@ -2533,6 +2520,18 @@ msgstr ""
msgid "Press any key to close this window."
msgstr "Fechar esta janela"
+#: help/4.php:11
+msgid "Content Filtering"
+msgstr "Filtrando o conteúdo"
+
+#: help/4.php:12
+msgid "Label Editor"
+msgstr ""
+
+#: help/4.php:13
+msgid "User Manager"
+msgstr "Gerência de usuário"
+
#: help/4.php:19
#, fuzzy
msgid "Panel actions"
@@ -2566,33 +2565,33 @@ msgstr "Feed"
msgid "View tags"
msgstr "Editar Tags"
-#: mobile/functions.php:431
+#: mobile/functions.php:425
msgid "Back"
msgstr ""
-#: mobile/functions.php:441
+#: mobile/functions.php:435
#, fuzzy
msgid "View:"
msgstr "Título"
-#: mobile/functions.php:463
+#: mobile/functions.php:457
msgid "Refresh"
msgstr ""
-#: mobile/functions.php:695
+#: mobile/functions.php:689
#, fuzzy
msgid "Tags:"
msgstr "Tags"
-#: mobile/functions.php:727
+#: mobile/functions.php:721
msgid "Go back"
msgstr ""
-#: mobile/functions.php:738
+#: mobile/functions.php:732
msgid "Where:"
msgstr "Onde:"
-#: mobile/functions.php:769
+#: mobile/functions.php:763
msgid "Match on:"
msgstr ""
@@ -2601,6 +2600,13 @@ msgid "Internal error: Function not implemented"
msgstr ""
#, fuzzy
+#~ msgid "Create Label"
+#~ msgstr "Criar um usuário"
+
+#~ msgid "Test"
+#~ msgstr "Teste"
+
+#, fuzzy
#~ msgid "Perform action"
#~ msgstr "Ação"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 02fddbc84..eb151161b 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 93daaec63..20414ff16 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-01-16 17:20+0300\n"
+"POT-Creation-Date: 2009-01-18 15:24+0300\n"
"PO-Revision-Date: 2008-12-16 13:32+0400\n"
"Last-Translator: Max Kamashev <[email protected]>\n"
"Language-Team: Русский <[email protected]>\n"
@@ -173,198 +173,192 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2628 functions.php:2992 functions.php:3373 functions.php:4237
-#: help/3.php:57 mobile/functions.php:52
-msgid "Starred articles"
-msgstr "Отмеченные"
-
-#: functions.php:2644 functions.php:2994 functions.php:3376 functions.php:4244
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
-msgid "Published articles"
-msgstr "Опубликованные"
-
-#: functions.php:2660 functions.php:2996 functions.php:3379 functions.php:4222
-#: help/3.php:58 mobile/functions.php:43
-msgid "Fresh articles"
-msgstr "Свежие"
-
-#: functions.php:2914 modules/popup-dialog.php:175
-#: modules/pref-filters.php:388 mobile/functions.php:741
+#: functions.php:2883 modules/popup-dialog.php:175
+#: modules/pref-filters.php:405 mobile/functions.php:735
msgid "All feeds"
msgstr "Все каналы"
-#: functions.php:2943 functions.php:2982 functions.php:3351 functions.php:4398
-#: functions.php:4428 modules/pref-feeds.php:1244
+#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1244
msgid "Uncategorized"
msgstr "Нет категории"
-#: functions.php:2972 functions.php:3540 mobile/functions.php:33
+#: functions.php:2941 functions.php:3508 mobile/functions.php:33
msgid "Special"
msgstr "Особые"
-#: functions.php:2974 functions.php:3542 mobile/functions.php:75
+#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
msgid "Labels"
msgstr "Метки"
-#: functions.php:3337 functions.php:3339
+#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
+#: mobile/functions.php:52
+msgid "Starred articles"
+msgstr "Отмеченные"
+
+#: functions.php:2963 functions.php:3344 functions.php:4212
+#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+msgid "Published articles"
+msgstr "Опубликованные"
+
+#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
+#: mobile/functions.php:43
+msgid "Fresh articles"
+msgstr "Свежие"
+
+#: functions.php:3305 functions.php:3307
msgid "Search results"
msgstr "Результаты поиска"
-#: functions.php:3355 functions.php:3368 functions.php:3374 functions.php:3377
-#: functions.php:3380 functions.php:3388
+#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
+#: functions.php:3348 functions.php:3356
msgid "Searched for"
msgstr "Поиск"
-#: functions.php:4014 functions.php:4064 functions.php:5416
+#: functions.php:3989 functions.php:4045 functions.php:5368
#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:341 modules/pref-labels.php:275
-#: modules/pref-users.php:408
+#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
+#: modules/pref-labels.php:136 modules/pref-users.php:408
msgid "Select:"
msgstr "Выбрать:"
-#: functions.php:4015 functions.php:4065 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:342
-#: modules/pref-labels.php:276 modules/pref-users.php:409
-#: mobile/functions.php:567
+#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
+#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
+#: modules/pref-users.php:409 mobile/functions.php:561
msgid "All"
msgstr "Все"
-#: functions.php:4016 functions.php:4022 functions.php:4066 functions.php:4069
-#: tt-rss.php:196 mobile/functions.php:455 mobile/functions.php:568
+#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
+#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
msgid "Unread"
msgstr "Новые"
-#: functions.php:4017 mobile/functions.php:570
+#: functions.php:3992 mobile/functions.php:564
msgid "Invert"
msgstr "Инвертировать"
-#: functions.php:4018 functions.php:4067 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:343
-#: modules/pref-labels.php:277 modules/pref-users.php:410
-#: mobile/functions.php:569
+#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
+#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
+#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
+#: modules/pref-users.php:410 mobile/functions.php:563
msgid "None"
msgstr "Ничего"
-#: functions.php:4020 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
msgid "Actions..."
msgstr "Действия..."
-#: functions.php:4021
+#: functions.php:3996
msgid "Selection toggle:"
msgstr "Переключить выбранное:"
-#: functions.php:4023 functions.php:4070 tt-rss.php:195
-#: mobile/functions.php:456
+#: functions.php:3998 functions.php:4051 tt-rss.php:195
+#: mobile/functions.php:450
msgid "Starred"
msgstr "Отмеченные"
-#: functions.php:4024
+#: functions.php:3999
msgid "Published"
msgstr "Опубликован"
-#: functions.php:4026 functions.php:4072
+#: functions.php:4001 functions.php:4053
msgid "Mark as read:"
msgstr "Пометить как прочит.:"
-#: functions.php:4027 mobile/functions.php:575
+#: functions.php:4002 mobile/functions.php:569
msgid "Selection"
msgstr "Выбранные"
-#: functions.php:4041 mobile/functions.php:577
+#: functions.php:4016 mobile/functions.php:571
msgid "Entire feed"
msgstr "Весь канал"
-#: functions.php:4044 tt-rss.php:162
-msgid "Other actions:"
-msgstr "Другие действия:"
+#: functions.php:4019
+#, fuzzy
+msgid "Assign label:"
+msgstr "Применить теги"
-#: functions.php:4051 functions.php:4053
-msgid "Search to label"
-msgstr "Искать метку"
+#: functions.php:4031
+#, fuzzy
+msgid "(remove)"
+msgstr "Удалить"
-#: functions.php:4069
+#: functions.php:4050
msgid "Toggle:"
msgstr "Изменить:"
-#: functions.php:4073 mobile/functions.php:576
+#: functions.php:4054 mobile/functions.php:570
msgid "Page"
msgstr "Страница"
-#: functions.php:4074 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:378
+#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:395
msgid "Feed"
msgstr "Канал"
-#: functions.php:4081
-msgid "Convert to label"
-msgstr "Превратить в метку"
-
-#: functions.php:4128
+#: functions.php:4096
msgid "Generated feed"
msgstr "Генерировать канал"
-#: functions.php:4172
+#: functions.php:4145
msgid "Click to collapse category"
msgstr "Щёлкните, чтобы развернуть категорию"
-#: functions.php:4210
-msgid "Dashboard"
-msgstr "Панель управления"
-
-#: functions.php:4448
+#: functions.php:4398
msgid "No feeds to display."
msgstr "Нет каналов для отображения."
-#: functions.php:4465 mobile/functions.php:12
+#: functions.php:4415 mobile/functions.php:12
msgid "Tags"
msgstr "Теги"
-#: functions.php:4705
+#: functions.php:4657
msgid " - "
msgstr " - "
-#: functions.php:4764 functions.php:4765
+#: functions.php:4716 functions.php:4717
msgid "no tags"
msgstr "нет тегов"
-#: functions.php:4772
+#: functions.php:4724
msgid "Edit tags for this article"
msgstr "Редактировать теги статьи"
-#: functions.php:4780
+#: functions.php:4732
msgid "Display original article content"
msgstr "Показать оригинальное содержимое статьи"
-#: functions.php:4787 functions.php:5426
+#: functions.php:4739 functions.php:5378
msgid "Show article summary in new window"
msgstr "Показать детали статьи в новом окне"
-#: functions.php:4823 functions.php:5350
+#: functions.php:4775 functions.php:5302
msgid "unknown type"
msgstr "Неизвестный тип"
-#: functions.php:4829 functions.php:5356
+#: functions.php:4781 functions.php:5308
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4865 functions.php:5390
+#: functions.php:4817 functions.php:5342
msgid "Attachment:"
msgstr "Вложение:"
-#: functions.php:4867 functions.php:5392
+#: functions.php:4819 functions.php:5344
msgid "Attachments:"
msgstr "Вложения:"
-#: functions.php:4887 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
msgid "Close this window"
msgstr "Закрыть это окно"
-#: functions.php:4943 modules/pref-feed-browser.php:75
+#: functions.php:4895 modules/pref-feed-browser.php:75
msgid "Feed not found."
msgstr "Канал не найден."
-#: functions.php:5012 mobile/functions.php:420
+#: functions.php:4964 mobile/functions.php:414
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -372,67 +366,67 @@ msgstr ""
"Не могу показать канал (ошибка в запросе). Пожалуйста проверьте синтаксис "
"или локальную конфигурацию."
-#: functions.php:5125
+#: functions.php:5077
msgid "(Click to change)"
msgstr "(Щёлкните для изменения)"
-#: functions.php:5324
+#: functions.php:5276
msgid "Click to expand article"
msgstr "Щёлкните чтобы развернуть статью"
-#: functions.php:5488
+#: functions.php:5440
msgid "No unread articles found to display."
msgstr "Не найдено не прочитанных статей"
-#: functions.php:5491
+#: functions.php:5443
msgid "No starred articles found to display."
msgstr "Не найдено отмеченных статей"
-#: functions.php:5494
+#: functions.php:5446
msgid "No articles found to display."
msgstr "Статей не найдено."
-#: functions.php:5862
+#: functions.php:5793
msgid "Match "
msgstr "Соответствие"
-#: functions.php:5870
+#: functions.php:5801
msgid "Unread articles"
msgstr "Отмеченные"
-#: functions.php:5871
+#: functions.php:5802
msgid "Updated articles"
msgstr "Обновлённые статьи"
-#: functions.php:5872
+#: functions.php:5803
msgid "Title contains"
msgstr "Заголовок содержит"
-#: functions.php:5873
+#: functions.php:5804
msgid "Content contains"
msgstr "В содержимом"
-#: functions.php:5874
+#: functions.php:5805
msgid "Score equals"
msgstr "Оценка равна"
-#: functions.php:5875
+#: functions.php:5806
msgid "Score is greater than"
msgstr "Оценка выше чем"
-#: functions.php:5876
+#: functions.php:5807
msgid "Score is less than"
msgstr "Оценка меньше чем"
-#: functions.php:5877
+#: functions.php:5808
msgid "Articles newer than X hours"
msgstr "Статье меньше X часов"
-#: functions.php:5878
+#: functions.php:5809
msgid "Articles newer than X days"
msgstr "Статье меньше X дней"
-#: functions.php:5887
+#: functions.php:5818
msgid "Add"
msgstr "Добавить"
@@ -444,7 +438,7 @@ msgstr "показать каналы"
msgid "display tags"
msgstr "показать теги"
-#: localized_js.php:37 prefs.php:69 prefs.php:155 tt-rss.php:71
+#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
msgid "Loading, please wait..."
msgstr "Идет загрузка..."
@@ -818,7 +812,7 @@ msgstr "Сохраняются каналы..."
#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:772
+#: mobile/functions.php:766
msgid "Title"
msgstr "Заголовок"
@@ -831,7 +825,7 @@ msgid "Link"
msgstr "Ссылка"
#: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:773
+#: mobile/functions.php:767
msgid "Content"
msgstr "Содержимое"
@@ -843,7 +837,7 @@ msgstr "Дата Статьи"
msgid "Filter article"
msgstr "Отфильтровать статью"
-#: localized_schema.php:16 mobile/functions.php:580
+#: localized_schema.php:16 mobile/functions.php:574
msgid "Mark as read"
msgstr "Как прочитанные"
@@ -1200,7 +1194,7 @@ msgstr "Расширение DOMXML не найдено. Оно необходи
msgid "Return to preferences"
msgstr "Вернуться к настройкам"
-#: prefs.php:77 prefs.php:158 tt-rss.php:79
+#: prefs.php:77 prefs.php:156 tt-rss.php:79
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1246,17 +1240,15 @@ msgstr "Другие каналы"
msgid "Published Articles"
msgstr "Опубликованные статьи"
-#: prefs.php:142 help/4.php:11
-msgid "Content Filtering"
-msgstr "Фильтры"
-
-#: prefs.php:145 help/4.php:12
-msgid "Label Editor"
-msgstr "Редактор Меток"
+#: prefs.php:142
+#, fuzzy
+msgid "Filters"
+msgstr "Файл:"
-#: prefs.php:149 help/4.php:13
-msgid "User Manager"
-msgstr "Пользователи"
+#: prefs.php:147
+#, fuzzy
+msgid "Users"
+msgstr "Пользователь"
#: sanity_check.php:8
msgid ""
@@ -1368,9 +1360,10 @@ msgstr "облако тегов"
#: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:282 modules/pref-labels.php:239
-#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:432
-#: mobile/functions.php:726 mobile/functions.php:780
+#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
+#: modules/pref-labels.php:103 modules/pref-users.php:364
+#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
+#: mobile/functions.php:774
msgid "Search"
msgstr "Поиск"
@@ -1410,6 +1403,10 @@ msgstr "&nbsp;&nbsp;Пометить как прочитанные"
msgid "&nbsp;&nbsp;(Un)hide read feeds"
msgstr "&nbsp;&nbsp;Спрятать прочитанные"
+#: tt-rss.php:162
+msgid "Other actions:"
+msgstr "Другие действия:"
+
#: tt-rss.php:163
msgid "&nbsp;&nbsp;Create filter"
msgstr "&nbsp;&nbsp;Создать фильтр"
@@ -1434,15 +1431,15 @@ msgstr "Свернуть список каналов"
msgid "Toggle Feedlist"
msgstr "Переключить Список Каналов"
-#: tt-rss.php:185 mobile/functions.php:735
+#: tt-rss.php:185 mobile/functions.php:729
msgid "Search:"
msgstr "Искать:"
-#: tt-rss.php:193 mobile/functions.php:453
+#: tt-rss.php:193 mobile/functions.php:447
msgid "Adaptive"
msgstr "Адаптивно"
-#: tt-rss.php:194 mobile/functions.php:454
+#: tt-rss.php:194 mobile/functions.php:448
msgid "All Articles"
msgstr "Все статьи"
@@ -1455,7 +1452,7 @@ msgid "Order:"
msgstr "Порядок:"
#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:418
+#: modules/pref-filters.php:435
msgid "Date"
msgstr "Дата"
@@ -1468,7 +1465,7 @@ msgid "Limit:"
msgstr "Сколько:"
#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:433
+#: mobile/functions.php:427
msgid "Update"
msgstr "Обновить"
@@ -1627,10 +1624,10 @@ msgid "Subscribe"
msgstr "Подписаться"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:279 modules/popup-dialog.php:446
-#: modules/popup-dialog.php:541 modules/pref-feeds.php:130
-#: modules/pref-feeds.php:395 modules/pref-feeds.php:546
-#: modules/pref-filters.php:157 modules/pref-users.php:184
+#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/pref-feeds.php:130 modules/pref-feeds.php:395
+#: modules/pref-feeds.php:546 modules/pref-filters.php:166
+#: modules/pref-users.php:184
msgid "Cancel"
msgstr "Отмена"
@@ -1638,7 +1635,7 @@ msgstr "Отмена"
msgid "match on:"
msgstr "соответствие:"
-#: modules/popup-dialog.php:167 mobile/functions.php:774
+#: modules/popup-dialog.php:167 mobile/functions.php:768
msgid "Title or content"
msgstr "Заголовок или содержимое"
@@ -1646,35 +1643,10 @@ msgstr "Заголовок или содержимое"
msgid "Limit search to:"
msgstr "Ограничить поиск:"
-#: modules/popup-dialog.php:188 mobile/functions.php:754
+#: modules/popup-dialog.php:188 mobile/functions.php:748
msgid "This feed"
msgstr "Этот канал"
-#: modules/popup-dialog.php:223
-msgid "Create Label"
-msgstr "Создать метку"
-
-#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:282
-msgid "Caption"
-msgstr "Заголовок"
-
-#: modules/popup-dialog.php:241 modules/pref-labels.php:46
-msgid "Match SQL"
-msgstr "Совпадение SQL"
-
-#: modules/popup-dialog.php:265 modules/pref-labels.php:68
-msgid "Help"
-msgstr "Помощь"
-
-#: modules/popup-dialog.php:268
-msgid "Test"
-msgstr "Проверить"
-
-#: modules/popup-dialog.php:275 modules/popup-dialog.php:442
-msgid "Create"
-msgstr "Создать"
-
#: modules/popup-dialog.php:288
msgid "Create Filter"
msgstr "Создать фильтр"
@@ -1685,17 +1657,17 @@ msgid "description"
msgstr "описание"
#: modules/popup-dialog.php:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:377
+#: modules/pref-filters.php:394
msgid "Match"
msgstr "Искать"
#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:425
msgid "before"
msgstr "перед"
#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:409
+#: modules/pref-filters.php:426
msgid "after"
msgstr "после"
@@ -1720,19 +1692,23 @@ msgid "with parameters:"
msgstr "с параметрами:"
#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
-#: modules/pref-feeds.php:500 modules/pref-filters.php:114
+#: modules/pref-feeds.php:500 modules/pref-filters.php:123
#: modules/pref-users.php:165
msgid "Options"
msgstr "Опции:"
-#: modules/popup-dialog.php:427 modules/pref-filters.php:126
+#: modules/popup-dialog.php:427 modules/pref-filters.php:135
msgid "Enabled"
msgstr "Включен"
-#: modules/popup-dialog.php:430 modules/pref-filters.php:135
+#: modules/popup-dialog.php:430 modules/pref-filters.php:144
msgid "Inverse match"
msgstr "Инвертировать фильтр"
+#: modules/popup-dialog.php:442
+msgid "Create"
+msgstr "Создать"
+
#: modules/popup-dialog.php:457
msgid "Update Errors"
msgstr "Ошибки обновления"
@@ -1754,7 +1730,7 @@ msgid "Tags for this article (separated by commas):"
msgstr "Теги для этой статьи (разделенные запятыми):"
#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
-#: modules/pref-feeds.php:544 modules/pref-filters.php:153
+#: modules/pref-feeds.php:544 modules/pref-filters.php:162
#: modules/pref-users.php:181
msgid "Save"
msgstr "Сохранить"
@@ -1920,9 +1896,9 @@ msgstr "Создать категорию"
msgid "No feed categories defined."
msgstr "Категории отсутствуют."
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:147
-#: modules/pref-filters.php:462 modules/pref-labels.php:330
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
+#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
+#: modules/pref-labels.php:176 modules/pref-users.php:481
msgid "Remove"
msgstr "Удалить"
@@ -1947,12 +1923,12 @@ msgid "Last&nbsp;Article"
msgstr "Последняя&nbsp;статья"
#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:498 mobile/functions.php:501
+#: mobile/functions.php:492 mobile/functions.php:495
msgid "Updated"
msgstr "Обновлено"
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:436
-#: modules/pref-labels.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
+#: modules/pref-labels-old.php:310 modules/pref-users.php:456
msgid "Click to edit"
msgstr "Щёлкните для редактирования"
@@ -1965,8 +1941,8 @@ msgstr "Выбрать:"
msgid "Recategorize"
msgstr "Изменить категорию"
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:460
-#: modules/pref-labels.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
+#: modules/pref-labels-old.php:328 modules/pref-users.php:479
msgid "Edit"
msgstr "Редактировать"
@@ -1978,7 +1954,7 @@ msgstr "Ручная очистка"
msgid "Clear feed data"
msgstr "Очистить данные канала."
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:299
+#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
#, fuzzy
msgid "Rescore articles"
msgstr "Отмеченные"
@@ -2043,91 +2019,104 @@ msgstr "Создать другую ссылку"
msgid "Filter Editor"
msgstr "Редактор фильтров"
-#: modules/pref-filters.php:197
+#: modules/pref-filters.php:214
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "Фильтр <b>%s</b> сохранен"
-#: modules/pref-filters.php:239
+#: modules/pref-filters.php:256
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Добавлен фильтр <b>%s</b>"
-#: modules/pref-filters.php:292 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
msgid "Create filter"
msgstr "Создать фильтр"
-#: modules/pref-filters.php:367
+#: modules/pref-filters.php:384
msgid "filter_type_descr"
msgstr ""
-#: modules/pref-filters.php:368
+#: modules/pref-filters.php:385
#, fuzzy
msgid "action_description"
msgstr "описание"
-#: modules/pref-filters.php:379
+#: modules/pref-filters.php:396
msgid "Field"
msgstr "Поле"
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:397
msgid "Params"
msgstr "Параметры:"
-#: modules/pref-filters.php:425
+#: modules/pref-filters.php:442
msgid "(Disabled)"
msgstr "(Отключен)"
-#: modules/pref-filters.php:441
+#: modules/pref-filters.php:458
msgid "(Inverse)"
msgstr "(Инвертирован)"
-#: modules/pref-filters.php:470
+#: modules/pref-filters.php:487
msgid "No filters defined."
msgstr "Фильтры отсутствуют."
-#: modules/pref-filters.php:472
+#: modules/pref-filters.php:489
msgid "No matching filters found."
msgstr "Не найдено совпадений с фильтром."
-#: modules/pref-labels.php:9
+#: modules/pref-labels-old.php:9
msgid ""
"Sorry, labels have been administratively disabled for this installation. "
"Please contact instance owner or edit configuration file to enable this "
"functionality."
msgstr ""
-#: modules/pref-labels.php:99
+#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
+#: modules/pref-labels.php:143
+msgid "Caption"
+msgstr "Заголовок"
+
+#: modules/pref-labels-old.php:46
+msgid "Match SQL"
+msgstr "Совпадение SQL"
+
+#: modules/pref-labels-old.php:68
+msgid "Help"
+msgstr "Помощь"
+
+#: modules/pref-labels-old.php:99
msgid "Error: SQL expression is blank."
msgstr "Ошибка: пустое SQL выражение."
-#: modules/pref-labels.php:179
+#: modules/pref-labels-old.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "Метка <b>%s</b> сохранена"
-#: modules/pref-labels.php:211
+#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Добавлена метка <b>%s</b>"
-#: modules/pref-labels.php:249 help/4.php:26
+#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
msgid "Create label"
msgstr "Создать метку"
-#: modules/pref-labels.php:283
+#: modules/pref-labels-old.php:283
msgid "SQL Expression"
msgstr "SQL выражение"
-#: modules/pref-labels.php:308
+#: modules/pref-labels-old.php:308
msgid "[No caption]"
msgstr "[Нет заголовка]"
-#: modules/pref-labels.php:335
+#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
msgid "No labels defined."
msgstr "Метки отсутствуют."
-#: modules/pref-labels.php:337
+#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
msgid "No matching labels found."
msgstr "Не найдено совпадений с метками."
@@ -2519,6 +2508,18 @@ msgstr "Перейти к.."
msgid "Press any key to close this window."
msgstr "Нажмите любую клавишу для закрытия этого окна"
+#: help/4.php:11
+msgid "Content Filtering"
+msgstr "Фильтры"
+
+#: help/4.php:12
+msgid "Label Editor"
+msgstr "Редактор Меток"
+
+#: help/4.php:13
+msgid "User Manager"
+msgstr "Пользователи"
+
#: help/4.php:19
msgid "Panel actions"
msgstr "Действия над каналами"
@@ -2547,31 +2548,31 @@ msgstr "Каналы"
msgid "View tags"
msgstr "Теги"
-#: mobile/functions.php:431
+#: mobile/functions.php:425
msgid "Back"
msgstr "Назад"
-#: mobile/functions.php:441
+#: mobile/functions.php:435
msgid "View:"
msgstr "Показать:"
-#: mobile/functions.php:463
+#: mobile/functions.php:457
msgid "Refresh"
msgstr "Обновить"
-#: mobile/functions.php:695
+#: mobile/functions.php:689
msgid "Tags:"
msgstr "Теги:"
-#: mobile/functions.php:727
+#: mobile/functions.php:721
msgid "Go back"
msgstr "Идти назад"
-#: mobile/functions.php:738
+#: mobile/functions.php:732
msgid "Where:"
msgstr "Где:"
-#: mobile/functions.php:769
+#: mobile/functions.php:763
msgid "Match on:"
msgstr "Соответствие:"
@@ -2579,6 +2580,21 @@ msgstr "Соответствие:"
msgid "Internal error: Function not implemented"
msgstr "Внутренняя ошибка: Функция не реализована"
+#~ msgid "Search to label"
+#~ msgstr "Искать метку"
+
+#~ msgid "Convert to label"
+#~ msgstr "Превратить в метку"
+
+#~ msgid "Dashboard"
+#~ msgstr "Панель управления"
+
+#~ msgid "Create Label"
+#~ msgstr "Создать метку"
+
+#~ msgid "Test"
+#~ msgstr "Проверить"
+
#~ msgid ""
#~ "This program requires XmlHttpRequest to function properly. Your browser "
#~ "doesn't seem to support it."
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 610b2bad8..930acbaef 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 d2cd7d8ff..511493a03 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 17:20+0300\n"
+"POT-Creation-Date: 2009-01-18 15:24+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"
@@ -162,281 +162,274 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2628 functions.php:2992 functions.php:3373 functions.php:4237
-#: help/3.php:57 mobile/functions.php:52
-msgid "Starred articles"
-msgstr "星级文章"
-
-#: functions.php:2644 functions.php:2994 functions.php:3376 functions.php:4244
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
-msgid "Published articles"
-msgstr "已发布文章"
-
-#: functions.php:2660 functions.php:2996 functions.php:3379 functions.php:4222
-#: help/3.php:58 mobile/functions.php:43
-#, fuzzy
-msgid "Fresh articles"
-msgstr "星级文章"
-
-#: functions.php:2914 modules/popup-dialog.php:175
-#: modules/pref-filters.php:388 mobile/functions.php:741
+#: functions.php:2883 modules/popup-dialog.php:175
+#: modules/pref-filters.php:405 mobile/functions.php:735
msgid "All feeds"
msgstr "所有feed"
-#: functions.php:2943 functions.php:2982 functions.php:3351 functions.php:4398
-#: functions.php:4428 modules/pref-feeds.php:1244
+#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1244
msgid "Uncategorized"
msgstr "未分类"
-#: functions.php:2972 functions.php:3540 mobile/functions.php:33
+#: functions.php:2941 functions.php:3508 mobile/functions.php:33
msgid "Special"
msgstr "专用"
-#: functions.php:2974 functions.php:3542 mobile/functions.php:75
+#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
msgid "Labels"
msgstr "标记"
-#: functions.php:3337 functions.php:3339
+#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
+#: mobile/functions.php:52
+msgid "Starred articles"
+msgstr "星级文章"
+
+#: functions.php:2963 functions.php:3344 functions.php:4212
+#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+msgid "Published articles"
+msgstr "已发布文章"
+
+#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
+#: mobile/functions.php:43
+#, fuzzy
+msgid "Fresh articles"
+msgstr "星级文章"
+
+#: functions.php:3305 functions.php:3307
msgid "Search results"
msgstr "搜索结果"
-#: functions.php:3355 functions.php:3368 functions.php:3374 functions.php:3377
-#: functions.php:3380 functions.php:3388
+#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
+#: functions.php:3348 functions.php:3356
msgid "Searched for"
msgstr "搜索"
-#: functions.php:4014 functions.php:4064 functions.php:5416
+#: functions.php:3989 functions.php:4045 functions.php:5368
#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:341 modules/pref-labels.php:275
-#: modules/pref-users.php:408
+#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
+#: modules/pref-labels.php:136 modules/pref-users.php:408
msgid "Select:"
msgstr "选择："
-#: functions.php:4015 functions.php:4065 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:342
-#: modules/pref-labels.php:276 modules/pref-users.php:409
-#: mobile/functions.php:567
+#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
+#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
+#: modules/pref-users.php:409 mobile/functions.php:561
msgid "All"
msgstr "所有"
-#: functions.php:4016 functions.php:4022 functions.php:4066 functions.php:4069
-#: tt-rss.php:196 mobile/functions.php:455 mobile/functions.php:568
+#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
+#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
msgid "Unread"
msgstr "未读"
-#: functions.php:4017 mobile/functions.php:570
+#: functions.php:3992 mobile/functions.php:564
#, fuzzy
msgid "Invert"
msgstr "(逆)"
-#: functions.php:4018 functions.php:4067 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:343
-#: modules/pref-labels.php:277 modules/pref-users.php:410
-#: mobile/functions.php:569
+#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
+#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
+#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
+#: modules/pref-users.php:410 mobile/functions.php:563
msgid "None"
msgstr "无"
-#: functions.php:4020 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
msgid "Actions..."
msgstr "激活..."
-#: functions.php:4021
+#: functions.php:3996
#, fuzzy
msgid "Selection toggle:"
msgstr "选择："
-#: functions.php:4023 functions.php:4070 tt-rss.php:195
-#: mobile/functions.php:456
+#: functions.php:3998 functions.php:4051 tt-rss.php:195
+#: mobile/functions.php:450
msgid "Starred"
msgstr "星级"
-#: functions.php:4024
+#: functions.php:3999
msgid "Published"
msgstr "已发布"
-#: functions.php:4026 functions.php:4072
+#: functions.php:4001 functions.php:4053
msgid "Mark as read:"
msgstr "标记为已读："
-#: functions.php:4027 mobile/functions.php:575
+#: functions.php:4002 mobile/functions.php:569
msgid "Selection"
msgstr "选择："
-#: functions.php:4041 mobile/functions.php:577
+#: functions.php:4016 mobile/functions.php:571
msgid "Entire feed"
msgstr "输入feed"
-#: functions.php:4044 tt-rss.php:162
-msgid "Other actions:"
-msgstr "其他操作:"
+#: functions.php:4019
+#, fuzzy
+msgid "Assign label:"
+msgstr "指定标签"
-#: functions.php:4051 functions.php:4053
+#: functions.php:4031
#, fuzzy
-msgid "Search to label"
-msgstr "转换标签"
+msgid "(remove)"
+msgstr "移除"
-#: functions.php:4069
+#: functions.php:4050
msgid "Toggle:"
msgstr "触发:"
-#: functions.php:4073 mobile/functions.php:576
+#: functions.php:4054 mobile/functions.php:570
msgid "Page"
msgstr "页"
-#: functions.php:4074 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:378
+#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:395
msgid "Feed"
msgstr "Feed"
-#: functions.php:4081
-msgid "Convert to label"
-msgstr "转换标签"
-
-#: functions.php:4128
+#: functions.php:4096
msgid "Generated feed"
msgstr "产生feed"
-#: functions.php:4172
+#: functions.php:4145
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4210
-msgid "Dashboard"
-msgstr ""
-
-#: functions.php:4448
+#: functions.php:4398
msgid "No feeds to display."
msgstr "无feed显示。"
-#: functions.php:4465 mobile/functions.php:12
+#: functions.php:4415 mobile/functions.php:12
msgid "Tags"
msgstr "标签"
-#: functions.php:4705
+#: functions.php:4657
#, fuzzy
msgid " - "
msgstr ", 由 - "
-#: functions.php:4764 functions.php:4765
+#: functions.php:4716 functions.php:4717
msgid "no tags"
msgstr "无标签"
-#: functions.php:4772
+#: functions.php:4724
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4780
+#: functions.php:4732
#, fuzzy
msgid "Display original article content"
msgstr "显示最近文章时间"
-#: functions.php:4787 functions.php:5426
+#: functions.php:4739 functions.php:5378
#, fuzzy
msgid "Show article summary in new window"
msgstr "新窗口打开文章连结"
-#: functions.php:4823 functions.php:5350
+#: functions.php:4775 functions.php:5302
#, fuzzy
msgid "unknown type"
msgstr "未知错误"
-#: functions.php:4829 functions.php:5356
+#: functions.php:4781 functions.php:5308
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4865 functions.php:5390
+#: functions.php:4817 functions.php:5342
msgid "Attachment:"
msgstr ""
-#: functions.php:4867 functions.php:5392
+#: functions.php:4819 functions.php:5344
msgid "Attachments:"
msgstr ""
-#: functions.php:4887 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
msgid "Close this window"
msgstr "关闭此窗口"
-#: functions.php:4943 modules/pref-feed-browser.php:75
+#: functions.php:4895 modules/pref-feed-browser.php:75
msgid "Feed not found."
msgstr "未找到Feed."
-#: functions.php:5012 mobile/functions.php:420
+#: functions.php:4964 mobile/functions.php:414
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
-#: functions.php:5125
+#: functions.php:5077
msgid "(Click to change)"
msgstr ""
-#: functions.php:5324
+#: functions.php:5276
#, fuzzy
msgid "Click to expand article"
msgstr "星级文章"
-#: functions.php:5488
+#: functions.php:5440
#, fuzzy
msgid "No unread articles found to display."
msgstr "未找到文章。"
-#: functions.php:5491
+#: functions.php:5443
#, fuzzy
msgid "No starred articles found to display."
msgstr "未找到文章。"
-#: functions.php:5494
+#: functions.php:5446
#, fuzzy
msgid "No articles found to display."
msgstr "未找到文章。"
-#: functions.php:5862
+#: functions.php:5793
#, fuzzy
msgid "Match "
msgstr "匹配"
-#: functions.php:5870
+#: functions.php:5801
#, fuzzy
msgid "Unread articles"
msgstr "星级文章"
-#: functions.php:5871
+#: functions.php:5802
#, fuzzy
msgid "Updated articles"
msgstr "星级文章"
-#: functions.php:5872
+#: functions.php:5803
#, fuzzy
msgid "Title contains"
msgstr "标题或内容"
-#: functions.php:5873
+#: functions.php:5804
#, fuzzy
msgid "Content contains"
msgstr "内容过滤器"
-#: functions.php:5874
+#: functions.php:5805
msgid "Score equals"
msgstr ""
-#: functions.php:5875
+#: functions.php:5806
msgid "Score is greater than"
msgstr ""
-#: functions.php:5876
+#: functions.php:5807
msgid "Score is less than"
msgstr ""
-#: functions.php:5877
+#: functions.php:5808
msgid "Articles newer than X hours"
msgstr ""
-#: functions.php:5878
+#: functions.php:5809
msgid "Articles newer than X days"
msgstr ""
-#: functions.php:5887
+#: functions.php:5818
msgid "Add"
msgstr ""
@@ -448,7 +441,7 @@ msgstr "显示Feed"
msgid "display tags"
msgstr "显示标签"
-#: localized_js.php:37 prefs.php:69 prefs.php:155 tt-rss.php:71
+#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
msgid "Loading, please wait..."
msgstr "读取中，请等待..."
@@ -836,7 +829,7 @@ msgstr "保存feed中..."
#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:772
+#: mobile/functions.php:766
msgid "Title"
msgstr "标题"
@@ -849,7 +842,7 @@ msgid "Link"
msgstr "链接"
#: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:773
+#: mobile/functions.php:767
msgid "Content"
msgstr "内容"
@@ -861,7 +854,7 @@ msgstr ""
msgid "Filter article"
msgstr "过滤文章"
-#: localized_schema.php:16 mobile/functions.php:580
+#: localized_schema.php:16 mobile/functions.php:574
msgid "Mark as read"
msgstr "标记为已读"
@@ -1202,7 +1195,7 @@ msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
msgid "Return to preferences"
msgstr "返回 我的最爱"
-#: prefs.php:77 prefs.php:158 tt-rss.php:79
+#: prefs.php:77 prefs.php:156 tt-rss.php:79
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1246,17 +1239,15 @@ msgstr "其他feed"
msgid "Published Articles"
msgstr "已发布文章"
-#: prefs.php:142 help/4.php:11
-msgid "Content Filtering"
-msgstr "内容过滤器"
-
-#: prefs.php:145 help/4.php:12
-msgid "Label Editor"
-msgstr "标记编辑"
+#: prefs.php:142
+#, fuzzy
+msgid "Filters"
+msgstr "标题:"
-#: prefs.php:149 help/4.php:13
-msgid "User Manager"
-msgstr "用户管理"
+#: prefs.php:147
+#, fuzzy
+msgid "Users"
+msgstr "用户"
#: sanity_check.php:8
msgid ""
@@ -1355,9 +1346,10 @@ msgstr "标签簇"
#: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:282 modules/pref-labels.php:239
-#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:432
-#: mobile/functions.php:726 mobile/functions.php:780
+#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
+#: modules/pref-labels.php:103 modules/pref-users.php:364
+#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
+#: mobile/functions.php:774
msgid "Search"
msgstr "搜索"
@@ -1399,6 +1391,10 @@ msgstr "&nbsp;&nbsp;标记未已读"
msgid "&nbsp;&nbsp;(Un)hide read feeds"
msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
+#: tt-rss.php:162
+msgid "Other actions:"
+msgstr "其他操作:"
+
#: tt-rss.php:163
msgid "&nbsp;&nbsp;Create filter"
msgstr "&nbsp;&nbsp;创建过滤器"
@@ -1427,15 +1423,15 @@ msgstr "隐藏我的Feed列表"
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:185 mobile/functions.php:735
+#: tt-rss.php:185 mobile/functions.php:729
msgid "Search:"
msgstr "搜索:"
-#: tt-rss.php:193 mobile/functions.php:453
+#: tt-rss.php:193 mobile/functions.php:447
msgid "Adaptive"
msgstr "自适应"
-#: tt-rss.php:194 mobile/functions.php:454
+#: tt-rss.php:194 mobile/functions.php:448
msgid "All Articles"
msgstr "所有文章"
@@ -1449,7 +1445,7 @@ msgid "Order:"
msgstr "地点:"
#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:418
+#: modules/pref-filters.php:435
#, fuzzy
msgid "Date"
msgstr "更新"
@@ -1463,7 +1459,7 @@ msgid "Limit:"
msgstr "限制:"
#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:433
+#: mobile/functions.php:427
msgid "Update"
msgstr "更新"
@@ -1630,10 +1626,10 @@ msgid "Subscribe"
msgstr "订阅"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:279 modules/popup-dialog.php:446
-#: modules/popup-dialog.php:541 modules/pref-feeds.php:130
-#: modules/pref-feeds.php:395 modules/pref-feeds.php:546
-#: modules/pref-filters.php:157 modules/pref-users.php:184
+#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/pref-feeds.php:130 modules/pref-feeds.php:395
+#: modules/pref-feeds.php:546 modules/pref-filters.php:166
+#: modules/pref-users.php:184
msgid "Cancel"
msgstr "取消"
@@ -1642,7 +1638,7 @@ msgstr "取消"
msgid "match on:"
msgstr "匹配:"
-#: modules/popup-dialog.php:167 mobile/functions.php:774
+#: modules/popup-dialog.php:167 mobile/functions.php:768
msgid "Title or content"
msgstr "标题或内容"
@@ -1650,38 +1646,10 @@ msgstr "标题或内容"
msgid "Limit search to:"
msgstr ""
-#: modules/popup-dialog.php:188 mobile/functions.php:754
+#: modules/popup-dialog.php:188 mobile/functions.php:748
msgid "This feed"
msgstr "本feed"
-#: modules/popup-dialog.php:223
-#, fuzzy
-msgid "Create Label"
-msgstr "创建标记"
-
-#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:282
-msgid "Caption"
-msgstr "标题"
-
-#: modules/popup-dialog.php:241 modules/pref-labels.php:46
-#, fuzzy
-msgid "Match SQL"
-msgstr "匹配"
-
-#: modules/popup-dialog.php:265 modules/pref-labels.php:68
-#, fuzzy
-msgid "Help"
-msgstr "你好,"
-
-#: modules/popup-dialog.php:268
-msgid "Test"
-msgstr "测试"
-
-#: modules/popup-dialog.php:275 modules/popup-dialog.php:442
-msgid "Create"
-msgstr "创建"
-
#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
@@ -1693,17 +1661,17 @@ msgid "description"
msgstr "描述"
#: modules/popup-dialog.php:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:377
+#: modules/pref-filters.php:394
msgid "Match"
msgstr "匹配"
#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:425
msgid "before"
msgstr ""
#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:409
+#: modules/pref-filters.php:426
#, fuzzy
msgid "after"
msgstr "更新"
@@ -1732,20 +1700,24 @@ msgid "with parameters:"
msgstr ""
#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
-#: modules/pref-feeds.php:500 modules/pref-filters.php:114
+#: modules/pref-feeds.php:500 modules/pref-filters.php:123
#: modules/pref-users.php:165
#, fuzzy
msgid "Options"
msgstr "选项:"
-#: modules/popup-dialog.php:427 modules/pref-filters.php:126
+#: modules/popup-dialog.php:427 modules/pref-filters.php:135
msgid "Enabled"
msgstr "可用"
-#: modules/popup-dialog.php:430 modules/pref-filters.php:135
+#: modules/popup-dialog.php:430 modules/pref-filters.php:144
msgid "Inverse match"
msgstr "逆匹配"
+#: modules/popup-dialog.php:442
+msgid "Create"
+msgstr "创建"
+
#: modules/popup-dialog.php:457
msgid "Update Errors"
msgstr "更新错误"
@@ -1767,7 +1739,7 @@ msgid "Tags for this article (separated by commas):"
msgstr "本文的标签，请用逗号分开:"
#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
-#: modules/pref-feeds.php:544 modules/pref-filters.php:153
+#: modules/pref-feeds.php:544 modules/pref-filters.php:162
#: modules/pref-users.php:181
msgid "Save"
msgstr "保存"
@@ -1938,9 +1910,9 @@ msgstr "创建分类"
msgid "No feed categories defined."
msgstr "未定义feed分类"
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:147
-#: modules/pref-filters.php:462 modules/pref-labels.php:330
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
+#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
+#: modules/pref-labels.php:176 modules/pref-users.php:481
msgid "Remove"
msgstr "移除"
@@ -1965,12 +1937,12 @@ msgid "Last&nbsp;Article"
msgstr "最后&nbsp;文章"
#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:498 mobile/functions.php:501
+#: mobile/functions.php:492 mobile/functions.php:495
msgid "Updated"
msgstr "已更新"
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:436
-#: modules/pref-labels.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
+#: modules/pref-labels-old.php:310 modules/pref-users.php:456
msgid "Click to edit"
msgstr ""
@@ -1983,8 +1955,8 @@ msgstr "选择："
msgid "Recategorize"
msgstr "再分类"
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:460
-#: modules/pref-labels.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
+#: modules/pref-labels-old.php:328 modules/pref-users.php:479
msgid "Edit"
msgstr "编辑"
@@ -1997,7 +1969,7 @@ msgstr ""
msgid "Clear feed data"
msgstr "所有Feed已更新。"
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:299
+#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
#, fuzzy
msgid "Rescore articles"
msgstr "星级文章"
@@ -2064,95 +2036,110 @@ msgstr "生成另一个地址"
msgid "Filter Editor"
msgstr "过滤器编辑"
-#: modules/pref-filters.php:197
+#: modules/pref-filters.php:214
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "保存过滤器<b>%s</b>"
-#: modules/pref-filters.php:239
+#: modules/pref-filters.php:256
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "创建过滤器 <b>%s</b>"
-#: modules/pref-filters.php:292 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
msgid "Create filter"
msgstr "创建过滤器"
-#: modules/pref-filters.php:367
+#: modules/pref-filters.php:384
msgid "filter_type_descr"
msgstr ""
-#: modules/pref-filters.php:368
+#: modules/pref-filters.php:385
#, fuzzy
msgid "action_description"
msgstr "描述"
-#: modules/pref-filters.php:379
+#: modules/pref-filters.php:396
#, fuzzy
msgid "Field"
msgstr "Feed"
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:397
#, fuzzy
msgid "Params"
msgstr "参数:"
-#: modules/pref-filters.php:425
+#: modules/pref-filters.php:442
msgid "(Disabled)"
msgstr "(不可用)"
-#: modules/pref-filters.php:441
+#: modules/pref-filters.php:458
msgid "(Inverse)"
msgstr "(逆)"
-#: modules/pref-filters.php:470
+#: modules/pref-filters.php:487
msgid "No filters defined."
msgstr "未定义过滤器。"
-#: modules/pref-filters.php:472
+#: modules/pref-filters.php:489
#, fuzzy
msgid "No matching filters found."
msgstr "未找到文章。"
-#: modules/pref-labels.php:9
+#: modules/pref-labels-old.php:9
msgid ""
"Sorry, labels have been administratively disabled for this installation. "
"Please contact instance owner or edit configuration file to enable this "
"functionality."
msgstr ""
-#: modules/pref-labels.php:99
+#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
+#: modules/pref-labels.php:143
+msgid "Caption"
+msgstr "标题"
+
+#: modules/pref-labels-old.php:46
+#, fuzzy
+msgid "Match SQL"
+msgstr "匹配"
+
+#: modules/pref-labels-old.php:68
+#, fuzzy
+msgid "Help"
+msgstr "你好,"
+
+#: modules/pref-labels-old.php:99
msgid "Error: SQL expression is blank."
msgstr ""
-#: modules/pref-labels.php:179
+#: modules/pref-labels-old.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "已保存标记<b>%s</b>"
-#: modules/pref-labels.php:211
+#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
#, php-format
msgid "Created label <b>%s</b>"
msgstr "创建标记 <b>%s</b>"
-#: modules/pref-labels.php:249 help/4.php:26
+#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
msgid "Create label"
msgstr "创建标记"
-#: modules/pref-labels.php:283
+#: modules/pref-labels-old.php:283
msgid "SQL Expression"
msgstr "SQL 表达式"
-#: modules/pref-labels.php:308
+#: modules/pref-labels-old.php:308
#, fuzzy
msgid "[No caption]"
msgstr "标题"
-#: modules/pref-labels.php:335
+#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
msgid "No labels defined."
msgstr "未定义标记."
-#: modules/pref-labels.php:337
+#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
#, fuzzy
msgid "No matching labels found."
msgstr "未找到文章。"
@@ -2584,6 +2571,18 @@ msgstr ""
msgid "Press any key to close this window."
msgstr "关闭此窗口"
+#: help/4.php:11
+msgid "Content Filtering"
+msgstr "内容过滤器"
+
+#: help/4.php:12
+msgid "Label Editor"
+msgstr "标记编辑"
+
+#: help/4.php:13
+msgid "User Manager"
+msgstr "用户管理"
+
#: help/4.php:19
#, fuzzy
msgid "Panel actions"
@@ -2618,32 +2617,32 @@ msgstr "Feed"
msgid "View tags"
msgstr "编辑标签"
-#: mobile/functions.php:431
+#: mobile/functions.php:425
msgid "Back"
msgstr ""
-#: mobile/functions.php:441
+#: mobile/functions.php:435
msgid "View:"
msgstr "浏览:"
-#: mobile/functions.php:463
+#: mobile/functions.php:457
msgid "Refresh"
msgstr ""
-#: mobile/functions.php:695
+#: mobile/functions.php:689
#, fuzzy
msgid "Tags:"
msgstr "标签"
-#: mobile/functions.php:727
+#: mobile/functions.php:721
msgid "Go back"
msgstr ""
-#: mobile/functions.php:738
+#: mobile/functions.php:732
msgid "Where:"
msgstr "地点:"
-#: mobile/functions.php:769
+#: mobile/functions.php:763
#, fuzzy
msgid "Match on:"
msgstr "匹配:"
@@ -2653,6 +2652,20 @@ msgid "Internal error: Function not implemented"
msgstr ""
#, fuzzy
+#~ msgid "Search to label"
+#~ msgstr "转换标签"
+
+#~ msgid "Convert to label"
+#~ msgstr "转换标签"
+
+#, fuzzy
+#~ msgid "Create Label"
+#~ msgstr "创建标记"
+
+#~ msgid "Test"
+#~ msgstr "测试"
+
+#, fuzzy
#~ msgid "Perform action"
#~ msgstr "完成更新"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 10:36:30 +0000