summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2009-02-09 23:02:20 +0300
committerAndrew Dolgov <[email protected]>2009-02-09 23:02:20 +0300
commit390e733ac2bd1292658e3c96d50ba86d64ff806f (patch)
tree13b83b1e0db843be510d78487226f5ed9711bba8 /locale
parent5bce01af9a43a6492e0f6981edf39794f4133ecc (diff)
update translations
Diffstat (limited to 'locale')
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin32860 -> 28591 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po438
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.mobin10237 -> 10194 bytes
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.po278
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.mobin44377 -> 40607 bytes
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.po427
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.mobin36735 -> 34207 bytes
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.po360
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.mobin42153 -> 38478 bytes
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.po418
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.mobin12068 -> 11142 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.po303
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin60056 -> 55388 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po414
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin23339 -> 21271 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po349
16 files changed, 1417 insertions, 1570 deletions
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index d95ee7dd0..436ba1cbe 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 7e6ac0994..399b40868 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-26 09:05+0300\n"
+"POT-Creation-Date: 2009-02-09 23:01+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,179 +172,179 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2808 modules/popup-dialog.php:175
+#: functions.php:2828 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Tous les flux"
-#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
-#: functions.php:4248 modules/pref-feeds.php:1247
+#: functions.php:2857 functions.php:2896 functions.php:3285 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Sans catégorie"
-#: functions.php:2866 functions.php:3459 mobile/functions.php:33
+#: functions.php:2886 functions.php:3479 mobile/functions.php:33
msgid "Special"
msgstr "Spécial"
-#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: functions.php:2888 functions.php:3314 functions.php:3481 prefs.php:129
#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Intitulé"
-#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
+#: functions.php:2906 functions.php:3307 functions.php:4092 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Articles remarquables"
-#: functions.php:2888 functions.php:3291 functions.php:4079
+#: functions.php:2908 functions.php:3311 functions.php:4099
#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Articles publiés"
-#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
+#: functions.php:2910 functions.php:3317 functions.php:4077 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Nouveaux articles"
-#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
+#: functions.php:2912 functions.php:3320 functions.php:4070 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Tous les articles"
-#: functions.php:3251 functions.php:3253
+#: functions.php:3271 functions.php:3273
msgid "Search results"
msgstr "Résultats de recherche"
-#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
-#: functions.php:3298 functions.php:3301 functions.php:3309
+#: functions.php:3289 functions.php:3302 functions.php:3308 functions.php:3312
+#: functions.php:3318 functions.php:3321 functions.php:3329
msgid "Searched for"
msgstr "Recherché"
-#: functions.php:3929
+#: functions.php:3949
msgid "Generated feed"
msgstr "Flux généré"
-#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: functions.php:3954 functions.php:5218 modules/pref-feeds.php:1028
#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:129 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401
msgid "Select:"
msgstr "Sélectionner&nbsp;:"
-#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
-#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: functions.php:3955 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:164
#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Tout"
-#: functions.php:3936 functions.php:3952 tt-rss.php:205
+#: functions.php:3956 functions.php:3972 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Non lus"
-#: functions.php:3937 mobile/functions.php:573
+#: functions.php:3957 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(Inverse)"
-#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
-#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: functions.php:3958 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:165
#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Aucun"
-#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
+#: functions.php:3966 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Actions..."
-#: functions.php:3951
+#: functions.php:3971
#, fuzzy
msgid "Selection toggle:"
msgstr "Sélection&nbsp;:"
-#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
+#: functions.php:3973 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Remarquables"
-#: functions.php:3954
+#: functions.php:3974
msgid "Published"
msgstr "Publiés"
-#: functions.php:3956
+#: functions.php:3976
msgid "Mark as read:"
msgstr "Marquer comme lu&nbsp;:"
-#: functions.php:3957 mobile/functions.php:578
+#: functions.php:3977 mobile/functions.php:578
msgid "Selection"
msgstr "La sélection"
-#: functions.php:3959 mobile/functions.php:580
+#: functions.php:3979 mobile/functions.php:580
msgid "Entire feed"
msgstr "Tout le flux"
-#: functions.php:3963
+#: functions.php:3983
#, fuzzy
msgid "Assign label:"
msgstr "Attribuer des étiquettes"
-#: functions.php:4004
+#: functions.php:4024
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4268
+#: functions.php:4290
msgid "No feeds to display."
msgstr "Aucun flux à afficher."
-#: functions.php:4285 mobile/functions.php:12
+#: functions.php:4307 mobile/functions.php:12
msgid "Tags"
msgstr "Étiquettes"
-#: functions.php:4521
+#: functions.php:4543
#, fuzzy
msgid " - "
msgstr "- par "
-#: functions.php:4545 functions.php:5220
+#: functions.php:4567 functions.php:5237
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4553
+#: functions.php:4575
#, fuzzy
msgid "Display original article content"
msgstr "Afficher l'heure du dernier article"
-#: functions.php:4560 functions.php:5211
+#: functions.php:4582 functions.php:5228
#, fuzzy
msgid "Show article summary in new window"
msgstr "Ouvrir les liens des articles dans une nouvelle fenêtre"
-#: functions.php:4593 functions.php:5135
+#: functions.php:4615 functions.php:5152
#, fuzzy
msgid "unknown type"
msgstr "Erreur inconnue"
-#: functions.php:4599 functions.php:5141
+#: functions.php:4621 functions.php:5158
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4635 functions.php:5175
+#: functions.php:4657 functions.php:5192
msgid "Attachment:"
msgstr ""
-#: functions.php:4637 functions.php:5177
+#: functions.php:4659 functions.php:5194
msgid "Attachments:"
msgstr ""
-#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4679 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Fermer cette fenêtre"
-#: functions.php:4713
+#: functions.php:4735
msgid "Feed not found."
msgstr "Flux non trouvé."
-#: functions.php:4782 mobile/functions.php:423
+#: functions.php:4804 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -352,48 +352,48 @@ 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:5109
+#: functions.php:5126
#, fuzzy
msgid "Click to expand article"
msgstr "Articles mémorisés"
-#: functions.php:5246
+#: functions.php:5263
#, fuzzy
msgid "No unread articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5249
+#: functions.php:5266
#, fuzzy
msgid "No updated articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5252
+#: functions.php:5269
#, fuzzy
msgid "No starred articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5256
+#: functions.php:5273
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5258
+#: functions.php:5275
#, fuzzy
msgid "No articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5931 tt-rss.php:171
+#: functions.php:5949 tt-rss.php:171
#, fuzzy
msgid "Create label..."
msgstr "Créer un intitulé"
-#: functions.php:5944
+#: functions.php:5962
#, fuzzy
msgid "(remove)"
msgstr "Supprimer"
-#: functions.php:5988
+#: functions.php:6006
msgid "no tags"
msgstr "aucune étiquette"
@@ -1116,56 +1116,6 @@ msgstr ""
msgid "Limit bandwidth usage"
msgstr ""
-#: mysql_convert_unicode.php:20 update.php:19
-msgid "Your access level is insufficient to run this script."
-msgstr "Vous n'avez pas les permissions nécessaires pour exécuter ce script."
-
-#: mysql_convert_unicode.php:46
-msgid "MySQL Charset Updater"
-msgstr "Outil de mise à jour du jeu de caractères MySQL"
-
-#: mysql_convert_unicode.php:53
-msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
-msgstr ""
-"Ce script n'est utilisable que pour une installation de Tiny Tiny RSS avec "
-"un moteur MySQL."
-
-#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
-#: register.php:200 register.php:213 register.php:228 register.php:246
-#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162 modules/pref-feeds.php:865
-msgid "Return to Tiny Tiny RSS"
-msgstr "Revenir à Tiny Tiny RSS"
-
-#: mysql_convert_unicode.php:61 update.php:102
-msgid "Please backup your database before proceeding."
-msgstr ""
-"Veuillez faire une copie de sauvegarde de votre base de données avant de "
-"poursuivre."
-
-#: mysql_convert_unicode.php:63
-msgid ""
-"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-"\t\t\tDepending on current database charset you may experience data "
-"corruption (lost accent characters, etc.). \n"
-"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
-"php to 'utf8'."
-msgstr ""
-"Ce script va modifier votre base de données Tiny Tiny RSS pour qu'elle "
-"utilise le jeu de caractères UTF-8. \n"
-"\t\t\tSelon le jeu de caractères actuellement utilisé, cela peut entraîner "
-"une corruption des données (caractères accentués perdus, etc). \n"
-"\t\t\tAprès la mise à jour, vous devrez donner à l'option <b>MYSQL_CHARSET</"
-"b> la valeur 'utf8' dans le fichier config.php."
-
-#: mysql_convert_unicode.php:69 update.php:118
-msgid "Perform updates"
-msgstr "Exécuter les mises à jour"
-
-#: mysql_convert_unicode.php:74
-msgid "Converting database..."
-msgstr "Conversion de la base de données..."
-
#: opml.php:99 opml.php:103
msgid "OPML Utility"
msgstr "Outil OPML"
@@ -1238,6 +1188,12 @@ msgstr "Utilisateur"
msgid "New user registrations are administratively disabled."
msgstr "Le navigateur de flux a été désactivé par l'administrateur."
+#: register.php:155 register.php:200 register.php:213 register.php:228
+#: register.php:246 register.php:331 register.php:341 register.php:353
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
+msgid "Return to Tiny Tiny RSS"
+msgstr "Revenir à Tiny Tiny RSS"
+
#: register.php:176
msgid ""
"Your temporary password will be sent to the specified email. Accounts, which "
@@ -1287,111 +1243,6 @@ msgstr ""
msgid "New user registrations are currently closed."
msgstr ""
-#: sanity_check.php:8
-msgid ""
-"<b>Fatal Error</b>: You forgot to copy \n"
-"\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
-msgstr ""
-"<b>Erreur critique</b>&nbsp;: vous avez oublié de copier \n"
-"\t\t<b>config.php-dist</b> sous le nom <b>config.php</b> et de le modifier.\n"
-
-#: sanity_check.php:16
-msgid "config: your config file version is incorrect. See config.php-dist.\n"
-msgstr ""
-"config&nbsp;: la version de votre fichier de configuration n'est pas "
-"valable. Reportez-vous au fichier config.php-dist.\n"
-
-#: sanity_check.php:20
-msgid ""
-"<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
-"\t\t\toption from config.php\n"
-msgstr ""
-"<b>Erreur critique</b>&nbsp;: RSS_BACKEND_TYPE est obsolète.\n"
-"\t\tVeuillez supprimer cette option du fichier config.php\n"
-
-#: sanity_check.php:26
-msgid ""
-"<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
-"\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
-"them \n"
-"\t\tfrom your TT-RSS instance.\n"
-msgstr ""
-"<b>Erreur critique</b>&nbsp;: les outils XML Import/Export (<b>xml-export."
-"php</b>\n"
-"\t\tet <b>xml-import.php</b>) peuvent être exploités de manière dangereuse.\n"
-"\t\tVeuillez les supprimer de votre installation de Tiny Tiny RSS.\n"
-
-#: sanity_check.php:33
-msgid ""
-"<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tto 0 in single user mode.\n"
-msgstr ""
-"<b>Erreur critique</b>&nbsp;: veuillez mettre la valeur de "
-"DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tà zéro en mode mono-utilisateur.\n"
-
-#: sanity_check.php:39
-msgid ""
-"<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
-"\t\t\tdoesn't seem to support CURL functions."
-msgstr ""
-"<b>Erreur critique</b>&nbsp;: vous avez activé USE_CURL_FOR_ICONS, mais "
-"votre \n"
-"\t\t\tvotre installation de PHP ne semble pas gérer les fonctions CURL."
-
-#: sanity_check.php:45
-msgid "config: SESSION_EXPIRE_TIME is undefined"
-msgstr "config&nbsp;: SESSION_EXPIRE_TIME n'est pas définie"
-
-#: sanity_check.php:49
-msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
-msgstr ""
-"config&nbsp;: SESSION_EXPIRE_TIME a une valeur trop basse (inférieure à 60)"
-
-#: sanity_check.php:53
-msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
-msgstr ""
-"config&nbsp;: la valeur de SESSION_EXPIRE_TIME devrait être supérieure ou "
-"égale à"
-
-#: sanity_check.php:62
-msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
-msgstr ""
-"config&nbsp;: DATABASE-BACKED_SESSIONS est incompatible avec SINGLE_USER_MODE"
-
-#: sanity_check.php:66
-msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
-msgstr ""
-"config&nbsp;: DATABASE_BACKED_SESSIONS ne fonctionne pas avec MySQL pour le "
-"moment"
-
-#: sanity_check.php:70
-msgid ""
-"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
-"DIGEST_FROM_ADDRESS"
-msgstr ""
-"config: MAIL_FROM a été coupée en deux options DIGEST_FROM_NAME et "
-"DIGEST_FROM_ADDRESS"
-
-#: sanity_check.php:74
-msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
-msgstr ""
-"config: l'option COUNTERS_MAX_AGE est attendue mais n'a pas été définie"
-
-#: sanity_check.php:78
-msgid ""
-"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
-"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
-"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-msgstr ""
-"config: l'option DAEMON_REFRESH_ONLY est obsolète. Veuillez la supprimer et "
-"vous renseigner sur d'autres moyens de mettre à jour vos flux sur le <a "
-"href='http://tt-rss.spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-
-#: sanity_check.php:83
-msgid "Fatal Error"
-msgstr "Erreur critique"
-
#: tt-rss.php:122
#, fuzzy
msgid "Comments?"
@@ -1534,6 +1385,10 @@ msgstr "Mettre à jour"
msgid "Drag me to resize panels"
msgstr ""
+#: update.php:19
+msgid "Your access level is insufficient to run this script."
+msgstr "Vous n'avez pas les permissions nécessaires pour exécuter ce script."
+
#: update.php:44
msgid "Database Updater"
msgstr "Outil de mise à jour de la base de données"
@@ -1555,6 +1410,12 @@ msgstr ", trouvée&nbsp;: "
msgid "Tiny Tiny RSS database is up to date."
msgstr "La base de données de Tiny Tiny RSS est à jour."
+#: update.php:102
+msgid "Please backup your database before proceeding."
+msgstr ""
+"Veuillez faire une copie de sauvegarde de votre base de données avant de "
+"poursuivre."
+
#: update.php:104
#, php-format
msgid ""
@@ -1564,6 +1425,10 @@ msgstr ""
"La base de données de Tiny Tiny RSS a besoin d'être mise à jour (version <b>%"
"d</b> à <b>%d</b>)."
+#: update.php:118
+msgid "Perform updates"
+msgstr "Exécuter les mises à jour"
+
#: update.php:123
msgid "Performing updates..."
msgstr "Exécution des mises à jour..."
@@ -1723,7 +1588,7 @@ msgstr "Annuler"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
-#: modules/pref-labels.php:96 modules/pref-users.php:363
+#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1964,7 +1829,7 @@ msgid "No feed categories defined."
msgstr "Aucune catégorie de flux définie."
#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-filters.php:487 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Supprimer"
@@ -2150,24 +2015,46 @@ msgstr "Aucun filtre défini."
msgid "No matching filters found."
msgstr "Aucun article trouvé."
-#: modules/pref-labels.php:66
+#: modules/pref-labels.php:100
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Intitulé <b>%s</b> créé"
-#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:138 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Créer un intitulé"
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:203
+#, fuzzy
+msgid "Click to change color"
+msgstr "Articles mémorisés"
+
+#: modules/pref-labels.php:233
+#, fuzzy
+msgid "Clear colors"
+msgstr "Filtrer l'article"
+
+#: modules/pref-labels.php:240
msgid "No labels defined."
msgstr "Aucun intitulé défini."
-#: modules/pref-labels.php:177
+#: modules/pref-labels.php:242
#, fuzzy
msgid "No matching labels found."
msgstr "Aucun article trouvé."
+#: modules/pref-labels.php:300
+msgid "custom color:"
+msgstr ""
+
+#: modules/pref-labels.php:301
+msgid "foreground"
+msgstr ""
+
+#: modules/pref-labels.php:302
+msgid "background"
+msgstr ""
+
#: modules/pref-prefs.php:65
msgid "Password has been changed."
msgstr "Le mot de passe a été modifié."
@@ -2633,6 +2520,129 @@ msgstr "Correspondance sur&nbsp;:"
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid "MySQL Charset Updater"
+#~ msgstr "Outil de mise à jour du jeu de caractères MySQL"
+
+#~ msgid ""
+#~ "This script is for Tiny Tiny RSS installations with MySQL backend only."
+#~ msgstr ""
+#~ "Ce script n'est utilisable que pour une installation de Tiny Tiny RSS "
+#~ "avec un moteur MySQL."
+
+#~ msgid ""
+#~ "This script will convert your Tiny Tiny RSS database to UTF-8. \n"
+#~ "\t\t\tDepending on current database charset you may experience data "
+#~ "corruption (lost accent characters, etc.). \n"
+#~ "\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in "
+#~ "config.php to 'utf8'."
+#~ msgstr ""
+#~ "Ce script va modifier votre base de données Tiny Tiny RSS pour qu'elle "
+#~ "utilise le jeu de caractères UTF-8. \n"
+#~ "\t\t\tSelon le jeu de caractères actuellement utilisé, cela peut "
+#~ "entraîner une corruption des données (caractères accentués perdus, "
+#~ "etc). \n"
+#~ "\t\t\tAprès la mise à jour, vous devrez donner à l'option "
+#~ "<b>MYSQL_CHARSET</b> la valeur 'utf8' dans le fichier config.php."
+
+#~ msgid "Converting database..."
+#~ msgstr "Conversion de la base de données..."
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You forgot to copy \n"
+#~ "\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
+#~ msgstr ""
+#~ "<b>Erreur critique</b>&nbsp;: vous avez oublié de copier \n"
+#~ "\t\t<b>config.php-dist</b> sous le nom <b>config.php</b> et de le "
+#~ "modifier.\n"
+
+#~ msgid ""
+#~ "config: your config file version is incorrect. See config.php-dist.\n"
+#~ msgstr ""
+#~ "config&nbsp;: la version de votre fichier de configuration n'est pas "
+#~ "valable. Reportez-vous au fichier config.php-dist.\n"
+
+#~ msgid ""
+#~ "<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
+#~ "\t\t\toption from config.php\n"
+#~ msgstr ""
+#~ "<b>Erreur critique</b>&nbsp;: RSS_BACKEND_TYPE est obsolète.\n"
+#~ "\t\tVeuillez supprimer cette option du fichier config.php\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
+#~ "\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
+#~ "them \n"
+#~ "\t\tfrom your TT-RSS instance.\n"
+#~ msgstr ""
+#~ "<b>Erreur critique</b>&nbsp;: les outils XML Import/Export (<b>xml-export."
+#~ "php</b>\n"
+#~ "\t\tet <b>xml-import.php</b>) peuvent être exploités de manière "
+#~ "dangereuse.\n"
+#~ "\t\tVeuillez les supprimer de votre installation de Tiny Tiny RSS.\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\tto 0 in single user mode.\n"
+#~ msgstr ""
+#~ "<b>Erreur critique</b>&nbsp;: veuillez mettre la valeur de "
+#~ "DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\tà zéro en mode mono-utilisateur.\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
+#~ "\t\t\tdoesn't seem to support CURL functions."
+#~ msgstr ""
+#~ "<b>Erreur critique</b>&nbsp;: vous avez activé USE_CURL_FOR_ICONS, mais "
+#~ "votre \n"
+#~ "\t\t\tvotre installation de PHP ne semble pas gérer les fonctions CURL."
+
+#~ msgid "config: SESSION_EXPIRE_TIME is undefined"
+#~ msgstr "config&nbsp;: SESSION_EXPIRE_TIME n'est pas définie"
+
+#~ msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
+#~ msgstr ""
+#~ "config&nbsp;: SESSION_EXPIRE_TIME a une valeur trop basse (inférieure à "
+#~ "60)"
+
+#~ msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
+#~ msgstr ""
+#~ "config&nbsp;: la valeur de SESSION_EXPIRE_TIME devrait être supérieure ou "
+#~ "égale à"
+
+#~ msgid ""
+#~ "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
+#~ msgstr ""
+#~ "config&nbsp;: DATABASE-BACKED_SESSIONS est incompatible avec "
+#~ "SINGLE_USER_MODE"
+
+#~ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
+#~ msgstr ""
+#~ "config&nbsp;: DATABASE_BACKED_SESSIONS ne fonctionne pas avec MySQL pour "
+#~ "le moment"
+
+#~ msgid ""
+#~ "config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
+#~ "DIGEST_FROM_ADDRESS"
+#~ msgstr ""
+#~ "config: MAIL_FROM a été coupée en deux options DIGEST_FROM_NAME et "
+#~ "DIGEST_FROM_ADDRESS"
+
+#~ msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
+#~ msgstr ""
+#~ "config: l'option COUNTERS_MAX_AGE est attendue mais n'a pas été définie"
+
+#~ msgid ""
+#~ "config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
+#~ "and read about other ways to update feeds on the <a href='http://tt-rss."
+#~ "spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+#~ msgstr ""
+#~ "config: l'option DAEMON_REFRESH_ONLY est obsolète. Veuillez la supprimer "
+#~ "et vous renseigner sur d'autres moyens de mettre à jour vos flux sur le "
+#~ "<a href='http://tt-rss.spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+
+#~ msgid "Fatal Error"
+#~ msgstr "Erreur critique"
+
#~ msgid "Unknown Error"
#~ msgstr "Erreur inconnue"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 4bd9fb6aa..cd71b4d6d 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 189e0a4be..f26b5dd55 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-26 09:05+0300\n"
+"POT-Creation-Date: 2009-02-09 23:01+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,224 +164,224 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2808 modules/popup-dialog.php:175
+#: functions.php:2828 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Minden feed"
-#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
-#: functions.php:4248 modules/pref-feeds.php:1247
+#: functions.php:2857 functions.php:2896 functions.php:3285 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Kategorizálatlan"
-#: functions.php:2866 functions.php:3459 mobile/functions.php:33
+#: functions.php:2886 functions.php:3479 mobile/functions.php:33
msgid "Special"
msgstr "Speciális"
-#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: functions.php:2888 functions.php:3314 functions.php:3481 prefs.php:129
#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Címkék"
-#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
+#: functions.php:2906 functions.php:3307 functions.php:4092 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Csillagost hírek"
-#: functions.php:2888 functions.php:3291 functions.php:4079
+#: functions.php:2908 functions.php:3311 functions.php:4099
#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Publikált hírek"
-#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
+#: functions.php:2910 functions.php:3317 functions.php:4077 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Olvasatlan hírek"
-#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
+#: functions.php:2912 functions.php:3320 functions.php:4070 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Minden hír"
-#: functions.php:3251 functions.php:3253
+#: functions.php:3271 functions.php:3273
msgid "Search results"
msgstr "Keresési találatok"
-#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
-#: functions.php:3298 functions.php:3301 functions.php:3309
+#: functions.php:3289 functions.php:3302 functions.php:3308 functions.php:3312
+#: functions.php:3318 functions.php:3321 functions.php:3329
msgid "Searched for"
msgstr ""
-#: functions.php:3929
+#: functions.php:3949
msgid "Generated feed"
msgstr ""
-#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: functions.php:3954 functions.php:5218 modules/pref-feeds.php:1028
#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:129 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401
msgid "Select:"
msgstr "Kiválaszt:"
-#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
-#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: functions.php:3955 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:164
#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Mind"
-#: functions.php:3936 functions.php:3952 tt-rss.php:205
+#: functions.php:3956 functions.php:3972 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Olvasatlan"
-#: functions.php:3937 mobile/functions.php:573
+#: functions.php:3957 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(ellentét)"
-#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
-#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: functions.php:3958 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:165
#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Egyiksem"
-#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
+#: functions.php:3966 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Műveletek"
-#: functions.php:3951
+#: functions.php:3971
#, fuzzy
msgid "Selection toggle:"
msgstr "Kiválaszt:"
-#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
+#: functions.php:3973 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Csillagoz"
-#: functions.php:3954
+#: functions.php:3974
msgid "Published"
msgstr "Publikál"
-#: functions.php:3956
+#: functions.php:3976
msgid "Mark as read:"
msgstr ""
-#: functions.php:3957 mobile/functions.php:578
+#: functions.php:3977 mobile/functions.php:578
msgid "Selection"
msgstr "Kiválasztottakat"
-#: functions.php:3959 mobile/functions.php:580
+#: functions.php:3979 mobile/functions.php:580
msgid "Entire feed"
msgstr "Összes feed"
-#: functions.php:3963
+#: functions.php:3983
#, fuzzy
msgid "Assign label:"
msgstr "Tag felajánlása"
-#: functions.php:4004
+#: functions.php:4024
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4268
+#: functions.php:4290
msgid "No feeds to display."
msgstr ""
-#: functions.php:4285 mobile/functions.php:12
+#: functions.php:4307 mobile/functions.php:12
msgid "Tags"
msgstr ""
-#: functions.php:4521
+#: functions.php:4543
msgid " - "
msgstr ""
-#: functions.php:4545 functions.php:5220
+#: functions.php:4567 functions.php:5237
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4553
+#: functions.php:4575
#, fuzzy
msgid "Display original article content"
msgstr "Mutasd az utolsó hír időpontját"
-#: functions.php:4560 functions.php:5211
+#: functions.php:4582 functions.php:5228
msgid "Show article summary in new window"
msgstr ""
-#: functions.php:4593 functions.php:5135
+#: functions.php:4615 functions.php:5152
#, fuzzy
msgid "unknown type"
msgstr "Ismeretlen hiba"
-#: functions.php:4599 functions.php:5141
+#: functions.php:4621 functions.php:5158
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4635 functions.php:5175
+#: functions.php:4657 functions.php:5192
msgid "Attachment:"
msgstr "Csatolmány:"
-#: functions.php:4637 functions.php:5177
+#: functions.php:4659 functions.php:5194
msgid "Attachments:"
msgstr "Csatolmányok:"
-#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4679 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr ""
-#: functions.php:4713
+#: functions.php:4735
msgid "Feed not found."
msgstr "Feed nem található"
-#: functions.php:4782 mobile/functions.php:423
+#: functions.php:4804 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5109
+#: functions.php:5126
#, fuzzy
msgid "Click to expand article"
msgstr "Tárolt hírek"
-#: functions.php:5246
+#: functions.php:5263
#, fuzzy
msgid "No unread articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5249
+#: functions.php:5266
#, fuzzy
msgid "No updated articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5252
+#: functions.php:5269
#, fuzzy
msgid "No starred articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5256
+#: functions.php:5273
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5258
+#: functions.php:5275
#, fuzzy
msgid "No articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5931 tt-rss.php:171
+#: functions.php:5949 tt-rss.php:171
#, fuzzy
msgid "Create label..."
msgstr "Címke készítése"
-#: functions.php:5944
+#: functions.php:5962
#, fuzzy
msgid "(remove)"
msgstr "Eltávolít"
-#: functions.php:5988
+#: functions.php:6006
msgid "no tags"
msgstr ""
@@ -1075,46 +1075,6 @@ msgstr ""
msgid "Limit bandwidth usage"
msgstr ""
-#: mysql_convert_unicode.php:20 update.php:19
-msgid "Your access level is insufficient to run this script."
-msgstr ""
-
-#: mysql_convert_unicode.php:46
-msgid "MySQL Charset Updater"
-msgstr ""
-
-#: mysql_convert_unicode.php:53
-msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
-msgstr ""
-
-#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
-#: register.php:200 register.php:213 register.php:228 register.php:246
-#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162 modules/pref-feeds.php:865
-msgid "Return to Tiny Tiny RSS"
-msgstr "Vissza az RSS olvasóhoz"
-
-#: mysql_convert_unicode.php:61 update.php:102
-msgid "Please backup your database before proceeding."
-msgstr ""
-
-#: mysql_convert_unicode.php:63
-msgid ""
-"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-"\t\t\tDepending on current database charset you may experience data "
-"corruption (lost accent characters, etc.). \n"
-"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
-"php to 'utf8'."
-msgstr ""
-
-#: mysql_convert_unicode.php:69 update.php:118
-msgid "Perform updates"
-msgstr ""
-
-#: mysql_convert_unicode.php:74
-msgid "Converting database..."
-msgstr ""
-
#: opml.php:99 opml.php:103
msgid "OPML Utility"
msgstr ""
@@ -1182,6 +1142,12 @@ msgstr "Felhasználó"
msgid "New user registrations are administratively disabled."
msgstr "Feed böngészése letilva az adminisztrátor által."
+#: register.php:155 register.php:200 register.php:213 register.php:228
+#: register.php:246 register.php:331 register.php:341 register.php:353
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
+msgid "Return to Tiny Tiny RSS"
+msgstr "Vissza az RSS olvasóhoz"
+
#: register.php:176
msgid ""
"Your temporary password will be sent to the specified email. Accounts, which "
@@ -1231,83 +1197,6 @@ msgstr ""
msgid "New user registrations are currently closed."
msgstr ""
-#: sanity_check.php:8
-msgid ""
-"<b>Fatal Error</b>: You forgot to copy \n"
-"\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
-msgstr ""
-
-#: sanity_check.php:16
-msgid "config: your config file version is incorrect. See config.php-dist.\n"
-msgstr ""
-
-#: sanity_check.php:20
-msgid ""
-"<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
-"\t\t\toption from config.php\n"
-msgstr ""
-
-#: sanity_check.php:26
-msgid ""
-"<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
-"\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
-"them \n"
-"\t\tfrom your TT-RSS instance.\n"
-msgstr ""
-
-#: sanity_check.php:33
-msgid ""
-"<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tto 0 in single user mode.\n"
-msgstr ""
-
-#: sanity_check.php:39
-msgid ""
-"<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
-"\t\t\tdoesn't seem to support CURL functions."
-msgstr ""
-
-#: sanity_check.php:45
-msgid "config: SESSION_EXPIRE_TIME is undefined"
-msgstr ""
-
-#: sanity_check.php:49
-msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
-msgstr ""
-
-#: sanity_check.php:53
-msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
-msgstr ""
-
-#: sanity_check.php:62
-msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
-msgstr ""
-
-#: sanity_check.php:66
-msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
-msgstr ""
-
-#: sanity_check.php:70
-msgid ""
-"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
-"DIGEST_FROM_ADDRESS"
-msgstr ""
-
-#: sanity_check.php:74
-msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
-msgstr ""
-
-#: sanity_check.php:78
-msgid ""
-"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
-"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
-"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-msgstr ""
-
-#: sanity_check.php:83
-msgid "Fatal Error"
-msgstr "Végzetes Hiba"
-
#: tt-rss.php:122
msgid "Comments?"
msgstr "Hozzászólás?"
@@ -1449,6 +1338,10 @@ msgstr "Frissítés"
msgid "Drag me to resize panels"
msgstr ""
+#: update.php:19
+msgid "Your access level is insufficient to run this script."
+msgstr ""
+
#: update.php:44
msgid "Database Updater"
msgstr "Adatbázis frissítő"
@@ -1469,6 +1362,10 @@ msgstr ""
msgid "Tiny Tiny RSS database is up to date."
msgstr ""
+#: update.php:102
+msgid "Please backup your database before proceeding."
+msgstr ""
+
#: update.php:104
#, php-format
msgid ""
@@ -1476,6 +1373,10 @@ msgid ""
"<b>%d</b>)."
msgstr ""
+#: update.php:118
+msgid "Perform updates"
+msgstr ""
+
#: update.php:123
msgid "Performing updates..."
msgstr ""
@@ -1621,7 +1522,7 @@ msgstr "Mégse"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
-#: modules/pref-labels.php:96 modules/pref-users.php:363
+#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1863,7 +1764,7 @@ msgid "No feed categories defined."
msgstr "Nincs feed kategória definiálva"
#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-filters.php:487 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Eltávolít"
@@ -2042,24 +1943,46 @@ msgstr "Nincs szűrő definiálva."
msgid "No matching filters found."
msgstr "Nincs szűrő definiálva."
-#: modules/pref-labels.php:66
+#: modules/pref-labels.php:100
#, php-format
msgid "Created label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:138 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Címke készítése"
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:203
+#, fuzzy
+msgid "Click to change color"
+msgstr "Tárolt hírek"
+
+#: modules/pref-labels.php:233
+#, fuzzy
+msgid "Clear colors"
+msgstr "Minden hír"
+
+#: modules/pref-labels.php:240
msgid "No labels defined."
msgstr "Nincs címke definiálva."
-#: modules/pref-labels.php:177
+#: modules/pref-labels.php:242
#, fuzzy
msgid "No matching labels found."
msgstr "Nincs címke definiálva."
+#: modules/pref-labels.php:300
+msgid "custom color:"
+msgstr ""
+
+#: modules/pref-labels.php:301
+msgid "foreground"
+msgstr ""
+
+#: modules/pref-labels.php:302
+msgid "background"
+msgstr ""
+
#: modules/pref-prefs.php:65
msgid "Password has been changed."
msgstr "A jelszó meg lett változtatva."
@@ -2514,6 +2437,9 @@ msgstr "Egyezés ezzel:"
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid "Fatal Error"
+#~ msgstr "Végzetes Hiba"
+
#~ msgid "Unknown Error"
#~ msgstr "Ismeretlen Hiba"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 61f40acf7..2a605da62 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 ce3c49668..2e007bf9b 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-26 09:05+0300\n"
+"POT-Creation-Date: 2009-02-09 23:01+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,173 +169,173 @@ msgstr ""
"Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
"configurazione del PHP"
-#: functions.php:2808 modules/popup-dialog.php:175
+#: functions.php:2828 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Tutti i notiziari"
-#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
-#: functions.php:4248 modules/pref-feeds.php:1247
+#: functions.php:2857 functions.php:2896 functions.php:3285 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Senza categoria"
-#: functions.php:2866 functions.php:3459 mobile/functions.php:33
+#: functions.php:2886 functions.php:3479 mobile/functions.php:33
msgid "Special"
msgstr "Speciale"
-#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: functions.php:2888 functions.php:3314 functions.php:3481 prefs.php:129
#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Etichette"
-#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
+#: functions.php:2906 functions.php:3307 functions.php:4092 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Articoli con stella"
-#: functions.php:2888 functions.php:3291 functions.php:4079
+#: functions.php:2908 functions.php:3311 functions.php:4099
#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Articoli pubblicati"
-#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
+#: functions.php:2910 functions.php:3317 functions.php:4077 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Articoli nuovi"
-#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
+#: functions.php:2912 functions.php:3320 functions.php:4070 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Tutti gli articoli"
-#: functions.php:3251 functions.php:3253
+#: functions.php:3271 functions.php:3273
msgid "Search results"
msgstr "Risultati della ricerca"
-#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
-#: functions.php:3298 functions.php:3301 functions.php:3309
+#: functions.php:3289 functions.php:3302 functions.php:3308 functions.php:3312
+#: functions.php:3318 functions.php:3321 functions.php:3329
msgid "Searched for"
msgstr "Ricerca"
-#: functions.php:3929
+#: functions.php:3949
msgid "Generated feed"
msgstr "Notiziario generato"
-#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: functions.php:3954 functions.php:5218 modules/pref-feeds.php:1028
#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:129 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401
msgid "Select:"
msgstr "Seleziona:"
-#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
-#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: functions.php:3955 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:164
#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Tutti"
-#: functions.php:3936 functions.php:3952 tt-rss.php:205
+#: functions.php:3956 functions.php:3972 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Non letti"
-#: functions.php:3937 mobile/functions.php:573
+#: functions.php:3957 mobile/functions.php:573
msgid "Invert"
msgstr "Inverti"
-#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
-#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: functions.php:3958 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:165
#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Nessuno"
-#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
+#: functions.php:3966 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Azioni..."
-#: functions.php:3951
+#: functions.php:3971
msgid "Selection toggle:"
msgstr "Inverti selezione:"
-#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
+#: functions.php:3973 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Con stella"
-#: functions.php:3954
+#: functions.php:3974
msgid "Published"
msgstr "Pubblicati"
-#: functions.php:3956
+#: functions.php:3976
msgid "Mark as read:"
msgstr "Segna come letti:"
-#: functions.php:3957 mobile/functions.php:578
+#: functions.php:3977 mobile/functions.php:578
msgid "Selection"
msgstr "Selezione"
-#: functions.php:3959 mobile/functions.php:580
+#: functions.php:3979 mobile/functions.php:580
msgid "Entire feed"
msgstr "Intero notiziario"
-#: functions.php:3963
+#: functions.php:3983
#, fuzzy
msgid "Assign label:"
msgstr "Assegna etichette"
-#: functions.php:4004
+#: functions.php:4024
msgid "Click to collapse category"
msgstr "Fare clic per contrarre la categoria"
-#: functions.php:4268
+#: functions.php:4290
msgid "No feeds to display."
msgstr "Nessun notiziario da visualizzare."
-#: functions.php:4285 mobile/functions.php:12
+#: functions.php:4307 mobile/functions.php:12
msgid "Tags"
msgstr "Etichette"
-#: functions.php:4521
+#: functions.php:4543
msgid " - "
msgstr " - "
-#: functions.php:4545 functions.php:5220
+#: functions.php:4567 functions.php:5237
msgid "Edit tags for this article"
msgstr "Modifica le etichette per questo articolo"
-#: functions.php:4553
+#: functions.php:4575
msgid "Display original article content"
msgstr "Visualizza il contenuto originale dell&apos;articolo"
-#: functions.php:4560 functions.php:5211
+#: functions.php:4582 functions.php:5228
msgid "Show article summary in new window"
msgstr "Mostra il sommario dell&apos;articolo in una nuova finestra"
-#: functions.php:4593 functions.php:5135
+#: functions.php:4615 functions.php:5152
msgid "unknown type"
msgstr "tipo sconosciuto"
-#: functions.php:4599 functions.php:5141
+#: functions.php:4621 functions.php:5158
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4635 functions.php:5175
+#: functions.php:4657 functions.php:5192
msgid "Attachment:"
msgstr "Allegato:"
-#: functions.php:4637 functions.php:5177
+#: functions.php:4659 functions.php:5194
msgid "Attachments:"
msgstr "Allegati:"
-#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4679 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Chiudi questa finestra"
-#: functions.php:4713
+#: functions.php:4735
msgid "Feed not found."
msgstr "Notiziario non trovato."
-#: functions.php:4782 mobile/functions.php:423
+#: functions.php:4804 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -343,44 +343,44 @@ msgstr ""
"Impossibile visualizzare il notiziario (interrogazione fallita). Controllare "
"che l&apos;etichetta corrisponda alla sintassi o la configurazione locale."
-#: functions.php:5109
+#: functions.php:5126
msgid "Click to expand article"
msgstr "Fare clic per espandere l&apos;articolo"
-#: functions.php:5246
+#: functions.php:5263
msgid "No unread articles found to display."
msgstr "Nessun articolo non letto trovato da visualizzare."
-#: functions.php:5249
+#: functions.php:5266
#, fuzzy
msgid "No updated articles found to display."
msgstr "Nessun articolo non letto trovato da visualizzare."
-#: functions.php:5252
+#: functions.php:5269
msgid "No starred articles found to display."
msgstr "Nessun articolo con stella trovato da visualizzare."
-#: functions.php:5256
+#: functions.php:5273
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5258
+#: functions.php:5275
msgid "No articles found to display."
msgstr "Nessun articolo trovato da visualizzare."
-#: functions.php:5931 tt-rss.php:171
+#: functions.php:5949 tt-rss.php:171
#, fuzzy
msgid "Create label..."
msgstr "Crea etichetta"
-#: functions.php:5944
+#: functions.php:5962
#, fuzzy
msgid "(remove)"
msgstr "Rimuovi"
-#: functions.php:5988
+#: functions.php:6006
msgid "no tags"
msgstr "nessuna etichetta"
@@ -1104,52 +1104,6 @@ msgstr "Crea un nuovo utente"
msgid "Limit bandwidth usage"
msgstr "Limitare l&apos;uso della banda"
-#: mysql_convert_unicode.php:20 update.php:19
-msgid "Your access level is insufficient to run this script."
-msgstr "Il livello di accesso non è sufficiente per eseguire questo script."
-
-#: mysql_convert_unicode.php:46
-msgid "MySQL Charset Updater"
-msgstr "Aggiornatore del set di caratteri di MySQL"
-
-#: mysql_convert_unicode.php:53
-msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
-msgstr "Questo script è solo per installazioni di Tiny Tiny RSS su MySQL."
-
-#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
-#: register.php:200 register.php:213 register.php:228 register.php:246
-#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162 modules/pref-feeds.php:865
-msgid "Return to Tiny Tiny RSS"
-msgstr "Ritorna a Tiny Tiny RSS"
-
-#: mysql_convert_unicode.php:61 update.php:102
-msgid "Please backup your database before proceeding."
-msgstr "Fare il backup del database prima di procedere."
-
-#: mysql_convert_unicode.php:63
-msgid ""
-"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-"\t\t\tDepending on current database charset you may experience data "
-"corruption (lost accent characters, etc.). \n"
-"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
-"php to 'utf8'."
-msgstr ""
-"Questo script convertirà il database di Tiny Tiny RSS a UTF-8. \n"
-"\t\t\tIn base all&apos;insieme di caratteri attuale del database si "
-"potrebbero avere delle corruzioni dei dati (caratteri accentati persi, "
-"ecc.). \n"
-"\t\t\tDopo l&apos;aggiornamento, occorre impostare l&apos;opzione a «utf8» "
-"<b>MYSQL_CHARSET</b> in config.php."
-
-#: mysql_convert_unicode.php:69 update.php:118
-msgid "Perform updates"
-msgstr "Effettuare gli aggiornamenti"
-
-#: mysql_convert_unicode.php:74
-msgid "Converting database..."
-msgstr "Conversione del database..."
-
#: opml.php:99 opml.php:103
msgid "OPML Utility"
msgstr "Utilità OPML"
@@ -1221,6 +1175,12 @@ msgstr "Utente"
msgid "New user registrations are administratively disabled."
msgstr "La lettura del notiziario è bloccata dall&apos;amministratore."
+#: register.php:155 register.php:200 register.php:213 register.php:228
+#: register.php:246 register.php:331 register.php:341 register.php:353
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
+msgid "Return to Tiny Tiny RSS"
+msgstr "Ritorna a Tiny Tiny RSS"
+
#: register.php:176
msgid ""
"Your temporary password will be sent to the specified email. Accounts, which "
@@ -1271,110 +1231,6 @@ msgstr ""
msgid "New user registrations are currently closed."
msgstr ""
-#: sanity_check.php:8
-msgid ""
-"<b>Fatal Error</b>: You forgot to copy \n"
-"\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
-msgstr ""
-"<b>Errore fatale</b>: non è stato copiato \n"
-"\t\t<b>config.php-dist</b> in <b>config.php</b> e modificato.\n"
-
-#: sanity_check.php:16
-msgid "config: your config file version is incorrect. See config.php-dist.\n"
-msgstr ""
-"config: la versione del file config non è corretta. Vedere config.php-dist.\n"
-
-#: sanity_check.php:20
-msgid ""
-"<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
-"\t\t\toption from config.php\n"
-msgstr ""
-"<b>Errore fatale</b>: RSS_BACKEND_TYPE è deprecata. Rimuovere\n"
-"\t\tquesta opzione da config.php\n"
-
-#: sanity_check.php:26
-msgid ""
-"<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
-"\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
-"them \n"
-"\t\tfrom your TT-RSS instance.\n"
-msgstr ""
-"<b>Errore fatale</b>: gli strumenti di importazione/esportazione XML\n"
-"\t\t(<b>xml-export.php</b> e <b>xml-import.php</b>) potrebbero essere "
-"utilizzati\n"
-"\t\tmalevolmente. Rimuoverli\n"
-
-#: sanity_check.php:33
-msgid ""
-"<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tto 0 in single user mode.\n"
-msgstr ""
-"<b>Errore fatale</b>: impostare DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\ta 0 nella modalità singolo utente.\n"
-
-#: sanity_check.php:39
-msgid ""
-"<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
-"\t\t\tdoesn't seem to support CURL functions."
-msgstr ""
-"<b>Errore fatale</b>: è stato abilitato USE_CURL_FOR_ICONS, ma PHP \n"
-"\t\t\tnon sembra supportare le funzioni di CURL."
-
-#: sanity_check.php:45
-msgid "config: SESSION_EXPIRE_TIME is undefined"
-msgstr "configurazione: SESSION_EXPIRE_TIME non è definita."
-
-#: sanity_check.php:49
-msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
-msgstr "configurazione: SESSION_EXPIRE_TIME è troppo bassa (meno di 60)"
-
-#: sanity_check.php:53
-#, fuzzy
-msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
-msgstr ""
-"configurazione: SESSION_EXPIRE_TIME dovrebbe essere maggiore o uguale a "
-"SESSION_COOKIE_LIFETIME"
-
-#: sanity_check.php:62
-msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
-msgstr ""
-"configurazione: DATABASE_BACKED_SESSIONS non è compatibile con "
-"SINGLE_USER_MODE"
-
-#: sanity_check.php:66
-msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
-msgstr ""
-"configurazione: DATABASE_BACKED_SESSIONS sono attualmente non funzionanti "
-"con MySQL"
-
-#: sanity_check.php:70
-msgid ""
-"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
-"DIGEST_FROM_ADDRESS"
-msgstr ""
-"configurazione: MAIL_FROM è stata divisa in DIGEST_FROM_NAME e "
-"DIGEST_FROM_ADDRESS"
-
-#: sanity_check.php:74
-msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
-msgstr ""
-"configurazione: è attesa l&apos;opzione COUNTERS_MAX_AGE, ma non è stata "
-"definita"
-
-#: sanity_check.php:78
-msgid ""
-"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
-"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
-"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-msgstr ""
-"configurazione: l&apos;opzione DAEMON_REFRESH_ONLY è obsoleta. Rimuovere "
-"questa opzione e leggere per altri modi di aggiornare i notiziari sul <a "
-"href='http://tt-rss.spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-
-#: sanity_check.php:83
-msgid "Fatal Error"
-msgstr "Errore fatale"
-
#: tt-rss.php:122
msgid "Comments?"
msgstr "Commenti?"
@@ -1511,6 +1367,10 @@ msgstr "Aggiorna"
msgid "Drag me to resize panels"
msgstr "Trascina per ridimensionare i riquadri"
+#: update.php:19
+msgid "Your access level is insufficient to run this script."
+msgstr "Il livello di accesso non è sufficiente per eseguire questo script."
+
#: update.php:44
msgid "Database Updater"
msgstr "Aggiornatore database"
@@ -1531,6 +1391,10 @@ msgstr ", trovato: "
msgid "Tiny Tiny RSS database is up to date."
msgstr "Il database di Tiny Tiny RSS è aggiornato."
+#: update.php:102
+msgid "Please backup your database before proceeding."
+msgstr "Fare il backup del database prima di procedere."
+
#: update.php:104
#, php-format
msgid ""
@@ -1540,6 +1404,10 @@ msgstr ""
"Il database di Tiny Tiny RSS deve essere aggiornato all&apos;ultima versione "
"(<b>%d</b> a <b>%d</b>)."
+#: update.php:118
+msgid "Perform updates"
+msgstr "Effettuare gli aggiornamenti"
+
#: update.php:123
msgid "Performing updates..."
msgstr "Esecuzione aggiornamenti..."
@@ -1701,7 +1569,7 @@ msgstr "Annulla"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
-#: modules/pref-labels.php:96 modules/pref-users.php:363
+#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1933,7 +1801,7 @@ msgid "No feed categories defined."
msgstr "Nessuna categoria notiziari definita."
#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-filters.php:487 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Rimuovi"
@@ -2110,23 +1978,45 @@ msgstr "Nessun filtro definito."
msgid "No matching filters found."
msgstr "Nessun filtro trovato che corrisponde."
-#: modules/pref-labels.php:66
+#: modules/pref-labels.php:100
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Etichetta <b>%s</b> creata"
-#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:138 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Crea etichetta"
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:203
+#, fuzzy
+msgid "Click to change color"
+msgstr "(Fare clic per cambiare)"
+
+#: modules/pref-labels.php:233
+#, fuzzy
+msgid "Clear colors"
+msgstr "Filtra articoli"
+
+#: modules/pref-labels.php:240
msgid "No labels defined."
msgstr "Nessuna etichetta definita."
-#: modules/pref-labels.php:177
+#: modules/pref-labels.php:242
msgid "No matching labels found."
msgstr "Nessuna etichetta corrispondente trovata."
+#: modules/pref-labels.php:300
+msgid "custom color:"
+msgstr ""
+
+#: modules/pref-labels.php:301
+msgid "foreground"
+msgstr ""
+
+#: modules/pref-labels.php:302
+msgid "background"
+msgstr ""
+
#: modules/pref-prefs.php:65
msgid "Password has been changed."
msgstr "La password è stata cambiata"
@@ -2566,6 +2456,122 @@ msgstr "Corrisponde a:"
msgid "Internal error: Function not implemented"
msgstr "Errore interno: funzione non implementata"
+#~ msgid "MySQL Charset Updater"
+#~ msgstr "Aggiornatore del set di caratteri di MySQL"
+
+#~ msgid ""
+#~ "This script is for Tiny Tiny RSS installations with MySQL backend only."
+#~ msgstr "Questo script è solo per installazioni di Tiny Tiny RSS su MySQL."
+
+#~ msgid ""
+#~ "This script will convert your Tiny Tiny RSS database to UTF-8. \n"
+#~ "\t\t\tDepending on current database charset you may experience data "
+#~ "corruption (lost accent characters, etc.). \n"
+#~ "\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in "
+#~ "config.php to 'utf8'."
+#~ msgstr ""
+#~ "Questo script convertirà il database di Tiny Tiny RSS a UTF-8. \n"
+#~ "\t\t\tIn base all&apos;insieme di caratteri attuale del database si "
+#~ "potrebbero avere delle corruzioni dei dati (caratteri accentati persi, "
+#~ "ecc.). \n"
+#~ "\t\t\tDopo l&apos;aggiornamento, occorre impostare l&apos;opzione a "
+#~ "«utf8» <b>MYSQL_CHARSET</b> in config.php."
+
+#~ msgid "Converting database..."
+#~ msgstr "Conversione del database..."
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You forgot to copy \n"
+#~ "\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
+#~ msgstr ""
+#~ "<b>Errore fatale</b>: non è stato copiato \n"
+#~ "\t\t<b>config.php-dist</b> in <b>config.php</b> e modificato.\n"
+
+#~ msgid ""
+#~ "config: your config file version is incorrect. See config.php-dist.\n"
+#~ msgstr ""
+#~ "config: la versione del file config non è corretta. Vedere config.php-"
+#~ "dist.\n"
+
+#~ msgid ""
+#~ "<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
+#~ "\t\t\toption from config.php\n"
+#~ msgstr ""
+#~ "<b>Errore fatale</b>: RSS_BACKEND_TYPE è deprecata. Rimuovere\n"
+#~ "\t\tquesta opzione da config.php\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
+#~ "\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
+#~ "them \n"
+#~ "\t\tfrom your TT-RSS instance.\n"
+#~ msgstr ""
+#~ "<b>Errore fatale</b>: gli strumenti di importazione/esportazione XML\n"
+#~ "\t\t(<b>xml-export.php</b> e <b>xml-import.php</b>) potrebbero essere "
+#~ "utilizzati\n"
+#~ "\t\tmalevolmente. Rimuoverli\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\tto 0 in single user mode.\n"
+#~ msgstr ""
+#~ "<b>Errore fatale</b>: impostare DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\ta 0 nella modalità singolo utente.\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
+#~ "\t\t\tdoesn't seem to support CURL functions."
+#~ msgstr ""
+#~ "<b>Errore fatale</b>: è stato abilitato USE_CURL_FOR_ICONS, ma PHP \n"
+#~ "\t\t\tnon sembra supportare le funzioni di CURL."
+
+#~ msgid "config: SESSION_EXPIRE_TIME is undefined"
+#~ msgstr "configurazione: SESSION_EXPIRE_TIME non è definita."
+
+#~ msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
+#~ msgstr "configurazione: SESSION_EXPIRE_TIME è troppo bassa (meno di 60)"
+
+#, fuzzy
+#~ msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
+#~ msgstr ""
+#~ "configurazione: SESSION_EXPIRE_TIME dovrebbe essere maggiore o uguale a "
+#~ "SESSION_COOKIE_LIFETIME"
+
+#~ msgid ""
+#~ "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
+#~ msgstr ""
+#~ "configurazione: DATABASE_BACKED_SESSIONS non è compatibile con "
+#~ "SINGLE_USER_MODE"
+
+#~ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
+#~ msgstr ""
+#~ "configurazione: DATABASE_BACKED_SESSIONS sono attualmente non funzionanti "
+#~ "con MySQL"
+
+#~ msgid ""
+#~ "config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
+#~ "DIGEST_FROM_ADDRESS"
+#~ msgstr ""
+#~ "configurazione: MAIL_FROM è stata divisa in DIGEST_FROM_NAME e "
+#~ "DIGEST_FROM_ADDRESS"
+
+#~ msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
+#~ msgstr ""
+#~ "configurazione: è attesa l&apos;opzione COUNTERS_MAX_AGE, ma non è stata "
+#~ "definita"
+
+#~ msgid ""
+#~ "config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
+#~ "and read about other ways to update feeds on the <a href='http://tt-rss."
+#~ "spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+#~ msgstr ""
+#~ "configurazione: l&apos;opzione DAEMON_REFRESH_ONLY è obsoleta. Rimuovere "
+#~ "questa opzione e leggere per altri modi di aggiornare i notiziari sul <a "
+#~ "href='http://tt-rss.spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+
+#~ msgid "Fatal Error"
+#~ msgstr "Errore fatale"
+
#~ msgid "Unknown Error"
#~ msgstr "Errore sconosciuto"
@@ -2646,9 +2652,6 @@ msgstr "Errore interno: funzione non implementata"
#~ msgid "Stored articles"
#~ msgstr "Articoli salvati"
-#~ msgid "(Click to change)"
-#~ msgstr "(Fare clic per cambiare)"
-
#~ msgid "Match "
#~ msgstr "Corrisponde "
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 6ac6e5013..c91949793 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 c75f6d968..2ff9c22b8 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-26 09:05+0300\n"
+"POT-Creation-Date: 2009-02-09 23:01+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,218 +166,218 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2808 modules/popup-dialog.php:175
+#: functions.php:2828 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "すべてのフィード"
-#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
-#: functions.php:4248 modules/pref-feeds.php:1247
+#: functions.php:2857 functions.php:2896 functions.php:3285 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "カテゴリー割り当てなし"
-#: functions.php:2866 functions.php:3459 mobile/functions.php:33
+#: functions.php:2886 functions.php:3479 mobile/functions.php:33
msgid "Special"
msgstr "特別"
-#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: functions.php:2888 functions.php:3314 functions.php:3481 prefs.php:129
#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "ラベル"
-#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
+#: functions.php:2906 functions.php:3307 functions.php:4092 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "お気に入りの記事"
-#: functions.php:2888 functions.php:3291 functions.php:4079
+#: functions.php:2908 functions.php:3311 functions.php:4099
#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "公開済みの記事"
-#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
+#: functions.php:2910 functions.php:3317 functions.php:4077 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "新しい記事"
-#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
+#: functions.php:2912 functions.php:3320 functions.php:4070 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "すべての記事"
-#: functions.php:3251 functions.php:3253
+#: functions.php:3271 functions.php:3273
msgid "Search results"
msgstr "検索結果"
-#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
-#: functions.php:3298 functions.php:3301 functions.php:3309
+#: functions.php:3289 functions.php:3302 functions.php:3308 functions.php:3312
+#: functions.php:3318 functions.php:3321 functions.php:3329
#, fuzzy
msgid "Searched for"
msgstr "検索"
-#: functions.php:3929
+#: functions.php:3949
msgid "Generated feed"
msgstr "生成したフィード"
-#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: functions.php:3954 functions.php:5218 modules/pref-feeds.php:1028
#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:129 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401
msgid "Select:"
msgstr "選択:"
-#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
-#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: functions.php:3955 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:164
#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "すべて"
-#: functions.php:3936 functions.php:3952 tt-rss.php:205
+#: functions.php:3956 functions.php:3972 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "未読"
-#: functions.php:3937 mobile/functions.php:573
+#: functions.php:3957 mobile/functions.php:573
msgid "Invert"
msgstr "反転"
-#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
-#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: functions.php:3958 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:165
#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "なし"
-#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
+#: functions.php:3966 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "操作..."
-#: functions.php:3951
+#: functions.php:3971
msgid "Selection toggle:"
msgstr "選択の切り替え:"
-#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
+#: functions.php:3973 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "お気に入り"
-#: functions.php:3954
+#: functions.php:3974
msgid "Published"
msgstr "公開済み"
-#: functions.php:3956
+#: functions.php:3976
msgid "Mark as read:"
msgstr "既読にする:"
-#: functions.php:3957 mobile/functions.php:578
+#: functions.php:3977 mobile/functions.php:578
msgid "Selection"
msgstr "選択"
-#: functions.php:3959 mobile/functions.php:580
+#: functions.php:3979 mobile/functions.php:580
msgid "Entire feed"
msgstr "フィードの入力"
-#: functions.php:3963
+#: functions.php:3983
#, fuzzy
msgid "Assign label:"
msgstr "タグの割り当て"
-#: functions.php:4004
+#: functions.php:4024
msgid "Click to collapse category"
msgstr "閉じたカテゴリーのクリック"
-#: functions.php:4268
+#: functions.php:4290
msgid "No feeds to display."
msgstr "表示するフィードがありません。"
-#: functions.php:4285 mobile/functions.php:12
+#: functions.php:4307 mobile/functions.php:12
msgid "Tags"
msgstr "タグ"
-#: functions.php:4521
+#: functions.php:4543
msgid " - "
msgstr " - "
-#: functions.php:4545 functions.php:5220
+#: functions.php:4567 functions.php:5237
msgid "Edit tags for this article"
msgstr "この記事のタグを編集する"
-#: functions.php:4553
+#: functions.php:4575
#, fuzzy
msgid "Display original article content"
msgstr "記事の内容をスクロールする"
-#: functions.php:4560 functions.php:5211
+#: functions.php:4582 functions.php:5228
msgid "Show article summary in new window"
msgstr "記事の要約を新しいウィンドウで表示する"
-#: functions.php:4593 functions.php:5135
+#: functions.php:4615 functions.php:5152
msgid "unknown type"
msgstr "未知の種類"
-#: functions.php:4599 functions.php:5141
+#: functions.php:4621 functions.php:5158
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4635 functions.php:5175
+#: functions.php:4657 functions.php:5192
msgid "Attachment:"
msgstr "添付: "
-#: functions.php:4637 functions.php:5177
+#: functions.php:4659 functions.php:5194
msgid "Attachments:"
msgstr "添付:"
-#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4679 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "このウィンドウを閉じる"
-#: functions.php:4713
+#: functions.php:4735
msgid "Feed not found."
msgstr "フィードが見つかりません。"
-#: functions.php:4782 mobile/functions.php:423
+#: functions.php:4804 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5109
+#: functions.php:5126
msgid "Click to expand article"
msgstr "開いた記事のクリック"
-#: functions.php:5246
+#: functions.php:5263
msgid "No unread articles found to display."
msgstr "表示する未読記事が見つかりませんでした。"
-#: functions.php:5249
+#: functions.php:5266
#, fuzzy
msgid "No updated articles found to display."
msgstr "表示する未読記事が見つかりませんでした。"
-#: functions.php:5252
+#: functions.php:5269
msgid "No starred articles found to display."
msgstr "表示するお気に入りの記事が見つかりませんでした。"
-#: functions.php:5256
+#: functions.php:5273
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5258
+#: functions.php:5275
msgid "No articles found to display."
msgstr "表示する記事が見つかりません。"
-#: functions.php:5931 tt-rss.php:171
+#: functions.php:5949 tt-rss.php:171
#, fuzzy
msgid "Create label..."
msgstr "ラベルを作成する"
-#: functions.php:5944
+#: functions.php:5962
#, fuzzy
msgid "(remove)"
msgstr "削除"
-#: functions.php:5988
+#: functions.php:6006
msgid "no tags"
msgstr "タグがありません"
@@ -1067,48 +1067,6 @@ msgstr ""
msgid "Limit bandwidth usage"
msgstr "帯域の制限を使う"
-#: mysql_convert_unicode.php:20 update.php:19
-msgid "Your access level is insufficient to run this script."
-msgstr "このスクリプトを実行するにはアクセスレベルが不十分です。"
-
-#: mysql_convert_unicode.php:46
-msgid "MySQL Charset Updater"
-msgstr ""
-
-#: mysql_convert_unicode.php:53
-msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
-msgstr ""
-"このスクリプトは Tiny Tiny RSS を MySQL バックエンドにのみインストールしま"
-"す。"
-
-#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
-#: register.php:200 register.php:213 register.php:228 register.php:246
-#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162 modules/pref-feeds.php:865
-msgid "Return to Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS に戻る"
-
-#: mysql_convert_unicode.php:61 update.php:102
-msgid "Please backup your database before proceeding."
-msgstr "実行前にデータベースのバックアップをしてください。"
-
-#: mysql_convert_unicode.php:63
-msgid ""
-"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-"\t\t\tDepending on current database charset you may experience data "
-"corruption (lost accent characters, etc.). \n"
-"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
-"php to 'utf8'."
-msgstr ""
-
-#: mysql_convert_unicode.php:69 update.php:118
-msgid "Perform updates"
-msgstr "更新の実行"
-
-#: mysql_convert_unicode.php:74
-msgid "Converting database..."
-msgstr "データベースの変換中..."
-
#: opml.php:99 opml.php:103
msgid "OPML Utility"
msgstr "OPML ユーティリティ"
@@ -1177,6 +1135,12 @@ msgstr "ユーザー"
msgid "New user registrations are administratively disabled."
msgstr "フィードブラウザーは管理者によって無効になっています。"
+#: register.php:155 register.php:200 register.php:213 register.php:228
+#: register.php:246 register.php:331 register.php:341 register.php:353
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
+msgid "Return to Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS に戻る"
+
#: register.php:176
msgid ""
"Your temporary password will be sent to the specified email. Accounts, which "
@@ -1226,94 +1190,6 @@ msgstr ""
msgid "New user registrations are currently closed."
msgstr ""
-#: sanity_check.php:8
-msgid ""
-"<b>Fatal Error</b>: You forgot to copy \n"
-"\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
-msgstr ""
-"<b>致命的なエラー</b>: <b>config.php-dist</b> を\n"
-"\t\t<b>config.php</b> にコピーし、編集することを忘れないでください。\n"
-
-#: sanity_check.php:16
-msgid "config: your config file version is incorrect. See config.php-dist.\n"
-msgstr ""
-"設定: 設定ファイルのバージョンが不正確です。config.php-dist を参照してくださ"
-"い。\n"
-
-#: sanity_check.php:20
-msgid ""
-"<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
-"\t\t\toption from config.php\n"
-msgstr ""
-"<b>致命的なエラー</b>: RSS_BACKEND_TYPE は非推奨です。\n"
-"\t\t\tこのオプションを config.php から削除してください。\n"
-
-#: sanity_check.php:26
-msgid ""
-"<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
-"\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
-"them \n"
-"\t\tfrom your TT-RSS instance.\n"
-msgstr ""
-
-#: sanity_check.php:33
-msgid ""
-"<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tto 0 in single user mode.\n"
-msgstr ""
-"<b>致命的なエラー</b>: シングルユーザーモードでは\n"
-"\t\t\t DAEMON_UPDATE_LOGIN_LIMIT を 0 に設定してください。\n"
-
-#: sanity_check.php:39
-msgid ""
-"<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
-"\t\t\tdoesn't seem to support CURL functions."
-msgstr ""
-"<b>致命的なエラー</b>: USE_CURL_FOR_ICONS が有効だが、\n"
-"\t\t\tPHP は CURL 機能をサポートしていないように見えます。"
-
-#: sanity_check.php:45
-msgid "config: SESSION_EXPIRE_TIME is undefined"
-msgstr "設定: SESSION_EXPIRE_TIME が未定義です"
-
-#: sanity_check.php:49
-msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
-msgstr "設定: SESSION_EXPIRE_TIME が低すぎます (60 以下)"
-
-#: sanity_check.php:53
-msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
-msgstr "設定: SESSION_EXPIRE_TIME は次の数字以上でなければなりません:"
-
-#: sanity_check.php:62
-msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
-msgstr "設定: DATABASE_BACKED_SESSIONS は SINGLE_USER_MODE と矛盾します"
-
-#: sanity_check.php:66
-msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
-msgstr "設定: DATABASE_BACKED_SESSIONS は 現在 MySQL では壊れています"
-
-#: sanity_check.php:70
-msgid ""
-"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
-"DIGEST_FROM_ADDRESS"
-msgstr ""
-"設定: MAIL_FROM は DIGEST_FROM_NAME と DIGEST_FROM_ADDRESS に分けられました"
-
-#: sanity_check.php:74
-msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
-msgstr ""
-
-#: sanity_check.php:78
-msgid ""
-"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
-"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
-"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-msgstr ""
-
-#: sanity_check.php:83
-msgid "Fatal Error"
-msgstr "致命的なエラー"
-
#: tt-rss.php:122
msgid "Comments?"
msgstr ""
@@ -1450,6 +1326,10 @@ msgstr "更新"
msgid "Drag me to resize panels"
msgstr "パネルの大きさを変更するにはここをドラッグします"
+#: update.php:19
+msgid "Your access level is insufficient to run this script."
+msgstr "このスクリプトを実行するにはアクセスレベルが不十分です。"
+
#: update.php:44
msgid "Database Updater"
msgstr "データベースアップデーター"
@@ -1471,6 +1351,10 @@ msgstr ""
msgid "Tiny Tiny RSS database is up to date."
msgstr "Tiny Tiny RSS のデータベースを更新しました。"
+#: update.php:102
+msgid "Please backup your database before proceeding."
+msgstr "実行前にデータベースのバックアップをしてください。"
+
#: update.php:104
#, php-format
msgid ""
@@ -1480,6 +1364,10 @@ msgstr ""
"Tiny Tiny RSS は最新のバージョンに更新する必要があります (<b>%d</b> から <b>%"
"d</b>)。"
+#: update.php:118
+msgid "Perform updates"
+msgstr "更新の実行"
+
#: update.php:123
msgid "Performing updates..."
msgstr "更新の実行中..."
@@ -1624,7 +1512,7 @@ msgstr "取り消し"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
-#: modules/pref-labels.php:96 modules/pref-users.php:363
+#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1858,7 +1746,7 @@ msgid "No feed categories defined."
msgstr "フィードカテゴリーが定義されていません。"
#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-filters.php:487 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "削除"
@@ -2033,23 +1921,45 @@ msgstr "フィルターが定義されていません。"
msgid "No matching filters found."
msgstr "一致するフィルターが見つかりません。"
-#: modules/pref-labels.php:66
+#: modules/pref-labels.php:100
#, php-format
msgid "Created label <b>%s</b>"
msgstr "ラベル <b>%s</b> を作成しました"
-#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:138 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "ラベルを作成する"
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:203
+#, fuzzy
+msgid "Click to change color"
+msgstr "(クリックで変更)"
+
+#: modules/pref-labels.php:233
+#, fuzzy
+msgid "Clear colors"
+msgstr "記事フィルター"
+
+#: modules/pref-labels.php:240
msgid "No labels defined."
msgstr "ラベルが定義されていません。"
-#: modules/pref-labels.php:177
+#: modules/pref-labels.php:242
msgid "No matching labels found."
msgstr "一致するラベルが見つかりません。"
+#: modules/pref-labels.php:300
+msgid "custom color:"
+msgstr ""
+
+#: modules/pref-labels.php:301
+msgid "foreground"
+msgstr ""
+
+#: modules/pref-labels.php:302
+msgid "background"
+msgstr ""
+
#: modules/pref-prefs.php:65
msgid "Password has been changed."
msgstr "パスワードを変更しました。"
@@ -2482,6 +2392,75 @@ msgstr "対象項目:"
msgid "Internal error: Function not implemented"
msgstr "インターナルエラー: 機能が実装されていません"
+#~ msgid ""
+#~ "This script is for Tiny Tiny RSS installations with MySQL backend only."
+#~ msgstr ""
+#~ "このスクリプトは Tiny Tiny RSS を MySQL バックエンドにのみインストールしま"
+#~ "す。"
+
+#~ msgid "Converting database..."
+#~ msgstr "データベースの変換中..."
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You forgot to copy \n"
+#~ "\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
+#~ msgstr ""
+#~ "<b>致命的なエラー</b>: <b>config.php-dist</b> を\n"
+#~ "\t\t<b>config.php</b> にコピーし、編集することを忘れないでください。\n"
+
+#~ msgid ""
+#~ "config: your config file version is incorrect. See config.php-dist.\n"
+#~ msgstr ""
+#~ "設定: 設定ファイルのバージョンが不正確です。config.php-dist を参照してくだ"
+#~ "さい。\n"
+
+#~ msgid ""
+#~ "<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
+#~ "\t\t\toption from config.php\n"
+#~ msgstr ""
+#~ "<b>致命的なエラー</b>: RSS_BACKEND_TYPE は非推奨です。\n"
+#~ "\t\t\tこのオプションを config.php から削除してください。\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\tto 0 in single user mode.\n"
+#~ msgstr ""
+#~ "<b>致命的なエラー</b>: シングルユーザーモードでは\n"
+#~ "\t\t\t DAEMON_UPDATE_LOGIN_LIMIT を 0 に設定してください。\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
+#~ "\t\t\tdoesn't seem to support CURL functions."
+#~ msgstr ""
+#~ "<b>致命的なエラー</b>: USE_CURL_FOR_ICONS が有効だが、\n"
+#~ "\t\t\tPHP は CURL 機能をサポートしていないように見えます。"
+
+#~ msgid "config: SESSION_EXPIRE_TIME is undefined"
+#~ msgstr "設定: SESSION_EXPIRE_TIME が未定義です"
+
+#~ msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
+#~ msgstr "設定: SESSION_EXPIRE_TIME が低すぎます (60 以下)"
+
+#~ msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
+#~ msgstr "設定: SESSION_EXPIRE_TIME は次の数字以上でなければなりません:"
+
+#~ msgid ""
+#~ "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
+#~ msgstr "設定: DATABASE_BACKED_SESSIONS は SINGLE_USER_MODE と矛盾します"
+
+#~ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
+#~ msgstr "設定: DATABASE_BACKED_SESSIONS は 現在 MySQL では壊れています"
+
+#~ msgid ""
+#~ "config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
+#~ "DIGEST_FROM_ADDRESS"
+#~ msgstr ""
+#~ "設定: MAIL_FROM は DIGEST_FROM_NAME と DIGEST_FROM_ADDRESS に分けられまし"
+#~ "た"
+
+#~ msgid "Fatal Error"
+#~ msgstr "致命的なエラー"
+
#~ msgid "Unknown Error"
#~ msgstr "未知のエラー"
@@ -2555,9 +2534,6 @@ msgstr "インターナルエラー: 機能が実装されていません"
#~ msgid "Stored articles"
#~ msgstr "記事を保管しました"
-#~ msgid "(Click to change)"
-#~ msgstr "(クリックで変更)"
-
#~ msgid "Match "
#~ msgstr "一致 "
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index c05a621c1..806571b46 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 abf7bad71..1a7d091b3 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-26 09:05+0300\n"
+"POT-Creation-Date: 2009-02-09 23:01+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,173 +169,173 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
"SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
-#: functions.php:2808 modules/popup-dialog.php:175
+#: functions.php:2828 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Alle Nyhetsstrømmer"
-#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
-#: functions.php:4248 modules/pref-feeds.php:1247
+#: functions.php:2857 functions.php:2896 functions.php:3285 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Ukategorisert"
-#: functions.php:2866 functions.php:3459 mobile/functions.php:33
+#: functions.php:2886 functions.php:3479 mobile/functions.php:33
msgid "Special"
msgstr "Snarveier"
-#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: functions.php:2888 functions.php:3314 functions.php:3481 prefs.php:129
#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Merkelapper"
-#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
+#: functions.php:2906 functions.php:3307 functions.php:4092 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Favorittartikler"
-#: functions.php:2888 functions.php:3291 functions.php:4079
+#: functions.php:2908 functions.php:3311 functions.php:4099
#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Publiserte artikler"
-#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
+#: functions.php:2910 functions.php:3317 functions.php:4077 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Ferske artikler"
-#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
+#: functions.php:2912 functions.php:3320 functions.php:4070 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Alle artikler"
-#: functions.php:3251 functions.php:3253
+#: functions.php:3271 functions.php:3273
msgid "Search results"
msgstr "Søkeresultat"
-#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
-#: functions.php:3298 functions.php:3301 functions.php:3309
+#: functions.php:3289 functions.php:3302 functions.php:3308 functions.php:3312
+#: functions.php:3318 functions.php:3321 functions.php:3329
msgid "Searched for"
msgstr "Søkte etter"
-#: functions.php:3929
+#: functions.php:3949
msgid "Generated feed"
msgstr "Generert nyhetsstrøm"
-#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: functions.php:3954 functions.php:5218 modules/pref-feeds.php:1028
#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:129 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401
msgid "Select:"
msgstr "Velg:"
-#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
-#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: functions.php:3955 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:164
#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Alle"
-#: functions.php:3936 functions.php:3952 tt-rss.php:205
+#: functions.php:3956 functions.php:3972 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Ulest"
-#: functions.php:3937 mobile/functions.php:573
+#: functions.php:3957 mobile/functions.php:573
msgid "Invert"
msgstr "Motsatt"
-#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
-#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: functions.php:3958 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:165
#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Ingen"
-#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
+#: functions.php:3966 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Handlinger..."
-#: functions.php:3951
+#: functions.php:3971
msgid "Selection toggle:"
msgstr "Marker utvalg:"
-#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
+#: functions.php:3973 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Favoritter"
-#: functions.php:3954
+#: functions.php:3974
msgid "Published"
msgstr "Publisert"
-#: functions.php:3956
+#: functions.php:3976
msgid "Mark as read:"
msgstr "Marker som lest:"
-#: functions.php:3957 mobile/functions.php:578
+#: functions.php:3977 mobile/functions.php:578
msgid "Selection"
msgstr "Utvalg"
-#: functions.php:3959 mobile/functions.php:580
+#: functions.php:3979 mobile/functions.php:580
msgid "Entire feed"
msgstr "Hele nyhetsstrømmen"
-#: functions.php:3963
+#: functions.php:3983
#, fuzzy
msgid "Assign label:"
msgstr "Tildel stikkord"
-#: functions.php:4004
+#: functions.php:4024
msgid "Click to collapse category"
msgstr "Velg for å slå sammen kategorien"
-#: functions.php:4268
+#: functions.php:4290
msgid "No feeds to display."
msgstr "Ingen nyhetstrømmer å vise"
-#: functions.php:4285 mobile/functions.php:12
+#: functions.php:4307 mobile/functions.php:12
msgid "Tags"
msgstr "Stikkord"
-#: functions.php:4521
+#: functions.php:4543
msgid " - "
msgstr "-"
-#: functions.php:4545 functions.php:5220
+#: functions.php:4567 functions.php:5237
msgid "Edit tags for this article"
msgstr "Rediger stikkordene for denne artikkelen"
-#: functions.php:4553
+#: functions.php:4575
msgid "Display original article content"
msgstr "Vis opprinnelig artikkelinnhold"
-#: functions.php:4560 functions.php:5211
+#: functions.php:4582 functions.php:5228
msgid "Show article summary in new window"
msgstr "Åpne artikkelsammendraget i nytt nettleservindu"
-#: functions.php:4593 functions.php:5135
+#: functions.php:4615 functions.php:5152
msgid "unknown type"
msgstr "Ukjent type"
-#: functions.php:4599 functions.php:5141
+#: functions.php:4621 functions.php:5158
msgid "audio/mpeg"
msgstr "Lyd/mpeg"
-#: functions.php:4635 functions.php:5175
+#: functions.php:4657 functions.php:5192
msgid "Attachment:"
msgstr "Vedlegg:"
-#: functions.php:4637 functions.php:5177
+#: functions.php:4659 functions.php:5194
msgid "Attachments:"
msgstr "Vedlegg:"
-#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4679 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Lukk dette vinduet"
-#: functions.php:4713
+#: functions.php:4735
msgid "Feed not found."
msgstr "Nyhetsstrømmen ble ikke funnet"
-#: functions.php:4782 mobile/functions.php:423
+#: functions.php:4804 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -343,44 +343,44 @@ msgstr ""
"Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
"merkelappsyntaksen eller lokal konfigurasjon."
-#: functions.php:5109
+#: functions.php:5126
msgid "Click to expand article"
msgstr "Trykk for å utvide artikkel"
-#: functions.php:5246
+#: functions.php:5263
msgid "No unread articles found to display."
msgstr "Ingen uleste artikler funnet som kunne vises"
-#: functions.php:5249
+#: functions.php:5266
#, fuzzy
msgid "No updated articles found to display."
msgstr "Ingen uleste artikler funnet som kunne vises"
-#: functions.php:5252
+#: functions.php:5269
msgid "No starred articles found to display."
msgstr "Ingen markerte artikler som kan vises"
-#: functions.php:5256
+#: functions.php:5273
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5258
+#: functions.php:5275
msgid "No articles found to display."
msgstr "Ingen artikler funnet som kan vises"
-#: functions.php:5931 tt-rss.php:171
+#: functions.php:5949 tt-rss.php:171
#, fuzzy
msgid "Create label..."
msgstr "Lag merkelapp"
-#: functions.php:5944
+#: functions.php:5962
#, fuzzy
msgid "(remove)"
msgstr "Fjern"
-#: functions.php:5988
+#: functions.php:6006
msgid "no tags"
msgstr "Ingen stikkord"
@@ -1096,52 +1096,6 @@ msgstr "Lag ny konto"
msgid "Limit bandwidth usage"
msgstr "Begrens båndbreddebruken"
-#: mysql_convert_unicode.php:20 update.php:19
-msgid "Your access level is insufficient to run this script."
-msgstr "Adgangsnivået ditt er for lavt for å kjøre dette scriptet"
-
-#: mysql_convert_unicode.php:46
-msgid "MySQL Charset Updater"
-msgstr "MySQL tegnsettsoppdaterer"
-
-#: mysql_convert_unicode.php:53
-msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
-msgstr ""
-"Dette skriptet er for Tiny Tiny RSS installasjoner med MySQL i bakgrunnen"
-
-#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
-#: register.php:200 register.php:213 register.php:228 register.php:246
-#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162 modules/pref-feeds.php:865
-msgid "Return to Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: mysql_convert_unicode.php:61 update.php:102
-msgid "Please backup your database before proceeding."
-msgstr "Vennligst gjør backup av din database før du fortsetter."
-
-#: mysql_convert_unicode.php:63
-msgid ""
-"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-"\t\t\tDepending on current database charset you may experience data "
-"corruption (lost accent characters, etc.). \n"
-"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
-"php to 'utf8'."
-msgstr ""
-"Dette skriptet vil konvertere din Tiny Tiny RSS database til UTF-8. \n"
-"\t\t\tAvhengig av din nåvørende databasetegnsett kan du oppleve korrupt "
-"databaseinnhold (manglende aksenter, osv.). \n"
-"\t\t\tEtter oppdateringen må du endre <b>MYSQL_CHARSET</b> valget i config."
-"php til 'utf8'."
-
-#: mysql_convert_unicode.php:69 update.php:118
-msgid "Perform updates"
-msgstr "Utfør oppdateringene"
-
-#: mysql_convert_unicode.php:74
-msgid "Converting database..."
-msgstr "Konverterer database..."
-
#: opml.php:99 opml.php:103
msgid "OPML Utility"
msgstr "OPML-verktøy"
@@ -1213,6 +1167,12 @@ msgstr "Bruker"
msgid "New user registrations are administratively disabled."
msgstr "Nyhetsstrømsutforsker er administrativt avskrudd"
+#: register.php:155 register.php:200 register.php:213 register.php:228
+#: register.php:246 register.php:331 register.php:341 register.php:353
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
+msgid "Return to Tiny Tiny RSS"
+msgstr "Returner til Tiny Tiny RSS"
+
#: register.php:176
msgid ""
"Your temporary password will be sent to the specified email. Accounts, which "
@@ -1262,105 +1222,6 @@ msgstr ""
msgid "New user registrations are currently closed."
msgstr ""
-#: sanity_check.php:8
-msgid ""
-"<b>Fatal Error</b>: You forgot to copy \n"
-"\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
-msgstr ""
-"<b>Alvorlig feil</b>: Du har glemt å kopier \n"
-"\t\t<b>config.php-dist</b> til <b>config.php</b> og redigert den.\n"
-
-#: sanity_check.php:16
-msgid "config: your config file version is incorrect. See config.php-dist.\n"
-msgstr "Config: Konfigurasjonsfilens versjon er feil. Se config.php-dist.\n"
-
-#: sanity_check.php:20
-msgid ""
-"<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
-"\t\t\toption from config.php\n"
-msgstr ""
-"<b>Alvorlig feil</b>: RSS-bakgrunnstype er avlegs, vennligst fjern dette "
-"valget fra config.php\n"
-
-#: sanity_check.php:26
-msgid ""
-"<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
-"\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
-"them \n"
-"\t\tfrom your TT-RSS instance.\n"
-msgstr ""
-"<b>Alvorlig feil</b>: XML Import/Eksport-verktøyet (<b>xml-export.php</b>\n"
-"\t\tog <b>xml-import.php</b>) kan bli brukt ondskapsfullt. Vennligst fjern "
-"dem fra din TT-RSS-installasjon.\n"
-
-#: sanity_check.php:33
-msgid ""
-"<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tto 0 in single user mode.\n"
-msgstr ""
-"<b>Alvorlig feil</b>: Vennligst sett DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\ttil 0 i enkelbrukermodus.\n"
-
-#: sanity_check.php:39
-msgid ""
-"<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
-"\t\t\tdoesn't seem to support CURL functions."
-msgstr ""
-"<b>Alvorlig feil</b>: Du har åpnet for USE_CURL_FOR_ICONS, men din utgave av "
-"PHP \n"
-"\t\t\tser ikke ut til å støtte CURL."
-
-#: sanity_check.php:45
-msgid "config: SESSION_EXPIRE_TIME is undefined"
-msgstr "config: SESSION_EXPIRE_TIME er udefinert."
-
-#: sanity_check.php:49
-msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
-msgstr "config: SESSION_EXPIRE_TIME er for lav (mindre enn 60)"
-
-#: sanity_check.php:53
-#, fuzzy
-msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
-msgstr ""
-"Konfigurer: SESSION_EXPIRE_TIME må være høyere eller lik "
-"SESSION_COOKIE_LIFETIME"
-
-#: sanity_check.php:62
-msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
-msgstr "config: DATABASE_BACKED_SESSIONS er ukompatibelt med SINGLE_USER_MODE"
-
-#: sanity_check.php:66
-msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
-msgstr ""
-"config: DATABASE_BACKED_SESSIONS er i øyeblikket ukompatibelt i forhold til "
-"MySQL"
-
-#: sanity_check.php:70
-msgid ""
-"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
-"DIGEST_FROM_ADDRESS"
-msgstr ""
-"config: MAIL_FROM har blitt splittet fra DIGEST_FROM_NAME og "
-"DIGEST_FROM_ADDRESS"
-
-#: sanity_check.php:74
-msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
-msgstr "config: valget COUNTERS_MAX_AGE er forventet, men ikke definert"
-
-#: sanity_check.php:78
-msgid ""
-"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
-"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
-"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-msgstr ""
-"config: valget DAEMON_REFRESH_ONLY er avlegs. Vennligst fjern dette valget "
-"og les om andre måter å oppdatere nyhetsstrømmer i <a href='http://tt-rss."
-"spb.ru/trac/wiki/UpdatingFeeds'>wikien</a>."
-
-#: sanity_check.php:83
-msgid "Fatal Error"
-msgstr "Alvorlig feil"
-
#: tt-rss.php:122
msgid "Comments?"
msgstr "Kommentarer?"
@@ -1497,6 +1358,10 @@ msgstr "Oppdater"
msgid "Drag me to resize panels"
msgstr "Dra i meg for å endre størrelsen på panelene."
+#: update.php:19
+msgid "Your access level is insufficient to run this script."
+msgstr "Adgangsnivået ditt er for lavt for å kjøre dette scriptet"
+
#: update.php:44
msgid "Database Updater"
msgstr "Databaseoppdaterer"
@@ -1517,6 +1382,10 @@ msgstr ", funnet: "
msgid "Tiny Tiny RSS database is up to date."
msgstr "Tiny Tiny RSS-databasen er oppdatert"
+#: update.php:102
+msgid "Please backup your database before proceeding."
+msgstr "Vennligst gjør backup av din database før du fortsetter."
+
#: update.php:104
#, php-format
msgid ""
@@ -1526,6 +1395,10 @@ msgstr ""
"Din Tiny Tiny RSS-database trenger å oppdateres til siste utgave (<b>%d</b> "
"til <b>%d</b>)."
+#: update.php:118
+msgid "Perform updates"
+msgstr "Utfør oppdateringene"
+
#: update.php:123
msgid "Performing updates..."
msgstr "Utfører oppdateringer..."
@@ -1683,7 +1556,7 @@ msgstr "Avbryt"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
-#: modules/pref-labels.php:96 modules/pref-users.php:363
+#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1915,7 +1788,7 @@ msgid "No feed categories defined."
msgstr "Ingen kategorier ble markert"
#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-filters.php:487 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Fjern"
@@ -2092,23 +1965,45 @@ msgstr "Ingen filtre er valgt"
msgid "No matching filters found."
msgstr "Ingen filtre ble funnet."
-#: modules/pref-labels.php:66
+#: modules/pref-labels.php:100
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Laget merkelappen <b>%s</b>"
-#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:138 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Lag merkelapp"
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:203
+#, fuzzy
+msgid "Click to change color"
+msgstr "(Trykk for å endre)"
+
+#: modules/pref-labels.php:233
+#, fuzzy
+msgid "Clear colors"
+msgstr "Filtrer artikkel"
+
+#: modules/pref-labels.php:240
msgid "No labels defined."
msgstr "Ingen merkelapper er valgt"
-#: modules/pref-labels.php:177
+#: modules/pref-labels.php:242
msgid "No matching labels found."
msgstr "Ingen passende merkelapper ble funnet."
+#: modules/pref-labels.php:300
+msgid "custom color:"
+msgstr ""
+
+#: modules/pref-labels.php:301
+msgid "foreground"
+msgstr ""
+
+#: modules/pref-labels.php:302
+msgid "background"
+msgstr ""
+
#: modules/pref-prefs.php:65
msgid "Password has been changed."
msgstr "Passord har blitt endret."
@@ -2552,6 +2447,118 @@ msgstr "Match på:"
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid "MySQL Charset Updater"
+#~ msgstr "MySQL tegnsettsoppdaterer"
+
+#~ msgid ""
+#~ "This script is for Tiny Tiny RSS installations with MySQL backend only."
+#~ msgstr ""
+#~ "Dette skriptet er for Tiny Tiny RSS installasjoner med MySQL i bakgrunnen"
+
+#~ msgid ""
+#~ "This script will convert your Tiny Tiny RSS database to UTF-8. \n"
+#~ "\t\t\tDepending on current database charset you may experience data "
+#~ "corruption (lost accent characters, etc.). \n"
+#~ "\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in "
+#~ "config.php to 'utf8'."
+#~ msgstr ""
+#~ "Dette skriptet vil konvertere din Tiny Tiny RSS database til UTF-8. \n"
+#~ "\t\t\tAvhengig av din nåvørende databasetegnsett kan du oppleve korrupt "
+#~ "databaseinnhold (manglende aksenter, osv.). \n"
+#~ "\t\t\tEtter oppdateringen må du endre <b>MYSQL_CHARSET</b> valget i "
+#~ "config.php til 'utf8'."
+
+#~ msgid "Converting database..."
+#~ msgstr "Konverterer database..."
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You forgot to copy \n"
+#~ "\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
+#~ msgstr ""
+#~ "<b>Alvorlig feil</b>: Du har glemt å kopier \n"
+#~ "\t\t<b>config.php-dist</b> til <b>config.php</b> og redigert den.\n"
+
+#~ msgid ""
+#~ "config: your config file version is incorrect. See config.php-dist.\n"
+#~ msgstr "Config: Konfigurasjonsfilens versjon er feil. Se config.php-dist.\n"
+
+#~ msgid ""
+#~ "<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
+#~ "\t\t\toption from config.php\n"
+#~ msgstr ""
+#~ "<b>Alvorlig feil</b>: RSS-bakgrunnstype er avlegs, vennligst fjern dette "
+#~ "valget fra config.php\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
+#~ "\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
+#~ "them \n"
+#~ "\t\tfrom your TT-RSS instance.\n"
+#~ msgstr ""
+#~ "<b>Alvorlig feil</b>: XML Import/Eksport-verktøyet (<b>xml-export.php</"
+#~ "b>\n"
+#~ "\t\tog <b>xml-import.php</b>) kan bli brukt ondskapsfullt. Vennligst "
+#~ "fjern dem fra din TT-RSS-installasjon.\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\tto 0 in single user mode.\n"
+#~ msgstr ""
+#~ "<b>Alvorlig feil</b>: Vennligst sett DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\ttil 0 i enkelbrukermodus.\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
+#~ "\t\t\tdoesn't seem to support CURL functions."
+#~ msgstr ""
+#~ "<b>Alvorlig feil</b>: Du har åpnet for USE_CURL_FOR_ICONS, men din utgave "
+#~ "av PHP \n"
+#~ "\t\t\tser ikke ut til å støtte CURL."
+
+#~ msgid "config: SESSION_EXPIRE_TIME is undefined"
+#~ msgstr "config: SESSION_EXPIRE_TIME er udefinert."
+
+#~ msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
+#~ msgstr "config: SESSION_EXPIRE_TIME er for lav (mindre enn 60)"
+
+#, fuzzy
+#~ msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
+#~ msgstr ""
+#~ "Konfigurer: SESSION_EXPIRE_TIME må være høyere eller lik "
+#~ "SESSION_COOKIE_LIFETIME"
+
+#~ msgid ""
+#~ "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
+#~ msgstr ""
+#~ "config: DATABASE_BACKED_SESSIONS er ukompatibelt med SINGLE_USER_MODE"
+
+#~ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
+#~ msgstr ""
+#~ "config: DATABASE_BACKED_SESSIONS er i øyeblikket ukompatibelt i forhold "
+#~ "til MySQL"
+
+#~ msgid ""
+#~ "config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
+#~ "DIGEST_FROM_ADDRESS"
+#~ msgstr ""
+#~ "config: MAIL_FROM har blitt splittet fra DIGEST_FROM_NAME og "
+#~ "DIGEST_FROM_ADDRESS"
+
+#~ msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
+#~ msgstr "config: valget COUNTERS_MAX_AGE er forventet, men ikke definert"
+
+#~ msgid ""
+#~ "config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
+#~ "and read about other ways to update feeds on the <a href='http://tt-rss."
+#~ "spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+#~ msgstr ""
+#~ "config: valget DAEMON_REFRESH_ONLY er avlegs. Vennligst fjern dette "
+#~ "valget og les om andre måter å oppdatere nyhetsstrømmer i <a href='http://"
+#~ "tt-rss.spb.ru/trac/wiki/UpdatingFeeds'>wikien</a>."
+
+#~ msgid "Fatal Error"
+#~ msgstr "Alvorlig feil"
+
#~ msgid "Unknown Error"
#~ msgstr "Ukjent feil"
@@ -2632,9 +2639,6 @@ msgstr ""
#~ msgid "Stored articles"
#~ msgstr "Lagrede artikler"
-#~ msgid "(Click to change)"
-#~ msgstr "(Trykk for å endre)"
-
#~ msgid "Match "
#~ msgstr "Match"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 9ad0af966..9b7f82237 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 d9b0683bd..fa56d54d6 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-26 09:05+0300\n"
+"POT-Creation-Date: 2009-02-09 23:01+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,223 +166,223 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2808 modules/popup-dialog.php:175
+#: functions.php:2828 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Todos os feeds"
-#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
-#: functions.php:4248 modules/pref-feeds.php:1247
+#: functions.php:2857 functions.php:2896 functions.php:3285 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Não Categorizado"
-#: functions.php:2866 functions.php:3459 mobile/functions.php:33
+#: functions.php:2886 functions.php:3479 mobile/functions.php:33
msgid "Special"
msgstr "Especial"
-#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: functions.php:2888 functions.php:3314 functions.php:3481 prefs.php:129
#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr ""
-#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
+#: functions.php:2906 functions.php:3307 functions.php:4092 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr ""
-#: functions.php:2888 functions.php:3291 functions.php:4079
+#: functions.php:2908 functions.php:3311 functions.php:4099
#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr ""
-#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
+#: functions.php:2910 functions.php:3317 functions.php:4077 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr ""
-#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
+#: functions.php:2912 functions.php:3320 functions.php:4070 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Favoritos"
-#: functions.php:3251 functions.php:3253
+#: functions.php:3271 functions.php:3273
msgid "Search results"
msgstr ""
-#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
-#: functions.php:3298 functions.php:3301 functions.php:3309
+#: functions.php:3289 functions.php:3302 functions.php:3308 functions.php:3312
+#: functions.php:3318 functions.php:3321 functions.php:3329
msgid "Searched for"
msgstr ""
-#: functions.php:3929
+#: functions.php:3949
msgid "Generated feed"
msgstr ""
-#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: functions.php:3954 functions.php:5218 modules/pref-feeds.php:1028
#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:129 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401
msgid "Select:"
msgstr "Selecione:"
-#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
-#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: functions.php:3955 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:164
#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Todos"
-#: functions.php:3936 functions.php:3952 tt-rss.php:205
+#: functions.php:3956 functions.php:3972 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Não Lido"
-#: functions.php:3937 mobile/functions.php:573
+#: functions.php:3957 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(Inverso)"
-#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
-#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: functions.php:3958 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:165
#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Nenhum"
-#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
+#: functions.php:3966 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Ações..."
-#: functions.php:3951
+#: functions.php:3971
#, fuzzy
msgid "Selection toggle:"
msgstr "Seleção"
-#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
+#: functions.php:3973 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Favoritos"
-#: functions.php:3954
+#: functions.php:3974
msgid "Published"
msgstr "Publicado"
-#: functions.php:3956
+#: functions.php:3976
msgid "Mark as read:"
msgstr "Marcar como lido:"
-#: functions.php:3957 mobile/functions.php:578
+#: functions.php:3977 mobile/functions.php:578
msgid "Selection"
msgstr "Seleção"
-#: functions.php:3959 mobile/functions.php:580
+#: functions.php:3979 mobile/functions.php:580
msgid "Entire feed"
msgstr ""
-#: functions.php:3963
+#: functions.php:3983
msgid "Assign label:"
msgstr ""
-#: functions.php:4004
+#: functions.php:4024
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4268
+#: functions.php:4290
msgid "No feeds to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:4285 mobile/functions.php:12
+#: functions.php:4307 mobile/functions.php:12
msgid "Tags"
msgstr "Tags"
-#: functions.php:4521
+#: functions.php:4543
#, fuzzy
msgid " - "
msgstr " - por "
-#: functions.php:4545 functions.php:5220
+#: functions.php:4567 functions.php:5237
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4553
+#: functions.php:4575
msgid "Display original article content"
msgstr ""
-#: functions.php:4560 functions.php:5211
+#: functions.php:4582 functions.php:5228
msgid "Show article summary in new window"
msgstr ""
-#: functions.php:4593 functions.php:5135
+#: functions.php:4615 functions.php:5152
#, fuzzy
msgid "unknown type"
msgstr "Erro desconhecido"
-#: functions.php:4599 functions.php:5141
+#: functions.php:4621 functions.php:5158
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4635 functions.php:5175
+#: functions.php:4657 functions.php:5192
msgid "Attachment:"
msgstr ""
-#: functions.php:4637 functions.php:5177
+#: functions.php:4659 functions.php:5194
msgid "Attachments:"
msgstr ""
-#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4679 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Fechar esta janela"
-#: functions.php:4713
+#: functions.php:4735
msgid "Feed not found."
msgstr "Feed não encontrado."
-#: functions.php:4782 mobile/functions.php:423
+#: functions.php:4804 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5109
+#: functions.php:5126
#, fuzzy
msgid "Click to expand article"
msgstr "Favoritos"
-#: functions.php:5246
+#: functions.php:5263
#, fuzzy
msgid "No unread articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5249
+#: functions.php:5266
#, fuzzy
msgid "No updated articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5252
+#: functions.php:5269
#, fuzzy
msgid "No starred articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5256
+#: functions.php:5273
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5258
+#: functions.php:5275
#, fuzzy
msgid "No articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5931 tt-rss.php:171
+#: functions.php:5949 tt-rss.php:171
#, fuzzy
msgid "Create label..."
msgstr "Criar um usuário"
-#: functions.php:5944
+#: functions.php:5962
#, fuzzy
msgid "(remove)"
msgstr "Remover"
-#: functions.php:5988
+#: functions.php:6006
msgid "no tags"
msgstr "sem tags"
@@ -1078,46 +1078,6 @@ msgstr ""
msgid "Limit bandwidth usage"
msgstr ""
-#: mysql_convert_unicode.php:20 update.php:19
-msgid "Your access level is insufficient to run this script."
-msgstr "Seu nível de acesso é insuficiente para executar esse script."
-
-#: mysql_convert_unicode.php:46
-msgid "MySQL Charset Updater"
-msgstr ""
-
-#: mysql_convert_unicode.php:53
-msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
-msgstr ""
-
-#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
-#: register.php:200 register.php:213 register.php:228 register.php:246
-#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162 modules/pref-feeds.php:865
-msgid "Return to Tiny Tiny RSS"
-msgstr ""
-
-#: mysql_convert_unicode.php:61 update.php:102
-msgid "Please backup your database before proceeding."
-msgstr "Faça uma cópia-de-segurança de seus dados antes de prosseguir."
-
-#: mysql_convert_unicode.php:63
-msgid ""
-"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-"\t\t\tDepending on current database charset you may experience data "
-"corruption (lost accent characters, etc.). \n"
-"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
-"php to 'utf8'."
-msgstr ""
-
-#: mysql_convert_unicode.php:69 update.php:118
-msgid "Perform updates"
-msgstr ""
-
-#: mysql_convert_unicode.php:74
-msgid "Converting database..."
-msgstr ""
-
#: opml.php:99 opml.php:103
msgid "OPML Utility"
msgstr "Utilitário OPML"
@@ -1186,6 +1146,12 @@ msgstr "Usuário"
msgid "New user registrations are administratively disabled."
msgstr ""
+#: register.php:155 register.php:200 register.php:213 register.php:228
+#: register.php:246 register.php:331 register.php:341 register.php:353
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
+msgid "Return to Tiny Tiny RSS"
+msgstr ""
+
#: register.php:176
msgid ""
"Your temporary password will be sent to the specified email. Accounts, which "
@@ -1235,85 +1201,6 @@ msgstr ""
msgid "New user registrations are currently closed."
msgstr ""
-#: sanity_check.php:8
-msgid ""
-"<b>Fatal Error</b>: You forgot to copy \n"
-"\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
-msgstr ""
-
-#: sanity_check.php:16
-msgid "config: your config file version is incorrect. See config.php-dist.\n"
-msgstr ""
-"config: a versão do seu arquivo de configuração é incorreta. Veja em config."
-"php-dist.\n"
-
-#: sanity_check.php:20
-msgid ""
-"<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
-"\t\t\toption from config.php\n"
-msgstr ""
-
-#: sanity_check.php:26
-msgid ""
-"<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
-"\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
-"them \n"
-"\t\tfrom your TT-RSS instance.\n"
-msgstr ""
-
-#: sanity_check.php:33
-msgid ""
-"<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tto 0 in single user mode.\n"
-msgstr ""
-
-#: sanity_check.php:39
-msgid ""
-"<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
-"\t\t\tdoesn't seem to support CURL functions."
-msgstr ""
-
-#: sanity_check.php:45
-msgid "config: SESSION_EXPIRE_TIME is undefined"
-msgstr "config: SESSION_EXPIRE_TIME não definida"
-
-#: sanity_check.php:49
-msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
-msgstr "config: SESSION_EXPIRE_TIME é muito baixo (menor que 60)"
-
-#: sanity_check.php:53
-msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
-msgstr "config: SESSION_EXPIRE_TIME deveria ser maior ou igual"
-
-#: sanity_check.php:62
-msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
-msgstr "config: DATABASE_BACKED_SESSIONS é incompatível com SINGLE_USER_MODE"
-
-#: sanity_check.php:66
-msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
-msgstr "config: DATABASE_BACKED_SESSIONS esta atualmente quebrado com MySQL"
-
-#: sanity_check.php:70
-msgid ""
-"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
-"DIGEST_FROM_ADDRESS"
-msgstr ""
-
-#: sanity_check.php:74
-msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
-msgstr ""
-
-#: sanity_check.php:78
-msgid ""
-"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
-"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
-"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-msgstr ""
-
-#: sanity_check.php:83
-msgid "Fatal Error"
-msgstr "Erro Fatal"
-
#: tt-rss.php:122
#, fuzzy
msgid "Comments?"
@@ -1454,6 +1341,10 @@ msgstr "Atualizar"
msgid "Drag me to resize panels"
msgstr ""
+#: update.php:19
+msgid "Your access level is insufficient to run this script."
+msgstr "Seu nível de acesso é insuficiente para executar esse script."
+
#: update.php:44
msgid "Database Updater"
msgstr ""
@@ -1474,6 +1365,10 @@ msgstr ", encontrou:"
msgid "Tiny Tiny RSS database is up to date."
msgstr ""
+#: update.php:102
+msgid "Please backup your database before proceeding."
+msgstr "Faça uma cópia-de-segurança de seus dados antes de prosseguir."
+
#: update.php:104
#, php-format
msgid ""
@@ -1481,6 +1376,10 @@ msgid ""
"<b>%d</b>)."
msgstr ""
+#: update.php:118
+msgid "Perform updates"
+msgstr ""
+
#: update.php:123
msgid "Performing updates..."
msgstr ""
@@ -1626,7 +1525,7 @@ msgstr "Cancelar"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
-#: modules/pref-labels.php:96 modules/pref-users.php:363
+#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1864,7 +1763,7 @@ msgid "No feed categories defined."
msgstr ""
#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-filters.php:487 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Remover"
@@ -2042,23 +1941,45 @@ msgstr ""
msgid "No matching filters found."
msgstr ""
-#: modules/pref-labels.php:66
+#: modules/pref-labels.php:100
#, php-format
msgid "Created label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:138 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr ""
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:203
+#, fuzzy
+msgid "Click to change color"
+msgstr "Favoritos"
+
+#: modules/pref-labels.php:233
+#, fuzzy
+msgid "Clear colors"
+msgstr "Favoritos"
+
+#: modules/pref-labels.php:240
msgid "No labels defined."
msgstr ""
-#: modules/pref-labels.php:177
+#: modules/pref-labels.php:242
msgid "No matching labels found."
msgstr ""
+#: modules/pref-labels.php:300
+msgid "custom color:"
+msgstr ""
+
+#: modules/pref-labels.php:301
+msgid "foreground"
+msgstr ""
+
+#: modules/pref-labels.php:302
+msgid "background"
+msgstr ""
+
#: modules/pref-prefs.php:65
msgid "Password has been changed."
msgstr ""
@@ -2519,6 +2440,32 @@ msgstr ""
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid ""
+#~ "config: your config file version is incorrect. See config.php-dist.\n"
+#~ msgstr ""
+#~ "config: a versão do seu arquivo de configuração é incorreta. Veja em "
+#~ "config.php-dist.\n"
+
+#~ msgid "config: SESSION_EXPIRE_TIME is undefined"
+#~ msgstr "config: SESSION_EXPIRE_TIME não definida"
+
+#~ msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
+#~ msgstr "config: SESSION_EXPIRE_TIME é muito baixo (menor que 60)"
+
+#~ msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
+#~ msgstr "config: SESSION_EXPIRE_TIME deveria ser maior ou igual"
+
+#~ msgid ""
+#~ "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
+#~ msgstr ""
+#~ "config: DATABASE_BACKED_SESSIONS é incompatível com SINGLE_USER_MODE"
+
+#~ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
+#~ msgstr "config: DATABASE_BACKED_SESSIONS esta atualmente quebrado com MySQL"
+
+#~ msgid "Fatal Error"
+#~ msgstr "Erro Fatal"
+
#~ msgid "Unknown Error"
#~ msgstr "Erro desconhecido"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 12125eeb8..e51d52877 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 458efee4a..23d644b9b 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-26 09:05+0300\n"
+"POT-Creation-Date: 2009-02-09 23:01+0300\n"
"PO-Revision-Date: 2009-01-26 08:36+0400\n"
"Last-Translator: Max Kamashev <[email protected]>\n"
"Language-Team: Русский <[email protected]>\n"
@@ -175,171 +175,171 @@ msgstr ""
"неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
"конфигурацию PHP"
-#: functions.php:2808 modules/popup-dialog.php:175
+#: functions.php:2828 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Все каналы"
-#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
-#: functions.php:4248 modules/pref-feeds.php:1247
+#: functions.php:2857 functions.php:2896 functions.php:3285 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Нет категории"
-#: functions.php:2866 functions.php:3459 mobile/functions.php:33
+#: functions.php:2886 functions.php:3479 mobile/functions.php:33
msgid "Special"
msgstr "Особые"
-#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: functions.php:2888 functions.php:3314 functions.php:3481 prefs.php:129
#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Метки"
-#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
+#: functions.php:2906 functions.php:3307 functions.php:4092 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Отмеченные"
-#: functions.php:2888 functions.php:3291 functions.php:4079
+#: functions.php:2908 functions.php:3311 functions.php:4099
#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Опубликованные"
-#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
+#: functions.php:2910 functions.php:3317 functions.php:4077 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Свежие"
-#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
+#: functions.php:2912 functions.php:3320 functions.php:4070 help/3.php:57
#: mobile/functions.php:43
msgid "All articles"
msgstr "Все статьи"
-#: functions.php:3251 functions.php:3253
+#: functions.php:3271 functions.php:3273
msgid "Search results"
msgstr "Результаты поиска"
-#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
-#: functions.php:3298 functions.php:3301 functions.php:3309
+#: functions.php:3289 functions.php:3302 functions.php:3308 functions.php:3312
+#: functions.php:3318 functions.php:3321 functions.php:3329
msgid "Searched for"
msgstr "Поиск"
-#: functions.php:3929
+#: functions.php:3949
msgid "Generated feed"
msgstr "Генерировать канал"
-#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: functions.php:3954 functions.php:5218 modules/pref-feeds.php:1028
#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:129 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401
msgid "Select:"
msgstr "Выбрать:"
-#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
-#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: functions.php:3955 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:164
#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Все"
-#: functions.php:3936 functions.php:3952 tt-rss.php:205
+#: functions.php:3956 functions.php:3972 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Новые"
-#: functions.php:3937 mobile/functions.php:573
+#: functions.php:3957 mobile/functions.php:573
msgid "Invert"
msgstr "Инвертировать"
-#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
-#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: functions.php:3958 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:165
#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Ничего"
-#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
+#: functions.php:3966 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Действия..."
-#: functions.php:3951
+#: functions.php:3971
msgid "Selection toggle:"
msgstr "Переключить выбранное:"
-#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
+#: functions.php:3973 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Отмеченные"
-#: functions.php:3954
+#: functions.php:3974
msgid "Published"
msgstr "Опубликован"
-#: functions.php:3956
+#: functions.php:3976
msgid "Mark as read:"
msgstr "Пометить как прочит.:"
-#: functions.php:3957 mobile/functions.php:578
+#: functions.php:3977 mobile/functions.php:578
msgid "Selection"
msgstr "Выбранные"
-#: functions.php:3959 mobile/functions.php:580
+#: functions.php:3979 mobile/functions.php:580
msgid "Entire feed"
msgstr "Весь канал"
-#: functions.php:3963
+#: functions.php:3983
msgid "Assign label:"
msgstr "Применить метку:"
-#: functions.php:4004
+#: functions.php:4024
msgid "Click to collapse category"
msgstr "Щёлкните, чтобы развернуть категорию"
-#: functions.php:4268
+#: functions.php:4290
msgid "No feeds to display."
msgstr "Нет каналов для отображения."
-#: functions.php:4285 mobile/functions.php:12
+#: functions.php:4307 mobile/functions.php:12
msgid "Tags"
msgstr "Теги"
-#: functions.php:4521
+#: functions.php:4543
msgid " - "
msgstr " - "
-#: functions.php:4545 functions.php:5220
+#: functions.php:4567 functions.php:5237
msgid "Edit tags for this article"
msgstr "Редактировать теги статьи"
-#: functions.php:4553
+#: functions.php:4575
msgid "Display original article content"
msgstr "Показать оригинальное содержимое статьи"
-#: functions.php:4560 functions.php:5211
+#: functions.php:4582 functions.php:5228
msgid "Show article summary in new window"
msgstr "Показать детали статьи в новом окне"
-#: functions.php:4593 functions.php:5135
+#: functions.php:4615 functions.php:5152
msgid "unknown type"
msgstr "Неизвестный тип"
-#: functions.php:4599 functions.php:5141
+#: functions.php:4621 functions.php:5158
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4635 functions.php:5175
+#: functions.php:4657 functions.php:5192
msgid "Attachment:"
msgstr "Вложение:"
-#: functions.php:4637 functions.php:5177
+#: functions.php:4659 functions.php:5194
msgid "Attachments:"
msgstr "Вложения:"
-#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4679 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Закрыть это окно"
-#: functions.php:4713
+#: functions.php:4735
msgid "Feed not found."
msgstr "Канал не найден."
-#: functions.php:4782 mobile/functions.php:423
+#: functions.php:4804 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -347,23 +347,23 @@ msgstr ""
"Не могу показать канал (ошибка в запросе). Пожалуйста проверьте синтаксис "
"или локальную конфигурацию."
-#: functions.php:5109
+#: functions.php:5126
msgid "Click to expand article"
msgstr "Щёлкните чтобы развернуть статью"
-#: functions.php:5246
+#: functions.php:5263
msgid "No unread articles found to display."
msgstr "Не найдено не прочитанных статей"
-#: functions.php:5249
+#: functions.php:5266
msgid "No updated articles found to display."
msgstr "Не найдено не прочитанных статей."
-#: functions.php:5252
+#: functions.php:5269
msgid "No starred articles found to display."
msgstr "Не найдено отмеченных статей"
-#: functions.php:5256
+#: functions.php:5273
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -371,19 +371,19 @@ msgstr ""
"Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
"Действия) или используйте фильтр."
-#: functions.php:5258
+#: functions.php:5275
msgid "No articles found to display."
msgstr "Статей не найдено."
-#: functions.php:5931 tt-rss.php:171
+#: functions.php:5949 tt-rss.php:171
msgid "Create label..."
msgstr "Создать метку..."
-#: functions.php:5944
+#: functions.php:5962
msgid "(remove)"
msgstr "(удалить)"
-#: functions.php:5988
+#: functions.php:6006
msgid "no tags"
msgstr "нет тегов"
@@ -1096,52 +1096,6 @@ msgstr "Создать новый аккаунт"
msgid "Limit bandwidth usage"
msgstr "Ограничить скорость передачи"
-#: mysql_convert_unicode.php:20 update.php:19
-msgid "Your access level is insufficient to run this script."
-msgstr "В доступе отказано - недостаточный уровень привилегий."
-
-#: mysql_convert_unicode.php:46
-msgid "MySQL Charset Updater"
-msgstr "Кодировка обновлений MySQL"
-
-#: mysql_convert_unicode.php:53
-msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
-msgstr "Этот скрипт для инсталяции Tiny Tiny RSS только с MySQL бекендом."
-
-#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
-#: register.php:200 register.php:213 register.php:228 register.php:246
-#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162 modules/pref-feeds.php:865
-msgid "Return to Tiny Tiny RSS"
-msgstr "Вернуться к Tiny Tiny RSS"
-
-#: mysql_convert_unicode.php:61 update.php:102
-msgid "Please backup your database before proceeding."
-msgstr "Пожалуйста, сохраните вашу базу данных перед продолжением."
-
-#: mysql_convert_unicode.php:63
-msgid ""
-"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-"\t\t\tDepending on current database charset you may experience data "
-"corruption (lost accent characters, etc.). \n"
-"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
-"php to 'utf8'."
-msgstr ""
-"Этот скрипт переконвертирует вашу базу данных Tiny Tiny RSS в кодировку UTF-"
-"8. \n"
-"\t\t\tЗависит от текущей кодировки базы данных и может испортить данные "
-"(потерянные символы знака ударения, умляуты, и т.д.) \n"
-"\t\t\tПосле обновления, вам нужно установить опцию <b>MYSQL_CHARSET</b> в "
-"файле config.php в 'utf8'."
-
-#: mysql_convert_unicode.php:69 update.php:118
-msgid "Perform updates"
-msgstr "Применить обновления"
-
-#: mysql_convert_unicode.php:74
-msgid "Converting database..."
-msgstr "Преобразование базы данных..."
-
#: opml.php:99 opml.php:103
msgid "OPML Utility"
msgstr "Утилита OPML"
@@ -1208,6 +1162,12 @@ msgstr "Пользователи"
msgid "New user registrations are administratively disabled."
msgstr "Регистрация новых пользователей запрещена."
+#: register.php:155 register.php:200 register.php:213 register.php:228
+#: register.php:246 register.php:331 register.php:341 register.php:353
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
+msgid "Return to Tiny Tiny RSS"
+msgstr "Вернуться к Tiny Tiny RSS"
+
#: register.php:176
msgid ""
"Your temporary password will be sent to the specified email. Accounts, which "
@@ -1257,103 +1217,6 @@ msgstr "Аккаунт успешно создан."
msgid "New user registrations are currently closed."
msgstr "Регистрация новых пользователей временно закрыта."
-#: sanity_check.php:8
-msgid ""
-"<b>Fatal Error</b>: You forgot to copy \n"
-"\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
-msgstr ""
-"<b>Фатальная ошибка</b>: Вы забыли скопировать \n"
-"\t\t<b>config.php-dist</b> в <b>config.php</b> и отредактировать его.\n"
-
-#: sanity_check.php:16
-msgid "config: your config file version is incorrect. See config.php-dist.\n"
-msgstr ""
-"config: версия вашего файла конфигурации не корректна. Смотрите config.php-"
-"dist.\n"
-
-#: sanity_check.php:20
-msgid ""
-"<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
-"\t\t\toption from config.php\n"
-msgstr ""
-"<b>Фатальная ошибка</b>: RSS_BACKEND_TYPE устарел. Пожалуйста удалите эту\n"
-"\t\t\tопцию из config.php\n"
-
-#: sanity_check.php:26
-msgid ""
-"<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
-"\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
-"them \n"
-"\t\tfrom your TT-RSS instance.\n"
-msgstr ""
-"<b>Фатальная ошибка</b>: Инструменты Импорта/Экспорта XML (<b>xml-export."
-"php</b>\n"
-"\t\tи <b>xml-import.php</b>) могут использоваться злоумышленниками. "
-"Пожалуйста удалите их \n"
-"\t\tиз вашей копии TT-RSS.\n"
-
-#: sanity_check.php:33
-msgid ""
-"<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tto 0 in single user mode.\n"
-msgstr ""
-"<b>Фатальная Ошибка</b>: Пожалуйста установите DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tна 0 в однопользовательском режиме.\n"
-
-#: sanity_check.php:39
-msgid ""
-"<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
-"\t\t\tdoesn't seem to support CURL functions."
-msgstr ""
-"<b>Фатальная Ошибка</b>: Вы разрешили USE_CURL_FOR_ICONS, но ваша версия "
-"PHP \n"
-"\t\t\tне поддерживает CURL фунции."
-
-#: sanity_check.php:45
-msgid "config: SESSION_EXPIRE_TIME is undefined"
-msgstr "config: SESSION_EXPIRE_TIME не определена"
-
-#: sanity_check.php:49
-msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
-msgstr "config: SESSION_EXPIRE_TIME очень мала (меньше 60)"
-
-#: sanity_check.php:53
-msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
-msgstr "config: SESSION_EXPIRE_TIME должна быть больше или равна"
-
-#: sanity_check.php:62
-msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
-msgstr "config: DATABASE_BACKED_SESSIONS не совместим с SINGLE_USER_MODE"
-
-#: sanity_check.php:66
-msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
-msgstr "config: DATABASE_BACKED_SESSIONS не правильно работает с MySQL"
-
-#: sanity_check.php:70
-msgid ""
-"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
-"DIGEST_FROM_ADDRESS"
-msgstr ""
-"config: MAIL_FROM будет разделено на DIGEST_FROM_NAME и DIGEST_FROM_ADDRESS"
-
-#: sanity_check.php:74
-msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
-msgstr "config: опция COUNTERS_MAX_AGE ожидается, но не определена"
-
-#: sanity_check.php:78
-msgid ""
-"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
-"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
-"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-msgstr ""
-"config: опция DAEMON_REFRESH_ONLY устарела. Пожалуйста удалите эту опцию и "
-"прочитайте о других способах обновления каналов в <a href='http://tt-rss.spb."
-"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-
-#: sanity_check.php:83
-msgid "Fatal Error"
-msgstr "Фатальная Ошибка"
-
#: tt-rss.php:122
msgid "Comments?"
msgstr "Комментарии?"
@@ -1481,6 +1344,10 @@ msgstr "Обновить"
msgid "Drag me to resize panels"
msgstr "Потяни за меня для изменения размера панелей"
+#: update.php:19
+msgid "Your access level is insufficient to run this script."
+msgstr "В доступе отказано - недостаточный уровень привилегий."
+
#: update.php:44
msgid "Database Updater"
msgstr "Обновление базы данных"
@@ -1501,6 +1368,10 @@ msgstr ", найдена: "
msgid "Tiny Tiny RSS database is up to date."
msgstr "Tiny Tiny RSS база данных обновлена."
+#: update.php:102
+msgid "Please backup your database before proceeding."
+msgstr "Пожалуйста, сохраните вашу базу данных перед продолжением."
+
#: update.php:104
#, php-format
msgid ""
@@ -1510,6 +1381,10 @@ msgstr ""
"Вашей базе данных Tiny Tiny RSS необходимо обновиться до последней версии "
"(<b>%d</b> до <b>%d</b>)."
+#: update.php:118
+msgid "Perform updates"
+msgstr "Применить обновления"
+
#: update.php:123
msgid "Performing updates..."
msgstr "Идет обновление..."
@@ -1662,7 +1537,7 @@ msgstr "Отмена"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
-#: modules/pref-labels.php:96 modules/pref-users.php:363
+#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1892,7 +1767,7 @@ msgid "No feed categories defined."
msgstr "Категории отсутствуют."
#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-filters.php:487 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "Удалить"
@@ -2066,23 +1941,45 @@ msgstr "Фильтры отсутствуют."
msgid "No matching filters found."
msgstr "Не найдено совпадений с фильтром."
-#: modules/pref-labels.php:66
+#: modules/pref-labels.php:100
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Добавлена метка <b>%s</b>"
-#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:138 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Создать метку"
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:203
+#, fuzzy
+msgid "Click to change color"
+msgstr "(Щёлкните для изменения)"
+
+#: modules/pref-labels.php:233
+#, fuzzy
+msgid "Clear colors"
+msgstr "Очистить статьи"
+
+#: modules/pref-labels.php:240
msgid "No labels defined."
msgstr "Метки отсутствуют."
-#: modules/pref-labels.php:177
+#: modules/pref-labels.php:242
msgid "No matching labels found."
msgstr "Не найдено совпадений с метками."
+#: modules/pref-labels.php:300
+msgid "custom color:"
+msgstr ""
+
+#: modules/pref-labels.php:301
+msgid "foreground"
+msgstr ""
+
+#: modules/pref-labels.php:302
+msgid "background"
+msgstr ""
+
#: modules/pref-prefs.php:65
msgid "Password has been changed."
msgstr "Пароль был изменен."
@@ -2518,6 +2415,116 @@ msgstr "Соответствие:"
msgid "Internal error: Function not implemented"
msgstr "Внутренняя ошибка: Функция не реализована"
+#~ msgid "MySQL Charset Updater"
+#~ msgstr "Кодировка обновлений MySQL"
+
+#~ msgid ""
+#~ "This script is for Tiny Tiny RSS installations with MySQL backend only."
+#~ msgstr "Этот скрипт для инсталяции Tiny Tiny RSS только с MySQL бекендом."
+
+#~ msgid ""
+#~ "This script will convert your Tiny Tiny RSS database to UTF-8. \n"
+#~ "\t\t\tDepending on current database charset you may experience data "
+#~ "corruption (lost accent characters, etc.). \n"
+#~ "\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in "
+#~ "config.php to 'utf8'."
+#~ msgstr ""
+#~ "Этот скрипт переконвертирует вашу базу данных Tiny Tiny RSS в кодировку "
+#~ "UTF-8. \n"
+#~ "\t\t\tЗависит от текущей кодировки базы данных и может испортить данные "
+#~ "(потерянные символы знака ударения, умляуты, и т.д.) \n"
+#~ "\t\t\tПосле обновления, вам нужно установить опцию <b>MYSQL_CHARSET</b> в "
+#~ "файле config.php в 'utf8'."
+
+#~ msgid "Converting database..."
+#~ msgstr "Преобразование базы данных..."
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You forgot to copy \n"
+#~ "\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
+#~ msgstr ""
+#~ "<b>Фатальная ошибка</b>: Вы забыли скопировать \n"
+#~ "\t\t<b>config.php-dist</b> в <b>config.php</b> и отредактировать его.\n"
+
+#~ msgid ""
+#~ "config: your config file version is incorrect. See config.php-dist.\n"
+#~ msgstr ""
+#~ "config: версия вашего файла конфигурации не корректна. Смотрите config."
+#~ "php-dist.\n"
+
+#~ msgid ""
+#~ "<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
+#~ "\t\t\toption from config.php\n"
+#~ msgstr ""
+#~ "<b>Фатальная ошибка</b>: RSS_BACKEND_TYPE устарел. Пожалуйста удалите "
+#~ "эту\n"
+#~ "\t\t\tопцию из config.php\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
+#~ "\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
+#~ "them \n"
+#~ "\t\tfrom your TT-RSS instance.\n"
+#~ msgstr ""
+#~ "<b>Фатальная ошибка</b>: Инструменты Импорта/Экспорта XML (<b>xml-export."
+#~ "php</b>\n"
+#~ "\t\tи <b>xml-import.php</b>) могут использоваться злоумышленниками. "
+#~ "Пожалуйста удалите их \n"
+#~ "\t\tиз вашей копии TT-RSS.\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\tto 0 in single user mode.\n"
+#~ msgstr ""
+#~ "<b>Фатальная Ошибка</b>: Пожалуйста установите DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\tна 0 в однопользовательском режиме.\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
+#~ "\t\t\tdoesn't seem to support CURL functions."
+#~ msgstr ""
+#~ "<b>Фатальная Ошибка</b>: Вы разрешили USE_CURL_FOR_ICONS, но ваша версия "
+#~ "PHP \n"
+#~ "\t\t\tне поддерживает CURL фунции."
+
+#~ msgid "config: SESSION_EXPIRE_TIME is undefined"
+#~ msgstr "config: SESSION_EXPIRE_TIME не определена"
+
+#~ msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
+#~ msgstr "config: SESSION_EXPIRE_TIME очень мала (меньше 60)"
+
+#~ msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
+#~ msgstr "config: SESSION_EXPIRE_TIME должна быть больше или равна"
+
+#~ msgid ""
+#~ "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
+#~ msgstr "config: DATABASE_BACKED_SESSIONS не совместим с SINGLE_USER_MODE"
+
+#~ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
+#~ msgstr "config: DATABASE_BACKED_SESSIONS не правильно работает с MySQL"
+
+#~ msgid ""
+#~ "config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
+#~ "DIGEST_FROM_ADDRESS"
+#~ msgstr ""
+#~ "config: MAIL_FROM будет разделено на DIGEST_FROM_NAME и "
+#~ "DIGEST_FROM_ADDRESS"
+
+#~ msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
+#~ msgstr "config: опция COUNTERS_MAX_AGE ожидается, но не определена"
+
+#~ msgid ""
+#~ "config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
+#~ "and read about other ways to update feeds on the <a href='http://tt-rss."
+#~ "spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+#~ msgstr ""
+#~ "config: опция DAEMON_REFRESH_ONLY устарела. Пожалуйста удалите эту опцию "
+#~ "и прочитайте о других способах обновления каналов в <a href='http://tt-"
+#~ "rss.spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+
+#~ msgid "Fatal Error"
+#~ msgstr "Фатальная Ошибка"
+
#~ msgid ""
#~ "This program requires XmlHttpRequest to function properly. Your browser "
#~ "doesn't seem to support it."
@@ -2639,9 +2646,6 @@ msgstr "Внутренняя ошибка: Функция не реализов�
#~ msgid "Stored articles"
#~ msgstr "Сохранённые статьи"
-#~ msgid "(Click to change)"
-#~ msgstr "(Щёлкните для изменения)"
-
#~ msgid "Match "
#~ msgstr "Соответствие"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index e110c0af3..7b52bfe2d 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 1bd2ebd9b..0ae76080c 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-26 09:05+0300\n"
+"POT-Creation-Date: 2009-02-09 23:01+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,227 +162,227 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2808 modules/popup-dialog.php:175
+#: functions.php:2828 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "所有feed"
-#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
-#: functions.php:4248 modules/pref-feeds.php:1247
+#: functions.php:2857 functions.php:2896 functions.php:3285 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "未分类"
-#: functions.php:2866 functions.php:3459 mobile/functions.php:33
+#: functions.php:2886 functions.php:3479 mobile/functions.php:33
msgid "Special"
msgstr "专用"
-#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: functions.php:2888 functions.php:3314 functions.php:3481 prefs.php:129
#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "标记"
-#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
+#: functions.php:2906 functions.php:3307 functions.php:4092 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "星级文章"
-#: functions.php:2888 functions.php:3291 functions.php:4079
+#: functions.php:2908 functions.php:3311 functions.php:4099
#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "已发布文章"
-#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
+#: functions.php:2910 functions.php:3317 functions.php:4077 help/3.php:58
#: mobile/functions.php:52
#, fuzzy
msgid "Fresh articles"
msgstr "星级文章"
-#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
+#: functions.php:2912 functions.php:3320 functions.php:4070 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "所有文章"
-#: functions.php:3251 functions.php:3253
+#: functions.php:3271 functions.php:3273
msgid "Search results"
msgstr "搜索结果"
-#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
-#: functions.php:3298 functions.php:3301 functions.php:3309
+#: functions.php:3289 functions.php:3302 functions.php:3308 functions.php:3312
+#: functions.php:3318 functions.php:3321 functions.php:3329
msgid "Searched for"
msgstr "搜索"
-#: functions.php:3929
+#: functions.php:3949
msgid "Generated feed"
msgstr "产生feed"
-#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: functions.php:3954 functions.php:5218 modules/pref-feeds.php:1028
#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:129 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401
msgid "Select:"
msgstr "选择:"
-#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
-#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: functions.php:3955 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:164
#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "所有"
-#: functions.php:3936 functions.php:3952 tt-rss.php:205
+#: functions.php:3956 functions.php:3972 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "未读"
-#: functions.php:3937 mobile/functions.php:573
+#: functions.php:3957 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(逆)"
-#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
-#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: functions.php:3958 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:165
#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "无"
-#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
+#: functions.php:3966 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "激活..."
-#: functions.php:3951
+#: functions.php:3971
#, fuzzy
msgid "Selection toggle:"
msgstr "选择:"
-#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
+#: functions.php:3973 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "星级"
-#: functions.php:3954
+#: functions.php:3974
msgid "Published"
msgstr "已发布"
-#: functions.php:3956
+#: functions.php:3976
msgid "Mark as read:"
msgstr "标记为已读:"
-#: functions.php:3957 mobile/functions.php:578
+#: functions.php:3977 mobile/functions.php:578
msgid "Selection"
msgstr "选择:"
-#: functions.php:3959 mobile/functions.php:580
+#: functions.php:3979 mobile/functions.php:580
msgid "Entire feed"
msgstr "输入feed"
-#: functions.php:3963
+#: functions.php:3983
#, fuzzy
msgid "Assign label:"
msgstr "指定标签"
-#: functions.php:4004
+#: functions.php:4024
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4268
+#: functions.php:4290
msgid "No feeds to display."
msgstr "无feed显示。"
-#: functions.php:4285 mobile/functions.php:12
+#: functions.php:4307 mobile/functions.php:12
msgid "Tags"
msgstr "标签"
-#: functions.php:4521
+#: functions.php:4543
#, fuzzy
msgid " - "
msgstr ", 由 - "
-#: functions.php:4545 functions.php:5220
+#: functions.php:4567 functions.php:5237
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4553
+#: functions.php:4575
#, fuzzy
msgid "Display original article content"
msgstr "显示最近文章时间"
-#: functions.php:4560 functions.php:5211
+#: functions.php:4582 functions.php:5228
#, fuzzy
msgid "Show article summary in new window"
msgstr "新窗口打开文章连结"
-#: functions.php:4593 functions.php:5135
+#: functions.php:4615 functions.php:5152
#, fuzzy
msgid "unknown type"
msgstr "未知错误"
-#: functions.php:4599 functions.php:5141
+#: functions.php:4621 functions.php:5158
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4635 functions.php:5175
+#: functions.php:4657 functions.php:5192
msgid "Attachment:"
msgstr ""
-#: functions.php:4637 functions.php:5177
+#: functions.php:4659 functions.php:5194
msgid "Attachments:"
msgstr ""
-#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: functions.php:4679 modules/help.php:22 modules/popup-dialog.php:52
#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "关闭此窗口"
-#: functions.php:4713
+#: functions.php:4735
msgid "Feed not found."
msgstr "未找到Feed."
-#: functions.php:4782 mobile/functions.php:423
+#: functions.php:4804 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
-#: functions.php:5109
+#: functions.php:5126
#, fuzzy
msgid "Click to expand article"
msgstr "星级文章"
-#: functions.php:5246
+#: functions.php:5263
#, fuzzy
msgid "No unread articles found to display."
msgstr "未找到文章。"
-#: functions.php:5249
+#: functions.php:5266
#, fuzzy
msgid "No updated articles found to display."
msgstr "未找到文章。"
-#: functions.php:5252
+#: functions.php:5269
#, fuzzy
msgid "No starred articles found to display."
msgstr "未找到文章。"
-#: functions.php:5256
+#: functions.php:5273
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5258
+#: functions.php:5275
#, fuzzy
msgid "No articles found to display."
msgstr "未找到文章。"
-#: functions.php:5931 tt-rss.php:171
+#: functions.php:5949 tt-rss.php:171
#, fuzzy
msgid "Create label..."
msgstr "创建标记"
-#: functions.php:5944
+#: functions.php:5962
#, fuzzy
msgid "(remove)"
msgstr "移除"
-#: functions.php:5988
+#: functions.php:6006
msgid "no tags"
msgstr "无标签"
@@ -1094,47 +1094,6 @@ msgstr ""
msgid "Limit bandwidth usage"
msgstr ""
-#: mysql_convert_unicode.php:20 update.php:19
-msgid "Your access level is insufficient to run this script."
-msgstr "权限不足。"
-
-#: mysql_convert_unicode.php:46
-msgid "MySQL Charset Updater"
-msgstr ""
-
-#: mysql_convert_unicode.php:53
-msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
-msgstr ""
-
-#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
-#: register.php:200 register.php:213 register.php:228 register.php:246
-#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162 modules/pref-feeds.php:865
-msgid "Return to Tiny Tiny RSS"
-msgstr "返回Tiny Tiny RSS"
-
-#: mysql_convert_unicode.php:61 update.php:102
-msgid "Please backup your database before proceeding."
-msgstr ""
-
-#: mysql_convert_unicode.php:63
-msgid ""
-"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-"\t\t\tDepending on current database charset you may experience data "
-"corruption (lost accent characters, etc.). \n"
-"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
-"php to 'utf8'."
-msgstr ""
-
-#: mysql_convert_unicode.php:69 update.php:118
-msgid "Perform updates"
-msgstr "完成更新"
-
-#: mysql_convert_unicode.php:74
-#, fuzzy
-msgid "Converting database..."
-msgstr "转换标签"
-
#: opml.php:99 opml.php:103
msgid "OPML Utility"
msgstr "通用OPML"
@@ -1202,6 +1161,12 @@ msgstr "用户"
msgid "New user registrations are administratively disabled."
msgstr "Feed 浏览器有限制"
+#: register.php:155 register.php:200 register.php:213 register.php:228
+#: register.php:246 register.php:331 register.php:341 register.php:353
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
+msgid "Return to Tiny Tiny RSS"
+msgstr "返回Tiny Tiny RSS"
+
#: register.php:176
msgid ""
"Your temporary password will be sent to the specified email. Accounts, which "
@@ -1251,92 +1216,6 @@ msgstr ""
msgid "New user registrations are currently closed."
msgstr ""
-#: sanity_check.php:8
-msgid ""
-"<b>Fatal Error</b>: You forgot to copy \n"
-"\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
-msgstr ""
-"<b>致命错误</b>: 您没有将 \n"
-"\t\t<b>config.php-dist</b> 修改为 <b>config.php</b>并编辑 。\n"
-
-#: sanity_check.php:16
-msgid "config: your config file version is incorrect. See config.php-dist.\n"
-msgstr "设置: 您的设置文件未被接受,请参考config.php-dist文件.\n"
-
-#: sanity_check.php:20
-msgid ""
-"<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
-"\t\t\toption from config.php\n"
-msgstr ""
-"<b>致命错误</b>: 不支持RSS_BACKEND_TYPE 请从 config.php中关闭或移除此项\n"
-
-#: sanity_check.php:26
-msgid ""
-"<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
-"\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
-"them \n"
-"\t\tfrom your TT-RSS instance.\n"
-msgstr ""
-"<b>致命错误</b>: XML 导入/导出工具(<b>xml-export.php</b>\n"
-"\t\t和 <b>xml-import.php</b>) 被恶意使用。请从您的TT-RSS中关闭或移除这些"
-"项。\n"
-
-#: sanity_check.php:33
-msgid ""
-"<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
-"\t\t\tto 0 in single user mode.\n"
-msgstr ""
-"<b>致命错误</b>:在单用户模式下,请设置DAEMON_UPDATE_LOGIN_LIMIT\t\t\t为0。\n"
-
-#: sanity_check.php:39
-msgid ""
-"<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
-"\t\t\tdoesn't seem to support CURL functions."
-msgstr ""
-"<b>致命错误</b>: 您开启了 USE_CURL_FOR_ICONS, 但是您的PHP \n"
-"\t\t\t貌似不支持CURL 功能."
-
-#: sanity_check.php:45
-msgid "config: SESSION_EXPIRE_TIME is undefined"
-msgstr "设置: SESSION_EXPIRE_TIME 未定义。"
-
-#: sanity_check.php:49
-msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
-msgstr "设置: SESSION_EXPIRE_TIME 过低(低于60)"
-
-#: sanity_check.php:53
-msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
-msgstr "设置: SESSION_EXPIRE_TIME 应高于或等于"
-
-#: sanity_check.php:62
-msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
-msgstr "设置: DATABASE_BACKED_SESSIONS 与 SINGLE_USER_MODE冲突。"
-
-#: sanity_check.php:66
-msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
-msgstr "设置: DATABASE_BACKED_SESSIONS 受到 MySQL 影响"
-
-#: sanity_check.php:70
-msgid ""
-"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
-"DIGEST_FROM_ADDRESS"
-msgstr ""
-
-#: sanity_check.php:74
-msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
-msgstr ""
-
-#: sanity_check.php:78
-msgid ""
-"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
-"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
-"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-msgstr ""
-
-#: sanity_check.php:83
-msgid "Fatal Error"
-msgstr "致命错误"
-
#: tt-rss.php:122
#, fuzzy
msgid "Comments?"
@@ -1479,6 +1358,10 @@ msgstr "更新"
msgid "Drag me to resize panels"
msgstr ""
+#: update.php:19
+msgid "Your access level is insufficient to run this script."
+msgstr "权限不足。"
+
#: update.php:44
msgid "Database Updater"
msgstr "数据库更新"
@@ -1499,6 +1382,10 @@ msgstr ",找到"
msgid "Tiny Tiny RSS database is up to date."
msgstr "Tiny Tiny RSS 数据库是最新版。"
+#: update.php:102
+msgid "Please backup your database before proceeding."
+msgstr ""
+
#: update.php:104
#, php-format
msgid ""
@@ -1506,6 +1393,10 @@ msgid ""
"<b>%d</b>)."
msgstr "您的 Tiny Tiny RSS 数据库需要升级到 (<b>%d</b> to <b>%d</b>)."
+#: update.php:118
+msgid "Perform updates"
+msgstr "完成更新"
+
#: update.php:123
msgid "Performing updates..."
msgstr "更新完成中..."
@@ -1662,7 +1553,7 @@ msgstr "取消"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
-#: modules/pref-labels.php:96 modules/pref-users.php:363
+#: modules/pref-labels.php:130 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1903,7 +1794,7 @@ msgid "No feed categories defined."
msgstr "未定义feed分类"
#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-filters.php:487 modules/pref-labels.php:225
#: modules/pref-users.php:474
msgid "Remove"
msgstr "移除"
@@ -2088,24 +1979,46 @@ msgstr "未定义过滤器。"
msgid "No matching filters found."
msgstr "未找到文章。"
-#: modules/pref-labels.php:66
+#: modules/pref-labels.php:100
#, php-format
msgid "Created label <b>%s</b>"
msgstr "创建标记 <b>%s</b>"
-#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:138 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "创建标记"
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:203
+#, fuzzy
+msgid "Click to change color"
+msgstr "星级文章"
+
+#: modules/pref-labels.php:233
+#, fuzzy
+msgid "Clear colors"
+msgstr "过滤文章"
+
+#: modules/pref-labels.php:240
msgid "No labels defined."
msgstr "未定义标记."
-#: modules/pref-labels.php:177
+#: modules/pref-labels.php:242
#, fuzzy
msgid "No matching labels found."
msgstr "未找到文章。"
+#: modules/pref-labels.php:300
+msgid "custom color:"
+msgstr ""
+
+#: modules/pref-labels.php:301
+msgid "foreground"
+msgstr ""
+
+#: modules/pref-labels.php:302
+msgid "background"
+msgstr ""
+
#: modules/pref-prefs.php:65
msgid "Password has been changed."
msgstr "密码已更改."
@@ -2574,6 +2487,70 @@ msgstr "匹配:"
msgid "Internal error: Function not implemented"
msgstr ""
+#, fuzzy
+#~ msgid "Converting database..."
+#~ msgstr "转换标签"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You forgot to copy \n"
+#~ "\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
+#~ msgstr ""
+#~ "<b>致命错误</b>: 您没有将 \n"
+#~ "\t\t<b>config.php-dist</b> 修改为 <b>config.php</b>并编辑 。\n"
+
+#~ msgid ""
+#~ "config: your config file version is incorrect. See config.php-dist.\n"
+#~ msgstr "设置: 您的设置文件未被接受,请参考config.php-dist文件.\n"
+
+#~ msgid ""
+#~ "<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
+#~ "\t\t\toption from config.php\n"
+#~ msgstr ""
+#~ "<b>致命错误</b>: 不支持RSS_BACKEND_TYPE 请从 config.php中关闭或移除此项\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
+#~ "\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
+#~ "them \n"
+#~ "\t\tfrom your TT-RSS instance.\n"
+#~ msgstr ""
+#~ "<b>致命错误</b>: XML 导入/导出工具(<b>xml-export.php</b>\n"
+#~ "\t\t和 <b>xml-import.php</b>) 被恶意使用。请从您的TT-RSS中关闭或移除这些"
+#~ "项。\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
+#~ "\t\t\tto 0 in single user mode.\n"
+#~ msgstr ""
+#~ "<b>致命错误</b>:在单用户模式下,请设置DAEMON_UPDATE_LOGIN_LIMIT\t\t\t为"
+#~ "0。\n"
+
+#~ msgid ""
+#~ "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
+#~ "\t\t\tdoesn't seem to support CURL functions."
+#~ msgstr ""
+#~ "<b>致命错误</b>: 您开启了 USE_CURL_FOR_ICONS, 但是您的PHP \n"
+#~ "\t\t\t貌似不支持CURL 功能."
+
+#~ msgid "config: SESSION_EXPIRE_TIME is undefined"
+#~ msgstr "设置: SESSION_EXPIRE_TIME 未定义。"
+
+#~ msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
+#~ msgstr "设置: SESSION_EXPIRE_TIME 过低(低于60)"
+
+#~ msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
+#~ msgstr "设置: SESSION_EXPIRE_TIME 应高于或等于"
+
+#~ msgid ""
+#~ "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
+#~ msgstr "设置: DATABASE_BACKED_SESSIONS 与 SINGLE_USER_MODE冲突。"
+
+#~ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
+#~ msgstr "设置: DATABASE_BACKED_SESSIONS 受到 MySQL 影响"
+
+#~ msgid "Fatal Error"
+#~ msgstr "致命错误"
+
#~ msgid "Unknown Error"
#~ msgstr "未知错误"