diff options
22 files changed, 536 insertions, 683 deletions
diff --git a/.docker/app/updater.sh b/.docker/app/updater.sh index ab0de0bce..5fdddd1d1 100644 --- a/.docker/app/updater.sh +++ b/.docker/app/updater.sh @@ -30,4 +30,4 @@ while [ ! -s $DST_DIR/config.php -a -e $DST_DIR/.app_is_ready ]; do sleep 3 done -sudo -E -u app /usr/bin/php83 /var/www/html/tt-rss/update_daemon2.php +sudo -E -u app /usr/bin/php83 /var/www/html/tt-rss/update_daemon2.php "$@" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1f8f8859..ec53804c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,15 @@ stages: - lint - build + - push - test - publish variables: ESLINT_PATHS: js plugins REGISTRY_PROJECT: cthulhoo + IMAGE_TAR_FPM: image-fpm.tar + IMAGE_TAR_WEB: image-web.tar include: - project: 'ci/ci-templates' @@ -14,6 +17,9 @@ include: file: .ci-build-docker-kaniko.yml - project: 'ci/ci-templates' ref: master + file: .ci-registry-push.yml + - project: 'ci/ci-templates' + ref: master file: .ci-lint-common.yml - project: 'ci/ci-templates' ref: master @@ -33,25 +39,45 @@ eslint: phpstan: extends: .phpstan -ttrss-web-nginx:branch: - extends: .build-branch +ttrss-fpm-pgsql-static:build: + extends: .build-docker-kaniko-no-push variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile + IMAGE_TAR: ${IMAGE_TAR_FPM} -ttrss-fpm-pgsql-static:branch: - extends: .build-branch +ttrss-fpm-pgsql-static:push-master-commit-only: + extends: .crane-image-registry-push-master-commit-only variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile + IMAGE_TAR: ${IMAGE_TAR_FPM} + needs: + - job: ttrss-fpm-pgsql-static:build -ttrss-web-nginx: - extends: .build-master-commit-only +ttrss-fpm-pgsql-static:push-branch: + extends: .crane-image-registry-push-branch + variables: + IMAGE_TAR: ${IMAGE_TAR_FPM} + needs: + - job: ttrss-fpm-pgsql-static:build + +ttrss-web-nginx:build: + extends: .build-docker-kaniko-no-push variables: DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile + IMAGE_TAR: ${IMAGE_TAR_WEB} -ttrss-fpm-pgsql-static: - extends: .build-master-commit-only +ttrss-web-nginx:push-master-commit-only: + extends: .crane-image-registry-push-master-commit-only variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile + IMAGE_TAR: ${IMAGE_TAR_WEB} + needs: + - job: ttrss-web-nginx:build + +ttrss-web-nginx:push-branch: + extends: .crane-image-registry-push-branch + variables: + IMAGE_TAR: ${IMAGE_TAR_WEB} + needs: + - job: ttrss-web-nginx:build phpdoc: image: ${PHP_IMAGE} @@ -103,19 +129,68 @@ selenium: reports: junit: selenium-report.xml +ttrss-fpm-pgsql-static:publish: + stage: publish + extends: .crane-image-registry-push-master + variables: + IMAGE_TAR: ${IMAGE_TAR_FPM} + needs: + - job: ttrss-fpm-pgsql-static:build + - job: phpunit-integration + - job: selenium + +ttrss-fpm-pgsql-static:publish-docker-hub: + stage: publish + extends: .crane-image-registry-push-master-docker-hub + variables: + IMAGE_TAR: ${IMAGE_TAR_FPM} + needs: + - job: ttrss-fpm-pgsql-static:build + - job: phpunit-integration + - job: selenium + +ttrss-fpm-pgsql-static:publish-gitlab: + stage: publish + extends: .crane-image-registry-push-master-gitlab + variables: + IMAGE_TAR: ${IMAGE_TAR_FPM} + needs: + - job: ttrss-fpm-pgsql-static:build + - job: phpunit-integration + - job: selenium + ttrss-web-nginx:publish: stage: publish - extends: .build-master + extends: .crane-image-registry-push-master variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile + IMAGE_TAR: ${IMAGE_TAR_WEB} + needs: + - job: ttrss-web-nginx:build + - job: phpunit-integration + - job: selenium -ttrss-fpm-pgsql-static:publish: +ttrss-web-nginx:publish-docker-hub: stage: publish - extends: .build-master + extends: .crane-image-registry-push-master-docker-hub variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile + IMAGE_TAR: ${IMAGE_TAR_WEB} + needs: + - job: ttrss-web-nginx:build + - job: phpunit-integration + - job: selenium + +ttrss-web-nginx:publish-gitlab: + stage: publish + extends: .crane-image-registry-push-master-gitlab + variables: + IMAGE_TAR: ${IMAGE_TAR_WEB} + needs: + - job: ttrss-web-nginx:build + - job: phpunit-integration + - job: selenium update-demo: + stage: publish extends: .update-helm-imagetag variables: CHART_REPO: gitlab.fakecake.org/git/helm-charts/tt-rss.git @@ -123,9 +198,9 @@ update-demo: ACCESS_TOKEN: ${DEMO_HELM_TOKEN} rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $DEMO_HELM_TOKEN != null - stage: publish update-prod: + stage: publish extends: .update-helm-imagetag variables: CHART_REPO: gitlab.fakecake.org/git/helm-charts/tt-rss-prod.git @@ -133,4 +208,3 @@ update-prod: ACCESS_TOKEN: ${PROD_HELM_TOKEN} rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $PROD_HELM_TOKEN != null - stage: publish diff --git a/classes/Config.php b/classes/Config.php index e6e19ba09..d28a259c9 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -121,6 +121,9 @@ class Config { /** max concurrent update jobs forking update daemon starts */ const DAEMON_MAX_JOBS = "DAEMON_MAX_JOBS"; + /** log level for update daemon */ + const DAEMON_LOG_LEVEL = "DAEMON_LOG_LEVEL"; + /** How long to wait for response when requesting feed from a site (seconds) */ const FEED_FETCH_TIMEOUT = "FEED_FETCH_TIMEOUT"; @@ -229,12 +232,13 @@ class Config { Config::T_STRING ], Config::DAEMON_MAX_CHILD_RUNTIME => [ 1800, Config::T_INT ], Config::DAEMON_MAX_JOBS => [ 2, Config::T_INT ], + Config::DAEMON_LOG_LEVEL => [ Debug::LOG_NORMAL, Config::T_INT ], Config::FEED_FETCH_TIMEOUT => [ 45, Config::T_INT ], Config::FEED_FETCH_NO_CACHE_TIMEOUT => [ 15, Config::T_INT ], Config::FILE_FETCH_TIMEOUT => [ 45, Config::T_INT ], Config::FILE_FETCH_CONNECT_TIMEOUT => [ 15, Config::T_INT ], Config::DAEMON_UPDATE_LOGIN_LIMIT => [ 30, Config::T_INT ], - Config::DAEMON_FEED_LIMIT => [ 500, Config::T_INT ], + Config::DAEMON_FEED_LIMIT => [ 50, Config::T_INT ], Config::DAEMON_SLEEP_INTERVAL => [ 120, Config::T_INT ], Config::MAX_CACHE_FILE_SIZE => [ 64*1024*1024, Config::T_INT ], Config::MAX_DOWNLOAD_FILE_SIZE => [ 16*1024*1024, Config::T_INT ], diff --git a/classes/RSSUtils.php b/classes/RSSUtils.php index 68cbfd26a..0ba2d18c4 100644 --- a/classes/RSSUtils.php +++ b/classes/RSSUtils.php @@ -79,14 +79,40 @@ class RSSUtils { $pdo = Db::pdo(); + $feeds_in_the_future = ORM::for_table('ttrss_feeds') + ->where_raw("last_updated > NOW() OR last_update_started > NOW()") + ->limit(25) + ->find_many(); + + if (count($feeds_in_the_future) > 0) { + Debug::log("found feeds (limit 25) with update times in the future (current server time: ".date("Y-m-d H:i:s", time())."):"); + foreach ($feeds_in_the_future as $feed) { + Debug::log("=> {$feed->feed_url} (ID: {$feed->id}, U: {$feed->owner_uid}): last updated {$feed->last_updated}, update started: {$feed->last_update_started}"); + } + } + if (!Config::get(Config::SINGLE_USER_MODE) && Config::get(Config::DAEMON_UPDATE_LOGIN_LIMIT) > 0) { $login_limit = (int) Config::get(Config::DAEMON_UPDATE_LOGIN_LIMIT); if (Config::get(Config::DB_TYPE) == "pgsql") { $login_thresh_qpart = "AND last_login >= NOW() - INTERVAL '$login_limit days'"; + $not_logged_in_users_query = "last_login < NOW() - INTERVAL '$login_limit days'"; } else { $login_thresh_qpart = "AND last_login >= DATE_SUB(NOW(), INTERVAL $login_limit DAY)"; + $not_logged_in_users_query = "last_login < DATE_SUB(NOW(), INTERVAL $login_limit DAY)"; + } + + $not_logged_in_users = ORM::for_table('ttrss_users') + ->where_raw($not_logged_in_users_query) + ->find_many(); + + if (count($not_logged_in_users) > 0) { + Debug::log("feeds will not be updated for these users because of DAEMON_UPDATE_LOGIN_LIMIT check ({$login_limit} days):"); + foreach ($not_logged_in_users as $user) { + Debug::log("=> {$user->login}, last logged in: {$user->last_login}"); + } } + } else { $login_thresh_qpart = ""; } @@ -148,7 +174,7 @@ class RSSUtils { $updstart_thresh_qpart $query_order $query_limit"; - //print "$query\n"; + Debug::log("base feed query: $query", Debug::LOG_EXTENDED); $res = $pdo->query($query); @@ -189,7 +215,7 @@ class RSSUtils { $update_limit_qpart ORDER BY f.id $query_limit"; - //print "$user_query\n"; + Debug::log("per-user feed query: $user_query", Debug::LOG_EXTENDED); // since we have feed xml cached, we can deal with other feeds with the same url $usth = $pdo->prepare($user_query); diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo Binary files differindex d0d7387b4..91c22ef88 100644 --- a/locale/de_DE/LC_MESSAGES/messages.mo +++ b/locale/de_DE/LC_MESSAGES/messages.mo diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po index 7f10ee28c..ca4be51c2 100644 --- a/locale/de_DE/LC_MESSAGES/messages.po +++ b/locale/de_DE/LC_MESSAGES/messages.po @@ -12,16 +12,16 @@ msgstr "" "Project-Id-Version: tt-rss git\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-06-15 14:03+0300\n" -"PO-Revision-Date: 2022-12-28 09:33+0000\n" -"Last-Translator: Eike <[email protected]>\n" -"Language-Team: German <https://weblate.tt-rss.org/projects/tt-rss/messages/" -"de/>\n" +"PO-Revision-Date: 2024-06-21 18:09+0000\n" +"Last-Translator: Patrick Ahles <[email protected]>\n" +"Language-Team: German <https://hosted.weblate.org/projects/tt-rss/webui/de/>" +"\n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.15\n" +"X-Generator: Weblate 5.6-rc\n" "X-Poedit-Bookmarks: -1,557,558,-1,-1,-1,-1,-1,-1,-1\n" #: backend.php:65 @@ -213,10 +213,8 @@ msgid "Search..." msgstr "Suchen..." #: index.php:265 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds..." -msgstr "Suche %s..." +msgstr "Suche Feeds..." #: index.php:266 msgid "Feed actions:" @@ -257,10 +255,8 @@ msgid "Toggle widescreen mode" msgstr "Breitbild-Modus umschalten" #: index.php:278 -#, fuzzy -#| msgid "Always expand articles" msgid "Toggle expand all articles" -msgstr "Artikel immer aufklappen" +msgstr "Alle Artikel aufklappen" #: index.php:279 msgid "Other actions:" @@ -533,17 +529,15 @@ msgstr "Rasteransicht" #: classes/Pref_Prefs.php:130 msgid "On wider screens, if always expanded" -msgstr "" +msgstr "Auf breiteren Bildschirmen, falls immer aufgeklappt" #: classes/Pref_Prefs.php:131 -#, fuzzy -#| msgid "Set score" msgid "Required score" -msgstr "Bewerten" +msgstr "Benötigte Bewertung" #: classes/Pref_Prefs.php:131 msgid "Include articles with this or above score" -msgstr "" +msgstr "Einschließen Artikel mit dieser oder höheren Bewertung" #: classes/Pref_Prefs.php:233 msgid "The configuration was saved." @@ -559,7 +553,7 @@ msgstr "Vollständiger Name:" #: classes/Pref_Prefs.php:310 js/PrefUsers.js:98 msgid "E-mail:" -msgstr "E-Mail:" +msgstr "Email:" #: classes/Pref_Prefs.php:318 classes/Pref_Feeds.php:691 #: plugins/nsfw/init.php:105 plugins/note/init.php:49 @@ -801,7 +795,7 @@ msgstr "" #: classes/Mailer.php:51 #, php-format msgid "Unknown error while sending mail. Hooks tried: %d." -msgstr "" +msgstr "Unbekannter Fehler beim Mail-Versand. Ausgeführte Hooks: %d." #: classes/TimeHelper.php:8 #, php-format @@ -1608,7 +1602,7 @@ msgstr "" #: classes/Handler_Public.php:521 msgid "Email:" -msgstr "E-Mail:" +msgstr "Email:" #: classes/Handler_Public.php:529 #, php-format @@ -1742,18 +1736,12 @@ msgstr "" "verursachen, 0 deaktiviert die Prüfung." #: plugins/af_psql_trgm/init.php:196 -#, fuzzy -#| msgid "" -#| "PostgreSQL trigram extension returns string similarity as a floating " -#| "point number (0-1). Setting it too low might produce false positives, " -#| "zero disables checking." msgid "" "Setting this value too low might produce false positives, zero disables " "checking." msgstr "" -"Die PostgreSQL trigram Erweiterung liefert einen Stringähnlichkeit als " -"Fließkommazahl (0-1). Eine zu niedrige Einstellung könnte false positives " -"verursachen, 0 deaktiviert die Prüfung." +"Eine zu niedrige Einstellung könnte false positives verursachen, Null " +"deaktiviert die Prüfung." #: plugins/af_psql_trgm/init.php:202 msgid "Minimum title length:" @@ -2226,7 +2214,7 @@ msgstr "(aktiv)" #: js/PrefHelpers.js:219 msgid "(empty)" -msgstr "" +msgstr "(leer)" #: js/PrefHelpers.js:242 msgid "Activate selected profile?" @@ -2484,10 +2472,8 @@ msgid "Search syntax" msgstr "Such-Syntax" #: js/Feeds.js:716 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds" -msgstr "Suche %s..." +msgstr "Suche Feeds" #: js/PrefUsers.js:19 msgid "Please enter username:" @@ -2676,16 +2662,12 @@ msgid "Feeds with update errors" msgstr "Feeds mit Aktualisierungsfehlern" #: js/CommonDialogs.js:258 -#, fuzzy -#| msgid "Remove selected feeds?" msgid "Debug selected feeds?" -msgstr "Ausgewählte Feeds entfernen?" +msgstr "Ausgewählte Feeds debuggen?" #: js/CommonDialogs.js:259 -#, fuzzy -#| msgid "Removing selected feeds..." msgid "Opening debugger for selected feeds..." -msgstr "Ausgewählte Feeds werden entfernt..." +msgstr "Öffnen debugger für ausgewählte Feeds..." #: js/CommonDialogs.js:328 msgid "Please enter label caption:" @@ -3002,7 +2984,7 @@ msgstr "Verwendet für Wortstamm" #: js/Feeds.js:705 msgid "Show feeds matching..." -msgstr "" +msgstr "Zeige passende Feeds..." #: js/PrefUsers.js:76 msgid "Access level: " @@ -3050,10 +3032,8 @@ msgid "This feed requires authentication." msgstr "Dieser Feed erfordert Authentifizierung." #: js/CommonDialogs.js:315 -#, fuzzy -#| msgid "Edit selected feeds" msgid "Debug selected feeds" -msgstr "Bearbeite ausgewählte Feeds" +msgstr "Debug ausgewählte Feeds" #: js/CommonDialogs.js:526 msgid "Feed title" diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo Binary files differindex c918e67cf..0b2b52b19 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.mo +++ b/locale/fr_FR/LC_MESSAGES/messages.mo diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po index 082369b75..74a695ef9 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.po +++ b/locale/fr_FR/LC_MESSAGES/messages.po @@ -13,16 +13,16 @@ msgstr "" "Project-Id-Version: Tiny Tiny RSS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-06-15 14:03+0300\n" -"PO-Revision-Date: 2022-06-08 11:20+0000\n" -"Last-Translator: Glandos <[email protected]>\n" -"Language-Team: French <https://weblate.tt-rss.org/projects/tt-rss/messages/" -"fr/>\n" +"PO-Revision-Date: 2024-06-21 18:10+0000\n" +"Last-Translator: Patrick Ahles <[email protected]>\n" +"Language-Team: French <https://hosted.weblate.org/projects/tt-rss/webui/fr/>" +"\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.12.2\n" +"X-Generator: Weblate 5.6-rc\n" #: backend.php:65 msgid "Use default" @@ -213,10 +213,8 @@ msgid "Search..." msgstr "Rechercher…" #: index.php:265 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds..." -msgstr "Rechercher %s…" +msgstr "Rechercher flux…" #: index.php:266 msgid "Feed actions:" @@ -537,14 +535,12 @@ msgid "On wider screens, if always expanded" msgstr "Sur les écrans larges, si toujours étendu" #: classes/Pref_Prefs.php:131 -#, fuzzy -#| msgid "Set score" msgid "Required score" -msgstr "Changer le score" +msgstr "Score requise" #: classes/Pref_Prefs.php:131 msgid "Include articles with this or above score" -msgstr "" +msgstr "Inclure des articles avec un score égal ou supérieur" #: classes/Pref_Prefs.php:233 msgid "The configuration was saved." @@ -1747,18 +1743,12 @@ msgstr "" "faux positifs, zéro désactive la vérification." #: plugins/af_psql_trgm/init.php:196 -#, fuzzy -#| msgid "" -#| "PostgreSQL trigram extension returns string similarity as a floating " -#| "point number (0-1). Setting it too low might produce false positives, " -#| "zero disables checking." msgid "" "Setting this value too low might produce false positives, zero disables " "checking." msgstr "" -"L’extension trigram de PostgreSQL indique la similarité des chaînes à l’aide " -"d’un nombre à virgule flottante (0-1). Un réglage bas risque de donner des " -"faux positifs, zéro désactive la vérification." +"Un réglage bas risque de donner des faux positifs, zéro désactive la " +"vérification." #: plugins/af_psql_trgm/init.php:202 msgid "Minimum title length:" @@ -2490,10 +2480,8 @@ msgid "Search syntax" msgstr "Syntaxe de la recherche" #: js/Feeds.js:716 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds" -msgstr "Rechercher %s…" +msgstr "Rechercher flux" #: js/PrefUsers.js:19 msgid "Please enter username:" @@ -2683,16 +2671,12 @@ msgid "Feeds with update errors" msgstr "Flux avec des erreurs de mise à jour" #: js/CommonDialogs.js:258 -#, fuzzy -#| msgid "Remove selected feeds?" msgid "Debug selected feeds?" -msgstr "Supprimer les flux sélectionnés ?" +msgstr "Déboguer les flux sélectionnés?" #: js/CommonDialogs.js:259 -#, fuzzy -#| msgid "Removing selected feeds..." msgid "Opening debugger for selected feeds..." -msgstr "Suppression des flux sélectionnés…" +msgstr "Ouverture du débogueur pour les flux sélectionnés..." #: js/CommonDialogs.js:328 msgid "Please enter label caption:" @@ -3011,7 +2995,7 @@ msgstr "Utilisé pour la racinisation des mots" #: js/Feeds.js:705 msgid "Show feeds matching..." -msgstr "" +msgstr "Afficher les flux correspondants..." #: js/PrefUsers.js:76 msgid "Access level: " @@ -3059,10 +3043,8 @@ msgid "This feed requires authentication." msgstr "Ce flux nécessite une identification." #: js/CommonDialogs.js:315 -#, fuzzy -#| msgid "Edit selected feeds" msgid "Debug selected feeds" -msgstr "Modifier les flux sélectionnés" +msgstr "Déboguer les flux sélectionnés" #: js/CommonDialogs.js:526 msgid "Feed title" diff --git a/locale/gl/LC_MESSAGES/messages.mo b/locale/gl/LC_MESSAGES/messages.mo Binary files differindex 80cb6a91a..53b430fcb 100644 --- a/locale/gl/LC_MESSAGES/messages.mo +++ b/locale/gl/LC_MESSAGES/messages.mo diff --git a/locale/gl/LC_MESSAGES/messages.po b/locale/gl/LC_MESSAGES/messages.po index c5ec7df34..1865eb4de 100644 --- a/locale/gl/LC_MESSAGES/messages.po +++ b/locale/gl/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-06-15 14:03+0300\n" -"PO-Revision-Date: 2024-06-15 06:29+0000\n" +"PO-Revision-Date: 2024-06-20 13:09+0000\n" "Last-Translator: \"josé m.\" <[email protected]>\n" "Language-Team: Galician <https://hosted.weblate.org/projects/tt-rss/webui/gl/" ">\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.6-dev\n" +"X-Generator: Weblate 5.6-rc\n" #: backend.php:65 msgid "Use default" @@ -208,10 +208,8 @@ msgid "Search..." msgstr "Buscar..." #: index.php:265 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds..." -msgstr "Buscar %s..." +msgstr "Buscar canles..." #: index.php:266 msgid "Feed actions:" @@ -352,7 +350,7 @@ msgstr "Marcar como lido ao desprazar" #: classes/Pref_Prefs.php:102 msgid "Mark articles as read as you scroll past them" -msgstr "Marca os artigos como listos a medida que te desprazas neles" +msgstr "Marca os artigos como lidos a medida que te desprazas neles" #: classes/Pref_Prefs.php:103 msgid "Always expand articles" @@ -526,17 +524,15 @@ msgstr "Vista en grella" #: classes/Pref_Prefs.php:130 msgid "On wider screens, if always expanded" -msgstr "En pantallas máis anchas, se sempre expandido" +msgstr "En pantallas máis anchas, se sempre está estendida" #: classes/Pref_Prefs.php:131 -#, fuzzy -#| msgid "Set score" msgid "Required score" -msgstr "Establecer puntuación" +msgstr "Valoración requerida" #: classes/Pref_Prefs.php:131 msgid "Include articles with this or above score" -msgstr "" +msgstr "Incluír artigos con esta ou superior valoración" #: classes/Pref_Prefs.php:233 msgid "The configuration was saved." @@ -1189,14 +1185,10 @@ msgid "Login" msgstr "Acceso" #: classes/Pref_Users.php:255 -#, fuzzy -#| msgid "Access level: " msgid "Access level" -msgstr "Nivel de acceso: " +msgstr "Nivel de acceso" #: classes/Pref_Users.php:258 -#, fuzzy -#| msgid "Last logged in" msgid "Last login" msgstr "Última conexión" @@ -1737,18 +1729,12 @@ msgstr "" "positivos, o cero desactiva a comprobación." #: plugins/af_psql_trgm/init.php:196 -#, fuzzy -#| msgid "" -#| "PostgreSQL trigram extension returns string similarity as a floating " -#| "point number (0-1). Setting it too low might produce false positives, " -#| "zero disables checking." msgid "" "Setting this value too low might produce false positives, zero disables " "checking." msgstr "" -"A extensión PostgreSQL trigram devolve cadeas semellantes como números de " -"punto flotante (0-1). Establecer un valor demasiado baixo produce falsos " -"positivos, o cero desactiva a comprobación." +"Establecer un valor demasiado baixo podería dar falsos positivos, o cero " +"desactiva a comprobación." #: plugins/af_psql_trgm/init.php:202 msgid "Minimum title length:" @@ -2476,10 +2462,8 @@ msgid "Search syntax" msgstr "Sintaxe da busca" #: js/Feeds.js:716 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds" -msgstr "Buscar %s..." +msgstr "Buscar canles" #: js/PrefUsers.js:19 msgid "Please enter username:" @@ -2665,16 +2649,12 @@ msgid "Feeds with update errors" msgstr "Fontes con fallo na actualización" #: js/CommonDialogs.js:258 -#, fuzzy -#| msgid "Remove selected feeds?" msgid "Debug selected feeds?" -msgstr "Eliminar canles seleccionadas?" +msgstr "Depurar canles seleccionadas?" #: js/CommonDialogs.js:259 -#, fuzzy -#| msgid "Removing selected feeds..." msgid "Opening debugger for selected feeds..." -msgstr "Eliminando as canles..." +msgstr "Abrindo o depurador para as canles seleccionadas..." #: js/CommonDialogs.js:328 msgid "Please enter label caption:" @@ -2991,7 +2971,7 @@ msgstr "Utilizado para a relación entre palabras" #: js/Feeds.js:705 msgid "Show feeds matching..." -msgstr "" +msgstr "Mostrar canles que concordan..." #: js/PrefUsers.js:76 msgid "Access level: " @@ -3039,10 +3019,8 @@ msgid "This feed requires authentication." msgstr "Esta canle require autenticación." #: js/CommonDialogs.js:315 -#, fuzzy -#| msgid "Edit selected feeds" msgid "Debug selected feeds" -msgstr "Editar canles elexidas" +msgstr "Depurar canles seleccionadas" #: js/CommonDialogs.js:526 msgid "Feed title" diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo Binary files differindex 0b094096d..bb1af0d7d 100644 --- a/locale/it_IT/LC_MESSAGES/messages.mo +++ b/locale/it_IT/LC_MESSAGES/messages.mo diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po index d4e391269..1db895b2a 100644 --- a/locale/it_IT/LC_MESSAGES/messages.po +++ b/locale/it_IT/LC_MESSAGES/messages.po @@ -10,16 +10,16 @@ msgstr "" "Project-Id-Version: Tiny Tiny RSS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-06-15 14:03+0300\n" -"PO-Revision-Date: 2022-06-09 13:15+0000\n" -"Last-Translator: Dario Di Ludovico <[email protected]>\n" -"Language-Team: Italian <https://weblate.tt-rss.org/projects/tt-rss/messages/" -"it/>\n" +"PO-Revision-Date: 2024-06-16 17:09+0000\n" +"Last-Translator: Dario Di Ludovico <[email protected]>\n" +"Language-Team: Italian <https://hosted.weblate.org/projects/tt-rss/webui/it/>" +"\n" "Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.12.2\n" +"X-Generator: Weblate 5.6-dev\n" #: backend.php:65 msgid "Use default" @@ -210,10 +210,8 @@ msgid "Search..." msgstr "Cerca..." #: index.php:265 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds..." -msgstr "Cerca %s..." +msgstr "Cerca notiziari..." #: index.php:266 msgid "Feed actions:" @@ -532,14 +530,12 @@ msgid "On wider screens, if always expanded" msgstr "Su grandi schermi, se sempre espanso" #: classes/Pref_Prefs.php:131 -#, fuzzy -#| msgid "Set score" msgid "Required score" -msgstr "Imposta punteggio" +msgstr "Punteggio richiesto" #: classes/Pref_Prefs.php:131 msgid "Include articles with this or above score" -msgstr "" +msgstr "Includi articoli con questo o un punteggio superiore" #: classes/Pref_Prefs.php:233 msgid "The configuration was saved." @@ -1739,19 +1735,12 @@ msgstr "" "controllo." #: plugins/af_psql_trgm/init.php:196 -#, fuzzy -#| msgid "" -#| "PostgreSQL trigram extension returns string similarity as a floating " -#| "point number (0-1). Setting it too low might produce false positives, " -#| "zero disables checking." msgid "" "Setting this value too low might produce false positives, zero disables " "checking." msgstr "" -"L'estensione di PostgreSQL Trigram ritorna la somiglianza di stringhe " -"espressa come numero a virgola mobile (0-1). Impostare un valore troppo " -"basso può produrre dei falsi positivi, impostarlo a zero disabilita il " -"controllo." +"Impostare un valore troppo basso può produrre dei falsi positivi, impostarlo " +"a zero disabilita il controllo." #: plugins/af_psql_trgm/init.php:202 msgid "Minimum title length:" @@ -2482,10 +2471,8 @@ msgid "Search syntax" msgstr "Sintassi di ricerca" #: js/Feeds.js:716 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds" -msgstr "Cerca %s..." +msgstr "Cerca notiziari" #: js/PrefUsers.js:19 msgid "Please enter username:" @@ -2675,16 +2662,12 @@ msgid "Feeds with update errors" msgstr "Notiziari con errori di aggiornamento" #: js/CommonDialogs.js:258 -#, fuzzy -#| msgid "Remove selected feeds?" msgid "Debug selected feeds?" -msgstr "Rimuovere i notiziari selezionati?" +msgstr "Eseguire il debug dei notiziari selezionati?" #: js/CommonDialogs.js:259 -#, fuzzy -#| msgid "Removing selected feeds..." msgid "Opening debugger for selected feeds..." -msgstr "Rimuovendo i notiziari selezionati..." +msgstr "Apertura del debugger per notiziari selezionati in corso..." #: js/CommonDialogs.js:328 msgid "Please enter label caption:" @@ -3001,7 +2984,7 @@ msgstr "Usato per determinare la radice delle parole" #: js/Feeds.js:705 msgid "Show feeds matching..." -msgstr "" +msgstr "Mostra i notiziari corrispondenti..." #: js/PrefUsers.js:76 msgid "Access level: " @@ -3048,10 +3031,8 @@ msgid "This feed requires authentication." msgstr "Questo notiziario richiede l'autenticazione." #: js/CommonDialogs.js:315 -#, fuzzy -#| msgid "Edit selected feeds" msgid "Debug selected feeds" -msgstr "Modifica i notiziari selezionati" +msgstr "Esegui il debug dei notiziari selezionati" #: js/CommonDialogs.js:526 msgid "Feed title" diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo Binary files differindex 71b630d71..a0f5062ed 100644 --- a/locale/nl_NL/LC_MESSAGES/messages.mo +++ b/locale/nl_NL/LC_MESSAGES/messages.mo diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po index d952aaea3..cccd89691 100644 --- a/locale/nl_NL/LC_MESSAGES/messages.po +++ b/locale/nl_NL/LC_MESSAGES/messages.po @@ -8,16 +8,15 @@ msgstr "" "Project-Id-Version: tt-rss git\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-06-15 14:03+0300\n" -"PO-Revision-Date: 2022-08-21 07:45+0000\n" -"Last-Translator: Patrick Ahles <[email protected]>\n" -"Language-Team: Dutch <https://weblate.tt-rss.org/projects/tt-rss/messages/nl/" -">\n" +"PO-Revision-Date: 2024-06-21 18:10+0000\n" +"Last-Translator: Patrick Ahles <[email protected]>\n" +"Language-Team: Dutch <https://hosted.weblate.org/projects/tt-rss/webui/nl/>\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.13.1\n" +"X-Generator: Weblate 5.6-rc\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-Basepath: .\n" @@ -92,7 +91,7 @@ msgstr "Uitschakelen" #: backend.php:96 msgid "Read Only" -msgstr "Read Only" +msgstr "Alleen lezen" #: backend.php:97 classes/Pref_System.php:123 msgid "User" @@ -211,10 +210,8 @@ msgid "Search..." msgstr "Zoeken..." #: index.php:265 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds..." -msgstr "Zoeken %s..." +msgstr "Doorzoek feeds..." #: index.php:266 msgid "Feed actions:" @@ -534,14 +531,12 @@ msgid "On wider screens, if always expanded" msgstr "Op bredere schermen, als altijd uitgeklapt" #: classes/Pref_Prefs.php:131 -#, fuzzy -#| msgid "Set score" msgid "Required score" -msgstr "Geef score" +msgstr "Benodigde score" #: classes/Pref_Prefs.php:131 msgid "Include articles with this or above score" -msgstr "" +msgstr "Neem artikelen op met deze of hogere score" #: classes/Pref_Prefs.php:233 msgid "The configuration was saved." @@ -1738,17 +1733,11 @@ msgstr "" "controleren uit." #: plugins/af_psql_trgm/init.php:196 -#, fuzzy -#| msgid "" -#| "PostgreSQL trigram extension returns string similarity as a floating " -#| "point number (0-1). Setting it too low might produce false positives, " -#| "zero disables checking." msgid "" "Setting this value too low might produce false positives, zero disables " "checking." msgstr "" -"PostgreSQL trigram extensie geeft string overeenkomst weer als een floating " -"point nummer (0-1). Het te laag instellen geeft valse positieven, nul zet " +"Het te laag instellen van deze waarde geeft valse positieven, nul zet " "controleren uit." #: plugins/af_psql_trgm/init.php:202 @@ -2478,10 +2467,8 @@ msgid "Search syntax" msgstr "Zoeksyntax" #: js/Feeds.js:716 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds" -msgstr "Zoeken %s..." +msgstr "Doorzoek feeds" #: js/PrefUsers.js:19 msgid "Please enter username:" @@ -2669,16 +2656,12 @@ msgid "Feeds with update errors" msgstr "Feeds met update-fouten" #: js/CommonDialogs.js:258 -#, fuzzy -#| msgid "Remove selected feeds?" msgid "Debug selected feeds?" -msgstr "Geselecteerde feeds verwijderen?" +msgstr "Debug geselecteerde feeds?" #: js/CommonDialogs.js:259 -#, fuzzy -#| msgid "Removing selected feeds..." msgid "Opening debugger for selected feeds..." -msgstr "Geselecteerde feeds verwijderen..." +msgstr "Openen debugger geselecteerde feeds..." #: js/CommonDialogs.js:328 msgid "Please enter label caption:" @@ -2982,7 +2965,7 @@ msgstr "Bijlagen" #: js/Feeds.js:293 msgid "Open Preferences" -msgstr "Voorkeuren" +msgstr "Open voorkeuren" #: js/Feeds.js:636 #, javascript-format @@ -2995,7 +2978,7 @@ msgstr "Gebruikt voor woordstam" #: js/Feeds.js:705 msgid "Show feeds matching..." -msgstr "" +msgstr "Toon bijpassende feeds..." #: js/PrefUsers.js:76 msgid "Access level: " @@ -3042,10 +3025,8 @@ msgid "This feed requires authentication." msgstr "Deze feed vereist authenticatie." #: js/CommonDialogs.js:315 -#, fuzzy -#| msgid "Edit selected feeds" msgid "Debug selected feeds" -msgstr "Bewerk geselecteerde feeds" +msgstr "Debug geselecteerde feeds" #: js/CommonDialogs.js:526 msgid "Feed title" diff --git a/locale/tr_TR/LC_MESSAGES/messages.mo b/locale/tr_TR/LC_MESSAGES/messages.mo Binary files differindex 1debaf0c2..11f03f78d 100644 --- a/locale/tr_TR/LC_MESSAGES/messages.mo +++ b/locale/tr_TR/LC_MESSAGES/messages.mo diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po index c630ce334..bf1b5c7d5 100644 --- a/locale/tr_TR/LC_MESSAGES/messages.po +++ b/locale/tr_TR/LC_MESSAGES/messages.po @@ -8,15 +8,16 @@ msgstr "" "Project-Id-Version: tt-rss git\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-06-15 14:03+0300\n" -"PO-Revision-Date: 2013-12-08 20:20+0200\n" -"Last-Translator: akapar <[email protected]>\n" -"Language-Team: TURKISH <[email protected]>\n" +"PO-Revision-Date: 2024-06-24 19:09+0000\n" +"Last-Translator: Oğuz Ersen <[email protected]>\n" +"Language-Team: Turkish <https://hosted.weblate.org/projects/tt-rss/webui/tr/>" +"\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.5.4\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 5.6-rc\n" #: backend.php:65 msgid "Use default" @@ -87,14 +88,12 @@ msgid "Weekly" msgstr "Haftada bir" #: backend.php:95 classes/Pref_Feeds.php:551 classes/Pref_Feeds.php:604 -#, fuzzy msgid "Disabled" -msgstr "OTP'yi etkisizleştir" +msgstr "Devre dışı" #: backend.php:96 -#, fuzzy msgid "Read Only" -msgstr "Kullanılırlığını kontrol et" +msgstr "Salt okunur" #: backend.php:97 classes/Pref_System.php:123 msgid "User" @@ -245,7 +244,7 @@ msgstr "Okunmuş özet akışlarını görüntüle(me)" #: index.php:273 msgid "UI layout:" -msgstr "" +msgstr "Kullanıcı arayüzü düzeni:" #: index.php:274 classes/RPC.php:664 msgid "Toggle combined mode" @@ -333,7 +332,7 @@ msgstr "Gelişmiş" #: classes/Pref_Prefs.php:90 msgid "Debugging" -msgstr "" +msgstr "Hata ayıklama" #: classes/Pref_Prefs.php:96 msgid "Never apply these tags automatically (comma-separated list)." @@ -344,18 +343,16 @@ msgid "Blacklisted tags" msgstr "Kara listedeki etiketler" #: classes/Pref_Prefs.php:101 -#, fuzzy msgid "Default language" -msgstr "Öntanımlı profil" +msgstr "Öntanımlı dil" #: classes/Pref_Prefs.php:101 msgid "Used for full-text search" msgstr "" #: classes/Pref_Prefs.php:102 -#, fuzzy msgid "Mark read on scroll" -msgstr "Tüm yazıları okundu işaretle?" +msgstr "Kaydırıldığında okundu olarak işaretle" #: classes/Pref_Prefs.php:102 #, fuzzy @@ -368,9 +365,8 @@ msgid "Always expand articles" msgstr "Yazıyı genişletmek için tıklayın" #: classes/Pref_Prefs.php:104 -#, fuzzy msgid "Combined mode" -msgstr "Birleşik modu değiştir" +msgstr "Birleşik modu" #: classes/Pref_Prefs.php:104 #, fuzzy @@ -384,9 +380,8 @@ msgid "Confirm marking feeds as read" msgstr "Okundu olarak işaretlemede onay iste" #: classes/Pref_Prefs.php:106 -#, fuzzy msgid "Default update interval" -msgstr "Öntanımlı özet akışı yenileme zaman aralığı" +msgstr "Öntanımlı yenileme zaman aralığı" #: classes/Pref_Prefs.php:107 #, fuzzy @@ -394,9 +389,8 @@ msgid "Mark sent articles as read" msgstr "Tüm yazıları okundu işaretle?" #: classes/Pref_Prefs.php:108 -#, fuzzy msgid "Enable digest" -msgstr "E-posta ile özet yollamayı etkin kıl" +msgstr "Özet yollamayı etkinleştir" #: classes/Pref_Prefs.php:108 #, fuzzy @@ -406,29 +400,24 @@ msgstr "" "adresinize yollanmasını sağlar" #: classes/Pref_Prefs.php:109 -#, fuzzy msgid "Try to send around this time" -msgstr "Özetleri bu saat civarında gönder" +msgstr "Bu saat civarında göndermeyi dene" #: classes/Pref_Prefs.php:109 -#, fuzzy msgid "Time in UTC" -msgstr "Saat dilimi" +msgstr "UTC zaman diliminde saat" #: classes/Pref_Prefs.php:110 -#, fuzzy msgid "Enable API" -msgstr "OTP'yi etkinleştir" +msgstr "API'yi etkinleştir" #: classes/Pref_Prefs.php:110 -#, fuzzy msgid "Allows accessing this account through the API" -msgstr "Dış uygulamaların bu hesaba API vasıtasıyla erişimine izin verir" +msgstr "Bu hesaba API aracılığıyla erişime izin verir" #: classes/Pref_Prefs.php:111 -#, fuzzy msgid "Enable categories" -msgstr "Özet akışı kategorilerini etkinleştir" +msgstr "Kategorileri etkinleştir" #: classes/Pref_Prefs.php:112 #, fuzzy @@ -461,13 +450,12 @@ msgid "Long date format" msgstr "Uzun tarih formatı" #: classes/Pref_Prefs.php:115 -#, fuzzy msgid "" "Syntax is identical to PHP <a href='http://php.net/manual/function.date." "php'>date()</a> function." msgstr "" -"Kullanılan sözdizim PHP'deki <a href='http://php.net/manual/function.date." -"php'>date()</a> fonksiyonuna eştir." +"Söz dizimi PHP'deki <a href='http://php.net/manual/function.date." +"php'>date()</a> fonksiyonuyla aynıdır." #: classes/Pref_Prefs.php:116 #, fuzzy @@ -486,7 +474,7 @@ msgstr "Okunmamış yazıları temizle" #: classes/Pref_Prefs.php:117 msgid "<strong>days</strong> (0 disables)" -msgstr "" +msgstr "<strong>gün</strong> (0 devre dışı bırakır)" #: classes/Pref_Prefs.php:118 msgid "Purge unread articles" @@ -502,9 +490,8 @@ msgid "Show content preview in headlines" msgstr "Başlıklar listesinde yazı içeriğini göster" #: classes/Pref_Prefs.php:121 -#, fuzzy msgid "SSL client certificate" -msgstr "Güvenli oturum aç (SSL)" +msgstr "SSL istemci sertifikası" #: classes/Pref_Prefs.php:122 classes/Pref_Feeds.php:609 #: js/CommonDialogs.js:508 @@ -559,7 +546,7 @@ msgstr "Yenilemeleri kapatın" #: classes/Pref_Prefs.php:129 msgid "May increase server load" -msgstr "" +msgstr "Sunucu yükünü arttırabilir" #: classes/Pref_Prefs.php:130 #, fuzzy @@ -589,14 +576,12 @@ msgid "Your personal data has been saved." msgstr "Kişisel bilgileriniz kaydedildi." #: classes/Pref_Prefs.php:305 -#, fuzzy msgid "Full name:" -msgstr "İsim soyisim" +msgstr "Ad soyad:" #: classes/Pref_Prefs.php:310 js/PrefUsers.js:98 -#, fuzzy msgid "E-mail:" -msgstr "E-posta" +msgstr "E-posta adresi:" #: classes/Pref_Prefs.php:318 classes/Pref_Feeds.php:691 #: plugins/nsfw/init.php:105 plugins/note/init.php:49 @@ -607,19 +592,16 @@ msgid "Save" msgstr "Kaydet" #: classes/Pref_Prefs.php:367 -#, fuzzy msgid "Old password:" -msgstr "Eski şifre" +msgstr "Eski parola:" #: classes/Pref_Prefs.php:372 js/PrefUsers.js:84 -#, fuzzy msgid "New password:" -msgstr "Yeni şifre" +msgstr "Yeni parola:" #: classes/Pref_Prefs.php:377 -#, fuzzy msgid "Confirm password:" -msgstr "Şifreyi onayla" +msgstr "Parolayı onayla:" #: classes/Pref_Prefs.php:385 js/PrefUsers.js:86 msgid "Change password" @@ -633,18 +615,16 @@ msgid "" msgstr "" #: classes/Pref_Prefs.php:409 -#, fuzzy msgid "Generate password" -msgstr "Yeni internet adresi oluştur" +msgstr "Parola oluştur" #: classes/Pref_Prefs.php:415 classes/Pref_Feeds.php:950 js/PrefHelpers.js:227 msgid "Remove selected" msgstr "Seçileni kaldır" #: classes/Pref_Prefs.php:451 classes/Pref_Prefs.php:503 -#, fuzzy msgid "Your password:" -msgstr "Şifreyi onayla" +msgstr "Parolanız:" #: classes/Pref_Prefs.php:459 msgid "Disable OTP" @@ -656,7 +636,7 @@ msgstr "" #: classes/Pref_Prefs.php:508 msgid "Verification code:" -msgstr "" +msgstr "Doğrulama kodu:" #: classes/Pref_Prefs.php:516 msgid "Enable OTP" @@ -671,32 +651,28 @@ msgid "Password" msgstr "Şifre" #: classes/Pref_Prefs.php:536 -#, fuzzy msgid "App passwords" -msgstr "Eski şifre" +msgstr "Uygulama parolaları" #: classes/Pref_Prefs.php:543 -#, fuzzy msgid "Authenticator (OTP)" -msgstr "Doğrulama" +msgstr "Kimlik doğrulayıcı (OTP)" #: classes/Pref_Prefs.php:554 msgid "Some preferences are only available in default profile." msgstr "Bazı tercihler sadece öntanımlı profilde görünür." #: classes/Pref_Prefs.php:647 -#, fuzzy msgid "default" -msgstr "Varsayılan" +msgstr "öntanımlı" #: classes/Pref_Prefs.php:655 msgid "Customize" msgstr "Özelleştir" #: classes/Pref_Prefs.php:657 -#, fuzzy msgid "More themes..." -msgstr "Daha..." +msgstr "Daha fazla tema..." #: classes/Pref_Prefs.php:688 #, fuzzy @@ -713,23 +689,21 @@ msgstr "Temizle" #: classes/Pref_Prefs.php:722 classes/Pref_Prefs.php:889 #: plugins/bookmarklets/init.php:367 js/CommonDialogs.js:689 -#, fuzzy msgid "More info..." -msgstr "daha fazla bilgi" +msgstr "Daha fazla bilgi..." #: classes/Pref_Prefs.php:730 -#, fuzzy, php-format +#, php-format msgid "Current server time: %s" -msgstr "Sunucu zamanı: %s (UTC)" +msgstr "Geçerli sunucu zamanı: %s" #: classes/Pref_Prefs.php:778 msgid "Save configuration" msgstr "Konfigürasyonu kaydet" #: classes/Pref_Prefs.php:781 -#, fuzzy msgid "Save and exit" -msgstr "Yukarıdakini okundu işaretle" +msgstr "Kaydet ve çık" #: classes/Pref_Prefs.php:788 js/PrefHelpers.js:127 msgid "Manage profiles" @@ -770,30 +744,24 @@ msgid "" msgstr "" #: classes/Pref_Prefs.php:903 js/CommonFilters.js:235 -#, fuzzy msgid "More info" -msgstr "daha fazla bilgi" +msgstr "Daha fazla bilgi" #: classes/Pref_Prefs.php:906 -#, fuzzy -#| msgid "Enable selected plugins" msgid "Enable selected" -msgstr "Seçili eklentileri etkinleştir" +msgstr "Seçilenleri etkinleştir" #: classes/Pref_Prefs.php:909 msgid "Reload" -msgstr "" +msgstr "Yeniden yükle" #: classes/Pref_Prefs.php:916 -#, fuzzy -#| msgid "Perform updates" msgid "Check for updates" -msgstr "Yenilemeleri yap" +msgstr "Güncellemeleri denetle" #: classes/Pref_Prefs.php:923 -#, fuzzy msgid "Install plugin" -msgstr "Kullanıcı eklentileri" +msgstr "Eklenti kur" #: classes/Pref_Prefs.php:936 msgid "Personal data / Authentication" @@ -847,6 +815,8 @@ msgid "" "Generated password <strong>%s</strong> for %s. Please remember it for future " "reference." msgstr "" +"<strong>%s</strong> parolası %s için oluşturuldu. Lütfen ileride kullanmak " +"üzere hatırlayın." #: classes/Mailer.php:51 #, php-format @@ -856,7 +826,7 @@ msgstr "" #: classes/TimeHelper.php:8 #, php-format msgid "%d min" -msgstr "" +msgstr "%d dak" #: classes/Pref_System.php:24 msgid "Test message from tt-rss" @@ -868,34 +838,32 @@ msgstr "Yenile" #: classes/Pref_System.php:86 msgid "<<" -msgstr "" +msgstr "<<" #: classes/Pref_System.php:90 #, php-format msgid "Page %d of %d" -msgstr "" +msgstr "Sayfa %d / %d" #: classes/Pref_System.php:95 msgid ">>" -msgstr "" +msgstr ">>" #: classes/Pref_System.php:104 msgid "Severity:" -msgstr "" +msgstr "Önem derecesi:" #: classes/Pref_System.php:108 -#, fuzzy msgid "Errors" -msgstr "Hata" +msgstr "Hatalar" #: classes/Pref_System.php:109 msgid "Warnings" -msgstr "" +msgstr "Uyarılar" #: classes/Pref_System.php:110 -#, fuzzy msgid "Everything" -msgstr "Hiçbirini seçme" +msgstr "Her şey" #: classes/Pref_System.php:120 msgid "Error" @@ -914,29 +882,24 @@ msgid "Date" msgstr "Tarih" #: classes/Pref_System.php:168 -#, fuzzy msgid "Event log" -msgstr "Kayıt defterini temizle" +msgstr "Olay günlüğü" #: classes/Pref_System.php:174 -#, fuzzy -#| msgid "Save configuration" msgid "Mail configuration" -msgstr "Konfigürasyonu kaydet" +msgstr "E-posta yapılandırması" #: classes/Pref_System.php:205 msgid "To:" msgstr "Kime:" #: classes/Pref_System.php:207 -#, fuzzy msgid "Send test email" -msgstr "E-posta yolla" +msgstr "Test e-postası gönder" #: classes/Pref_System.php:213 -#, fuzzy msgid "PHP Information" -msgstr "Çalıştır" +msgstr "PHP Bilgileri" #: classes/Feeds.php:98 classes/Feeds.php:524 msgid "Feed not found." @@ -1029,7 +992,7 @@ msgstr "Özet" #: classes/Feeds.php:1549 #, php-format msgid "Incorrect search syntax: %s." -msgstr "" +msgstr "Hatalı arama söz dizimi: %s." #: classes/Feeds.php:1739 #, php-format @@ -1046,27 +1009,27 @@ msgstr[0] "(%d özet akışı)" msgstr[1] "(%d özet akışı)" #: classes/Pref_Feeds.php:549 -#, fuzzy, php-format +#, php-format msgid "(%d day)" msgid_plural "(%d days)" -msgstr[0] "(%d özet akışı)" -msgstr[1] "(%d özet akışı)" +msgstr[0] "(%d gün)" +msgstr[1] "(%d gün)" #: classes/Pref_Feeds.php:555 #, php-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d gün" +msgstr[1] "%d gün" #: classes/Pref_Feeds.php:586 msgid "Check to enable field" msgstr "Veri alanını etkinleştirmek için tıklayın" #: classes/Pref_Feeds.php:602 -#, fuzzy, php-format +#, php-format msgid "(%d days)" -msgstr "(%d özet akışı)" +msgstr "(%d gün)" #: classes/Pref_Feeds.php:607 js/CommonDialogs.js:506 msgid "Include in e-mail digest" @@ -1090,14 +1053,12 @@ msgid "Place in category:" msgstr "Kategoriye yerleştir" #: classes/Pref_Feeds.php:634 js/Feeds.js:643 js/CommonDialogs.js:562 -#, fuzzy msgid "Language:" -msgstr "Dil" +msgstr "Dil:" #: classes/Pref_Feeds.php:645 js/CommonDialogs.js:572 -#, fuzzy msgid "Update interval:" -msgstr "Öntanımlı özet akışı yenileme zaman aralığı" +msgstr "Yenileme zaman aralığı:" #: classes/Pref_Feeds.php:652 js/CommonDialogs.js:578 msgid "Article purging:" @@ -1166,24 +1127,20 @@ msgid "Add category" msgstr "Kategori ekle" #: classes/Pref_Feeds.php:985 -#, fuzzy msgid "Choose file..." -msgstr "Filtre tanımla..." +msgstr "Dosya seç..." #: classes/Pref_Feeds.php:993 -#, fuzzy msgid "Import OPML" -msgstr "OPML'imi içe aktar" +msgstr "OPML'den içe aktar" #: classes/Pref_Feeds.php:1004 msgid "Export OPML" msgstr "OPML'i dışa aktar" #: classes/Pref_Feeds.php:1009 -#, fuzzy -#| msgid "Include settings" msgid "Include tt-rss settings" -msgstr "Ayarları dahil et" +msgstr "tt-rss ayarlarını dahil et" #: classes/Pref_Feeds.php:1025 msgid "Display URL" @@ -1203,9 +1160,8 @@ msgid "OPML" msgstr "OPML" #: classes/Pref_Feeds.php:1052 -#, fuzzy msgid "Sharing" -msgstr "Paylaş" +msgstr "Paylaşım" #: classes/Pref_Users.php:56 classes/Pref_Users.php:257 msgid "Registered" @@ -1229,19 +1185,19 @@ msgid "User not found" msgstr "Kullanıcı bulunamadı" #: classes/Pref_Users.php:170 -#, fuzzy, php-format +#, php-format msgid "Added user %s with password %s" -msgstr "Kullanıcı <b>%s</b> <b>%s</b> şifresi ile eklendi" +msgstr "%s kullanıcısı %s parolasıyla eklendi" #: classes/Pref_Users.php:173 -#, fuzzy, php-format +#, php-format msgid "Could not create user %s" -msgstr "Kullanıcı <b>%s</b> tanımlanamadı" +msgstr "%s kullanıcısı oluşturulamadı" #: classes/Pref_Users.php:176 -#, fuzzy, php-format +#, php-format msgid "User %s already exists." -msgstr "Kullanıcı <b>%s</b> zaten var." +msgstr "%s kullanıcısı zaten var." #: classes/Pref_Users.php:233 msgid "Create user" @@ -1275,7 +1231,7 @@ msgstr "Düzenlemek için tıklayın" #: classes/Config.php:402 #, php-format msgid "Git error [RC=%d]: %s" -msgstr "" +msgstr "Git hatası [RC=%d]: %s" #: classes/Pref_Filters.php:211 classes/Pref_Filters.php:222 #: classes/Pref_Filters.php:442 classes/Pref_Filters.php:876 @@ -1333,9 +1289,9 @@ msgstr[0] "%s (+%d eylem)" msgstr[1] "%s (+%d eylem)" #: classes/UserHelper.php:267 -#, fuzzy, php-format +#, php-format msgid "Changed password of user %s to %s" -msgstr "<b>%s</b> kullanıcısının şifresi <b>%s</b> e değiştirildi" +msgstr "%s kullanıcısının parolası %s olarak değiştirildi" #: classes/OPML.php:31 classes/OPML.php:35 msgid "OPML Utility" @@ -1375,9 +1331,9 @@ msgid "Setting preference key %s to %s" msgstr "Tercih anahtarı %s %s'e ayarlanıyor" #: classes/OPML.php:409 -#, fuzzy, php-format +#, php-format msgid "Adding filter %s..." -msgstr "Filtre ekleniyor..." +msgstr "%s filtresi ekleniyor..." #: classes/OPML.php:568 #, php-format @@ -1400,7 +1356,7 @@ msgstr "Hata: lütfen OPML dosyasını yükleyin." #: classes/OPML.php:641 #, php-format msgid "Error: file is not readable: %s" -msgstr "" +msgstr "Hata: dosya okunabilir değil: %s" #: classes/OPML.php:667 msgid "Error while parsing document." @@ -1683,22 +1639,21 @@ msgid "Return to Tiny Tiny RSS" msgstr "Tiny Tiny RSS'e geri dön" #: classes/Handler_Public.php:509 -#, fuzzy msgid "" "You will need to provide valid account name and email. Password reset link " "will be sent to your email address." msgstr "" -"Geçerli bir kullanıcı adı ve e-posta adresi vermeniz gerekiyor. Yeni şifre e-" -"posta adresinize yollanacak." +"Geçerli bir hesap adı ve e-posta adresi belirtmeniz gerekmektedir. Parola " +"sıfırlama bağlantısı e-posta adresinize gönderilecektir." #: classes/Handler_Public.php:521 msgid "Email:" msgstr "E-posta:" #: classes/Handler_Public.php:529 -#, fuzzy, php-format +#, php-format msgid "How much is %d + %d:" -msgstr "İki kere iki kaç eder:" +msgstr "%d + %d kaç yapar:" #: classes/Handler_Public.php:546 msgid "Some of the required form parameters are missing or incorrect." @@ -1709,9 +1664,8 @@ msgid "Go back" msgstr "Geri git" #: classes/Handler_Public.php:588 -#, fuzzy msgid "[tt-rss] Password reset request" -msgstr "[tt-rss] Şifre değiştirme hatırlatması" +msgstr "[tt-rss] Parola sıfırlama isteği" #: classes/Handler_Public.php:598 msgid "Sorry, login and email combination not found." @@ -1726,9 +1680,9 @@ msgid "Database Updater" msgstr "Veritabanı Yenileyicisi" #: classes/Handler_Public.php:693 -#, fuzzy, php-format +#, php-format msgid "Performing updates to version %d" -msgstr "Yenilemeleri yap" +msgstr "%d sürümüne güncelleme yapılıyor" #: classes/Handler_Public.php:708 classes/Handler_Public.php:735 #: js/PrefHelpers.js:418 js/PrefHelpers.js:764 @@ -1736,24 +1690,21 @@ msgid "Update" msgstr "Yenileme" #: classes/Handler_Public.php:728 -#, fuzzy, php-format +#, php-format msgid "Database schema needs update to the latest version (%d to %d)." -msgstr "Tiny Tiny RSS veri yenileme komut dosyası." +msgstr "Veri tabanı şemasının en son sürüme güncellenmesi gerekiyor (%d -> %d)." #: plugins/nsfw/init.php:46 -#, fuzzy -#| msgid "Not work safe (click to toggle)" msgid "Not safe for work (click to toggle)" -msgstr "Emniyetli çalışmıyor (değiştirmek için tıklayın) " +msgstr "İş için uygun değil (değiştirmek için tıklayın)" #: plugins/nsfw/init.php:80 msgid "NSFW Plugin" msgstr "NSFW eklentisi" #: plugins/nsfw/init.php:95 -#, fuzzy msgid "Tags to consider NSFW (comma-separated):" -msgstr "NSFW için düşünülen etiketler (virgülle ayrılmış)" +msgstr "İş için uygun olmayan etiketler (virgülle ayrılmış):" #: plugins/nsfw/init.php:117 msgid "Configuration saved." @@ -1818,7 +1769,7 @@ msgstr "Tüm yazıları okundu işaretle?" #: plugins/af_psql_trgm/init.php:185 msgid "Minimum similarity:" -msgstr "" +msgstr "En düşük benzerlik:" #: plugins/af_psql_trgm/init.php:194 msgid "" @@ -1835,7 +1786,7 @@ msgstr "" #: plugins/af_psql_trgm/init.php:202 msgid "Minimum title length:" -msgstr "" +msgstr "En düşük başlık uzunluğu:" #: plugins/af_psql_trgm/init.php:212 #, fuzzy @@ -1848,7 +1799,7 @@ msgstr "" #: plugins/af_psql_trgm/init.php:251 msgid "Similarity (af_psql_trgm)" -msgstr "" +msgstr "Benzerlik (af_psql_trgm)" #: plugins/af_psql_trgm/init.php:257 #, fuzzy @@ -1958,20 +1909,16 @@ msgstr "" "Tiny Tiny RSS'i kullanarak yazılar yayınlamak için bu bookmarklet'i kullanın" #: plugins/auth_internal/init.php:93 -#, fuzzy -#| msgid "Please enter label caption:" msgid "Please enter verification code (OTP):" -msgstr "Lütfen arama başlığı altyazısı girin:" +msgstr "Lütfen doğrulama kodunu (OTP) girin:" #: plugins/auth_internal/init.php:95 -#, fuzzy -#| msgid "Content:" msgid "Continue" -msgstr "İçerik:" +msgstr "Devam et" #: plugins/auth_internal/init.php:134 msgid "Too many authentication attempts, throttled." -msgstr "" +msgstr "Çok fazla kimlik doğrulama denemesi, kısıtlandı." #: plugins/auth_internal/init.php:241 msgid "Password has been changed." @@ -1994,10 +1941,8 @@ msgid "Session failed to validate (password changed)" msgstr "Oturum doğrulanamadı (şifre değiştirildi)" #: include/sessions.php:48 -#, fuzzy -#| msgid "Session failed to validate (user agent changed)" msgid "Session failed to validate (account is disabled)" -msgstr "Oturum doğrulanamadı (kullanıcı aracısı değişti)" +msgstr "Oturum doğrulanamadı (hesap devre dışı)" #: include/sessions.php:67 msgid "Session failed to validate (user not found)" @@ -2005,7 +1950,7 @@ msgstr "Oturum doğrulanamadı (kullanıcı adı bulunamadı)" #: include/functions.php:62 msgid "Detect automatically" -msgstr "" +msgstr "Otomatik olarak algıla" #: include/login_form.php:145 msgid "I forgot my password" @@ -2025,11 +1970,11 @@ msgstr "Yazılarda resimleri göstermez, otomatik yenilemeleri azaltır." #: include/login_form.php:175 js/CommonDialogs.js:16 msgid "Safe mode" -msgstr "" +msgstr "Güvenli mod" #: include/login_form.php:180 msgid "Uses default theme and prevents all plugins from loading." -msgstr "" +msgstr "Öntanımlı temayı kullanır ve tüm eklentilerin yüklenmesini engeller." #: include/login_form.php:188 msgid "Remember me" @@ -2044,7 +1989,6 @@ msgid "Inverse" msgstr "Seçimi ters çevir" #: js/PrefFilterTree.js:136 js/PrefFilterTree.js:165 -#, fuzzy msgid "No filters selected." msgstr "Hiçbir filtre seçilmedi." @@ -2069,16 +2013,12 @@ msgid "Click to close" msgstr "Kapamak için tıklayın" #: js/CommonFilters.js:14 -#, fuzzy -#| msgid "Edit Filter" msgid "Edit filter" -msgstr "Filtreyi düzenle " +msgstr "Filtreyi düzenle" #: js/CommonFilters.js:14 -#, fuzzy -#| msgid "Create filter" msgid "Create new filter" -msgstr "Filtre tanımla" +msgstr "Yeni filtre oluştur" #: js/CommonFilters.js:45 #, java-printf-format, javascript-format @@ -2097,7 +2037,7 @@ msgstr "Bu filtreye uyan yazılar:" #: js/CommonFilters.js:84 msgid "Error while trying to get filter test results." -msgstr "" +msgstr "Filtre testi sonuçlarını almaya çalışırken hata oluştu." #: js/CommonFilters.js:96 #, fuzzy @@ -2164,9 +2104,8 @@ msgid "Cancel search" msgstr "Aramayı iptal et" #: js/Headlines.js:665 -#, fuzzy msgid "Select..." -msgstr "Seç" +msgstr "Seç..." #: js/Headlines.js:825 js/Headlines.js:879 js/Headlines.js:896 #, fuzzy @@ -2246,10 +2185,8 @@ msgstr "Arama başlığını kaldır" #: js/Headlines.js:1588 js/FeedTree.js:105 js/Headlines.js:473 #: js/Headlines.js:522 js/Headlines.js:591 -#, fuzzy -#| msgid "Open next feed" msgid "Open site" -msgstr "Sonraki özet akışına geç" +msgstr "Siteyi aç" #: js/Headlines.js:1597 js/FeedTree.js:114 #, fuzzy @@ -2272,9 +2209,8 @@ msgid "Mark feed as read" msgstr "Tüm özet akışlarını okundu işaretle" #: js/PrefHelpers.js:20 -#, fuzzy msgid "Remove selected app passwords?" -msgstr "Seçilen kategoriler kaldırılsın mı?" +msgstr "Seçilen uygulama parolaları kaldırılsın mı?" #: js/PrefHelpers.js:45 msgid "This will invalidate all previously generated feed URLs. Continue?" @@ -2291,24 +2227,20 @@ msgid "Generated URLs cleared." msgstr "Oluşturulan internet adresleri temizlendi." #: js/PrefHelpers.js:59 -#, fuzzy -#| msgid "Digest" msgid "Digest preview" -msgstr "Özet" +msgstr "Özet ön izlemesi" #: js/PrefHelpers.js:113 -#, fuzzy msgid "Clear event log?" -msgstr "Kayıt defterini temizle" +msgstr "Olay günlüğü temizlensin mi?" #: js/PrefHelpers.js:135 msgid "Name for cloned profile:" -msgstr "" +msgstr "Kopyalanan profil için ad:" #: js/PrefHelpers.js:145 -#, fuzzy msgid "Please select a single profile to clone." -msgstr "Lütfen yüklemek için bir resim dosyası seçin." +msgstr "Lütfen kopyalamak için tek bir profil seçin." #: js/PrefHelpers.js:153 msgid "" @@ -2322,7 +2254,6 @@ msgid "Removing selected profiles..." msgstr "Seçilen profiller kaldırılıyor..." #: js/PrefHelpers.js:163 -#, fuzzy msgid "No profiles selected." msgstr "Hiçbir profil seçilmedi." @@ -2336,7 +2267,7 @@ msgstr "(aktif)" #: js/PrefHelpers.js:219 msgid "(empty)" -msgstr "" +msgstr "(boş)" #: js/PrefHelpers.js:242 msgid "Activate selected profile?" @@ -2351,30 +2282,29 @@ msgid "Customize stylesheet" msgstr "Stil sayfasını biçimlendir" #: js/PrefHelpers.js:280 -#, fuzzy msgid "" "You can override colors, fonts and layout of your currently selected theme " "with custom CSS declarations here." msgstr "" -"Temanızdaki renkleri, fontları ve yerleşimi değiştirebilirsiniz. <a " -"target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> baz olarak " -"kullanılabilir." +"Seçili temanızın renklerini, yazı tiplerini ve düzenini burada özel CSS " +"bildirimleriyle değiştirebilirsiniz." #: js/PrefHelpers.js:289 msgid "" "User CSS has been applied, you might need to reload the page to see all " "changes." msgstr "" +"Kullanıcı CSS'si uygulandı, tüm değişiklikleri görmek için sayfayı yeniden " +"yüklemeniz gerekebilir." #: js/PrefHelpers.js:329 msgid "Reset to defaults?" msgstr "Öntanımlı ayarlara geri dönülsün mü?" #: js/PrefHelpers.js:373 -#, fuzzy, java-printf-format, javascript-format -#| msgid "Error while parsing document." +#, java-printf-format, javascript-format msgid "Error while loading plugins list: %s." -msgstr "Belge çözümlenirken hata oluştu." +msgstr "Eklentiler listesi yüklenirken hata oluştu: %s." #: js/PrefHelpers.js:422 msgid "Clear data" @@ -2382,58 +2312,50 @@ msgstr "Veriyi temizle" #: js/PrefHelpers.js:425 msgid "Uninstall" -msgstr "" +msgstr "Kaldır" #: js/PrefHelpers.js:437 js/PrefHelpers.js:596 msgid "Could not find any plugins for this search query." -msgstr "" +msgstr "Bu arama sorgusu için herhangi bir eklenti bulunamadı." #: js/PrefHelpers.js:444 -#, fuzzy, java-printf-format, javascript-format -#| msgid "Clear stored data for this plugin?" +#, java-printf-format, javascript-format msgid "Clear stored data for %s?" -msgstr "Bu eklenti için kaydedilmiş veriler silinsin mi?" +msgstr "%s için kayıtlı veriler temizlensin mi?" #: js/PrefHelpers.js:453 -#, fuzzy, java-printf-format, javascript-format -#| msgid "User plugins" +#, java-printf-format, javascript-format msgid "Uninstall plugin %s?" -msgstr "Kullanıcı eklentileri" +msgstr "%s eklentisi kaldırılsın mı?" #: js/PrefHelpers.js:462 -#, fuzzy -#| msgid "Registration failed." msgid "Plugin uninstallation failed." -msgstr "Kayıt işlemi başarısız oldu." +msgstr "Eklenti kaldırma başarısız oldu." #: js/PrefHelpers.js:478 -#, fuzzy msgid "Available plugins" -msgstr "Kullanıcı eklentileri" +msgstr "Kullanılabilir eklentiler" #: js/PrefHelpers.js:491 -#, fuzzy -#| msgid "Link instance" msgid "Plugin installer" -msgstr "Olgu bağlantısı ekle" +msgstr "Eklenti kurucu" #: js/PrefHelpers.js:494 -#, fuzzy, java-printf-format, javascript-format -#| msgid "Importing, please wait..." +#, java-printf-format, javascript-format msgid "Installing %s, please wait..." -msgstr "İçe aktarılıyor, lütfen bekleyin..." +msgstr "%s kuruluyor, lütfen bekleyin..." #: js/PrefHelpers.js:509 js/PrefHelpers.js:551 js/PrefHelpers.js:662 msgid "Operation failed: check event log." -msgstr "" +msgstr "İşlem başarısız oldu: olay günlüğüne bakın." #: js/PrefHelpers.js:513 msgid "Plugin has been installed." -msgstr "" +msgstr "Eklenti kuruldu." #: js/PrefHelpers.js:517 msgid "Plugin is already installed." -msgstr "" +msgstr "Eklenti zaten kurulu." #: js/PrefHelpers.js:527 js/PrefHelpers.js:679 js/PrefHelpers.js:745 #, java-printf-format, javascript-format @@ -2442,7 +2364,7 @@ msgstr "" #: js/PrefHelpers.js:576 msgid "Already installed" -msgstr "" +msgstr "Zaten kuruldu" #: js/PrefHelpers.js:587 #, fuzzy, java-printf-format, javascript-format @@ -2452,50 +2374,41 @@ msgstr "Son yenileme: %s" #: js/PrefHelpers.js:604 msgid "Looking for plugins..." -msgstr "" +msgstr "Eklentiler aranıyor..." #: js/PrefHelpers.js:623 js/PrefHelpers.js:765 msgid "Close" -msgstr "" +msgstr "Kapat" #: js/PrefHelpers.js:641 -#, fuzzy -#| msgid "User plugins" msgid "Update plugins" -msgstr "Kullanıcı eklentileri" +msgstr "Eklentileri güncelle" #: js/PrefHelpers.js:656 -#, fuzzy -#| msgid "Uploading, please wait..." msgid "Updating, please wait..." -msgstr "Yükleniyor, lütfen bekleyin..." +msgstr "Güncelleniyor, lütfen bekleyin..." #: js/PrefHelpers.js:680 -#, fuzzy -#| msgid "Update" msgid "Update done." -msgstr "Yenileme" +msgstr "Güncelleme yapıldı." #: js/PrefHelpers.js:704 -#, fuzzy msgid "No updates available" -msgstr "Yeni versiyon çıktı!" +msgstr "Güncelleme yok" #: js/PrefHelpers.js:716 #, java-printf-format, javascript-format msgid "Checking: %s" -msgstr "" +msgstr "Denetleniyor: %s" #: js/PrefHelpers.js:723 #, java-printf-format, javascript-format msgid "%s: Operation failed: check event log." -msgstr "" +msgstr "%s: İşlem başarısız oldu: olay günlüğüne bakın." #: js/PrefHelpers.js:746 -#, fuzzy -#| msgid "Ready to update." msgid "Ready to update" -msgstr "Yenileme için hazır." +msgstr "Güncellemeye hazır" #: js/PrefHelpers.js:791 msgid "Please choose an OPML file first." @@ -2562,16 +2475,16 @@ msgid "Saving article tags..." msgstr "Yazı etiketlerini kaydediyor..." #: js/Feeds.js:286 -#, fuzzy msgid "Your password is at default value" -msgstr "" -"Şifreniz öntanımlı şifre, güvenliğiniz için lütfen şifrenizi değiştirin" +msgstr "Parolanız öntanımlı değerde" #: js/Feeds.js:288 msgid "" "You are using default tt-rss password. Please change it in the Preferences " "(Personal data / Authentication)." msgstr "" +"Öntanımlı tt-rss parolasını kullanıyorsunuz. Lütfen Tercihler (Kişisel " +"veriler / Kimlik Doğrulama) bölümünden değiştirin." #: js/Feeds.js:443 msgid "Mark all articles as read?" @@ -2602,9 +2515,8 @@ msgid "Mark %w in %s as read?" msgstr "%s'deki tüm yazılar okundu işaretlensin mi?" #: js/Feeds.js:476 -#, fuzzy msgid "search results" -msgstr "Arama sonuçları: %s" +msgstr "arama sonuçları" #: js/Feeds.js:476 #, fuzzy @@ -2617,9 +2529,8 @@ msgid "Mark all articles in %s as read?" msgstr "%s'deki tüm yazılar okundu işaretlensin mi?" #: js/Feeds.js:652 -#, fuzzy msgid "Search syntax" -msgstr "Ara" +msgstr "Arama söz dizimi" #: js/Feeds.js:716 #, fuzzy @@ -2627,7 +2538,6 @@ msgid "Search feeds" msgstr "Ara..." #: js/PrefUsers.js:19 -#, fuzzy msgid "Please enter username:" msgstr "Lütfen kullanıcı adı girin:" @@ -2636,19 +2546,16 @@ msgid "Adding user..." msgstr "Kullanıcı oluşturuluyor..." #: js/PrefUsers.js:39 js/PrefUsers.js:60 -#, fuzzy msgid "Edit user" -msgstr "Kuralı düzenle" +msgstr "Kullanıcıyı düzenle" #: js/PrefUsers.js:136 js/PrefUsers.js:175 -#, fuzzy msgid "No users selected." msgstr "Hiçbir kullanıcı seçilmedi." #: js/PrefUsers.js:141 -#, fuzzy msgid "Please select one user." -msgstr "Lütfen sadece bir kullanıcı seçin." +msgstr "Lütfen bir kullanıcı seçin." #: js/PrefUsers.js:145 msgid "Reset password of selected user?" @@ -2713,7 +2620,6 @@ msgid "Removing selected categories..." msgstr "Seçilen kategoriler kaldırılıyor..." #: js/PrefFeedTree.js:276 -#, fuzzy msgid "No categories selected." msgstr "Hiçbir kategori seçilmedi." @@ -2772,6 +2678,8 @@ msgid "" "Failed to parse output. This can indicate server timeout and/or network " "issues. Backend output was logged to browser console." msgstr "" +"Çıktı ayrıştırılamadı. Bu, sunucu zaman aşımını ve/veya ağ sorunlarını " +"gösterebilir. Arka uç çıktısı tarayıcı konsoluna kaydedildi." #: js/CommonDialogs.js:150 msgid "You are already subscribed to this feed." @@ -2812,7 +2720,7 @@ msgstr "Belge çözümlenirken hata oluştu." #: js/CommonDialogs.js:200 msgid "You are not allowed to perform this operation." -msgstr "" +msgstr "Bu işlemi gerçekleştirmenize izin verilmiyor." #: js/CommonDialogs.js:222 msgid "Feeds with update errors" @@ -2848,18 +2756,16 @@ msgid "You can't edit this kind of feed." msgstr "Bu türde bir özet akışını düzenleyemezsiniz." #: js/CommonDialogs.js:398 -#, fuzzy msgid "Please select an image file." -msgstr "Lütfen yüklemek için bir resim dosyası seçin." +msgstr "Lütfen bir resim dosyası seçin." #: js/CommonDialogs.js:418 msgid "Icon file is too large." -msgstr "" +msgstr "Simge dosyası çok büyük." #: js/CommonDialogs.js:421 -#, fuzzy msgid "Upload failed." -msgstr "Yükleme tamamlandı." +msgstr "Karşıya yükleme başarısız oldu." #: js/CommonDialogs.js:451 msgid "Remove stored feed icon?" @@ -2874,9 +2780,8 @@ msgid "Feed icon removed." msgstr "Özet akışı ikonu kaldırıldı." #: js/CommonDialogs.js:622 -#, fuzzy msgid "Upload new icon..." -msgstr "Bu özet akışı için yeni bir ikon yüklensin mi?" +msgstr "Yeni simge yükle..." #: js/CommonDialogs.js:651 js/Headlines.js:642 #, fuzzy @@ -2897,15 +2802,13 @@ msgid "Could not change feed URL." msgstr "Kullanıcı <b>%s</b> tanımlanamadı" #: js/CommonDialogs.js:680 -#, fuzzy, java-printf-format, javascript-format +#, java-printf-format, javascript-format msgid "%s can be accessed via the following secret URL:" -msgstr "Bu yazıyı bu internet adresi ile paylaşabilirsiniz:" +msgstr "%s şu gizli URL aracılığıyla erişilebilir:" #: js/App.js:314 -#, fuzzy -#| msgid "Automatically expand articles in combined mode" msgid "This function is only available in combined mode." -msgstr "Birleşik modda yazıları otomatik olarak genişlet" +msgstr "Bu işlev yalnızca birleşik modda kullanılabilir." #: js/App.js:445 msgid "Keyboard shortcuts" @@ -2913,7 +2816,7 @@ msgstr "Klavye kısayolları" #: js/App.js:506 msgid "Update daemon is not running." -msgstr "" +msgstr "Güncelleme arka plan programı çalışmıyor." #: js/App.js:519 msgid "Update daemon is not updating feeds." @@ -2925,38 +2828,37 @@ msgid "" "URL scheme reported by your browser (%a) doesn't match server-configured " "SELF_URL_PATH (%b), check X-Forwarded-Proto." msgstr "" +"Tarayıcınız tarafından bildirilen URL şeması (%a) sunucu tarafından " +"yapılandırılan SELF_URL_PATH (%b) ile eşleşmiyor, X-Forwarded-Proto'yu " +"gözden geçirin." #: js/App.js:613 msgid "Fatal error" -msgstr "" +msgstr "Önemli hata" #: js/App.js:638 msgid "Unhandled exception" msgstr "" #: js/App.js:873 -#, fuzzy -#| msgid "New version of Tiny Tiny RSS is available!" msgid "Updates for Tiny Tiny RSS are available." -msgstr "Tiny Tiny RSS'in yeni versiyonu çıktı!" +msgstr "Tiny Tiny RSS için güncellemeler var." #: js/App.js:876 msgid "Updates for some local plugins are available." -msgstr "" +msgstr "Bazı yerel eklentiler için güncellemeler var." #: js/App.js:919 msgid "Widescreen is not available in combined mode." -msgstr "" +msgstr "Geniş ekran birleşik modda kullanılabilir değildir." #: js/App.js:1116 -#, fuzzy msgid "Please enable mail or mailto plugin first." -msgstr "Lütfen önce e-posta eklentisini aktif hale getirin." +msgstr "Lütfen önce e-posta veya mailto eklentisini etkinleştirin." #: js/App.js:1239 -#, fuzzy msgid "Please enable af_readability first." -msgstr "Lütfen önce e-posta eklentisini aktif hale getirin." +msgstr "Lütfen önce af_readability özelliğini etkinleştirin." #: js/App.js:1293 msgid "Please select some feed first." @@ -2972,10 +2874,8 @@ msgid "(Un)collapse" msgstr "Kenar çubuğunu aç/kapa" #: js/PrefLabelTree.js:71 -#, fuzzy -#| msgid "Edit rule" msgid "Edit label" -msgstr "Kuralı düzenle" +msgstr "Etiketi düzenle" #: js/PrefLabelTree.js:143 msgid "Foreground:" @@ -2990,9 +2890,8 @@ msgid "Reset selected labels to default colors?" msgstr "Seçilen arama başlıkları öntanımlı renklerine döndürülsün mü?" #: js/PrefLabelTree.js:202 js/PrefLabelTree.js:222 -#, fuzzy msgid "No labels selected." -msgstr "Hiçbir arama başlığı seçilmedi." +msgstr "Hiçbir etiket seçilmedi." #: js/PrefLabelTree.js:209 msgid "Remove selected labels?" @@ -3025,9 +2924,8 @@ msgid "Trying to change URL..." msgstr "İnternet adresini değiştirmeye çalışıyor..." #: plugins/share/share.js:34 -#, fuzzy msgid "Could not change URL." -msgstr "İnternet adresini değiştirmeye çalışıyor..." +msgstr "URL değiştirilemedi." #: plugins/share/share.js:42 msgid "Remove sharing for this article?" @@ -3091,7 +2989,7 @@ msgstr "Skor ata" #: js/Headlines.js:685 msgid "Delete permanently" -msgstr "" +msgstr "Kalıcı olarak sil" #: js/Headlines.js:916 msgid "" @@ -3101,63 +2999,54 @@ msgstr "" #: js/PrefHelpers.js:229 msgid "Clone" -msgstr "" +msgstr "Kopyala" #: js/PrefHelpers.js:231 -#, fuzzy -#| msgid "Activate profile" msgid "Activate" -msgstr "Profili aktifleştir" +msgstr "Etkinleştir" #: js/PrefHelpers.js:299 msgid "Apply" -msgstr "" +msgstr "Uygula" #: js/PrefHelpers.js:303 -#, fuzzy msgid "Save and reload" -msgstr "Yukarıdakini okundu işaretle" +msgstr "Kaydet ve yeniden yükle" #: js/PrefHelpers.js:352 msgid "Selected plugins have been enabled. Reload?" -msgstr "" +msgstr "Seçilen eklentiler etkinleştirildi. Yeniden yüklensin mi?" #: js/PrefHelpers.js:400 msgid "System plugins are enabled using global configuration." -msgstr "" +msgstr "Sistem eklentileri genel yapılandırma kullanılarak etkinleştirildi." #: js/PrefHelpers.js:577 -#, fuzzy msgid "Install" -msgstr "Kullanıcı eklentileri" +msgstr "Kur" #: js/PrefHelpers.js:654 -#, fuzzy -#| msgid "Uploading, please wait..." msgid "Updating..." -msgstr "Yükleniyor, lütfen bekleyin..." +msgstr "Güncelleniyor..." #: js/PrefHelpers.js:687 -#, fuzzy -#| msgid "Upload complete." msgid "Updates complete" -msgstr "Yükleme tamamlandı." +msgstr "Güncelleme tamamlandı" #: js/PrefHelpers.js:701 #, javascript-format msgid "Updates pending for %d plugin" msgid_plural "Updates pending for %d plugins" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d eklenti için güncellemeler bekliyor" +msgstr[1] "%d eklenti için güncellemeler bekliyor" #: js/Article.js:205 msgid "Attachments" msgstr "Ekler" #: js/Feeds.js:293 -#, fuzzy msgid "Open Preferences" -msgstr "Tercihler" +msgstr "Tercihleri Aç" #: js/Feeds.js:636 #, fuzzy, javascript-format @@ -3177,19 +3066,16 @@ msgid "Access level: " msgstr "Erişim seviyesi:" #: js/PrefUsers.js:92 -#, fuzzy -#| msgid "Enabled" msgid "OTP enabled" -msgstr "Etkin" +msgstr "OTP etkin" #: js/PrefUsers.js:104 msgid "User details" msgstr "Kullanıcı detayları" #: js/PrefFeedTree.js:390 -#, fuzzy msgid "Rename category to:" -msgstr "Kategoriyi kaldır" +msgstr "Kategoriyi yeniden adlandır:" #: js/PrefFeedTree.js:466 msgid "Feeds require authentication." @@ -3204,6 +3090,9 @@ msgid "" "Tiny Tiny RSS is running in safe mode. All themes and plugins are disabled. " "You will need to log out and back in to disable it." msgstr "" +"Tiny Tiny RSS güvenli modda çalışıyor. Tüm temalar ve eklentiler devre dışı " +"bırakıldı. Devre dışı bırakmak için oturumu kapatıp tekrar açmanız " +"gerekecektir." #: js/CommonDialogs.js:53 msgid "Feed or site URL" @@ -3234,14 +3123,12 @@ msgid "Feed URL" msgstr "Özet akışı internet adresi" #: js/CommonDialogs.js:552 -#, fuzzy msgid "Site URL:" -msgstr "Yazı adresi:" +msgstr "Site URL'si:" #: js/CommonDialogs.js:554 -#, fuzzy msgid "Site URL" -msgstr "Özet akışı internet adresi" +msgstr "Site URL'si" #: js/CommonDialogs.js:617 msgid "Icon" @@ -3253,7 +3140,7 @@ msgstr "" #: js/App.js:653 msgid "Additional information" -msgstr "" +msgstr "Ek bilgiler" #: js/PrefLabelTree.js:126 msgid "Caption" diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo Binary files differindex b08517da3..4ac8b2bd6 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.mo +++ b/locale/zh_CN/LC_MESSAGES/messages.mo diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 08d297948..da9369bf3 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: Tiny Tiny RSS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-06-15 14:03+0300\n" -"PO-Revision-Date: 2024-06-15 13:45+0000\n" +"PO-Revision-Date: 2024-06-16 17:09+0000\n" "Last-Translator: Ptsa Daniel <[email protected]>\n" -"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/tt-" -"rss/webui/zh_Hans/>\n" +"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" +"tt-rss/webui/zh_Hans/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -209,23 +209,21 @@ msgid "Search..." msgstr "搜索..." #: index.php:265 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds..." -msgstr "搜索 %s ..." +msgstr "搜索供稿..." #: index.php:266 msgid "Feed actions:" -msgstr "订阅源动作:" +msgstr "供稿动作:" #: index.php:267 plugins/bookmarklets/init.php:40 #: plugins/bookmarklets/init.php:75 msgid "Subscribe to feed..." -msgstr "订阅信息源..." +msgstr "订阅供稿..." #: index.php:268 msgid "Edit this feed..." -msgstr "编辑订阅源..." +msgstr "编辑供稿..." #: index.php:269 classes/Pref_Feeds.php:937 js/PrefFeedTree.js:120 #: js/CommonDialogs.js:633 @@ -234,7 +232,7 @@ msgstr "取消订阅" #: index.php:270 msgid "All feeds:" -msgstr "全部订阅源:" +msgstr "全部供稿:" #: index.php:272 msgid "(Un)hide read feeds" @@ -279,7 +277,7 @@ msgstr "退出偏好设置" #: prefs.php:148 classes/Pref_Prefs.php:46 classes/Pref_Feeds.php:123 #: classes/Pref_Feeds.php:926 msgid "Feeds" -msgstr "订阅源" +msgstr "供稿" #: prefs.php:152 classes/Pref_Filters.php:242 msgid "Filters" @@ -368,7 +366,7 @@ msgstr "将文章列表展开显示,而不是将标题和内容分别显示" #: classes/Pref_Prefs.php:105 msgid "Confirm marking feeds as read" -msgstr "标记订阅源为已读之前弹出确认" +msgstr "标记供稿为已读之前弹出确认" #: classes/Pref_Prefs.php:106 msgid "Default update interval" @@ -416,15 +414,15 @@ msgstr "小时" #: classes/Pref_Prefs.php:113 msgid "Hide read feeds" -msgstr "显示/隐藏 已读信息" +msgstr "隐藏 已读供稿" #: classes/Pref_Prefs.php:114 msgid "Always show special feeds" -msgstr "始终显示特殊订阅源" +msgstr "始终显示特殊供稿" #: classes/Pref_Prefs.php:114 msgid "While hiding read feeds" -msgstr "隐藏已读订阅源" +msgstr "隐藏已读供稿" #: classes/Pref_Prefs.php:115 msgid "Long date format" @@ -440,7 +438,7 @@ msgstr "" #: classes/Pref_Prefs.php:116 msgid "Automatically show next feed" -msgstr "自动显示下一个订阅源" +msgstr "自动显示下一个供稿" #: classes/Pref_Prefs.php:116 msgid "After marking one as read" @@ -481,11 +479,11 @@ msgstr "时区" #: classes/Pref_Prefs.php:124 msgid "Group by feed" -msgstr "分组显示订阅源" +msgstr "分组显示供稿" #: classes/Pref_Prefs.php:124 msgid "Group multiple-feed output by originating feed" -msgstr "按订阅源分组显示,不是聚合在一起" +msgstr "按供稿分组显示,不是聚合在一起" #: classes/Pref_Prefs.php:125 msgid "Language" @@ -497,7 +495,7 @@ msgstr "主题" #: classes/Pref_Prefs.php:127 msgid "Don't enforce DISTINCT headlines" -msgstr "不要强制DISTINCT 标题" +msgstr "不要强制使用不同的标题" #: classes/Pref_Prefs.php:127 msgid "May produce duplicate entries" @@ -505,7 +503,7 @@ msgstr "可能会产生重复的条目" #: classes/Pref_Prefs.php:128 msgid "Show article and feed IDs" -msgstr "显示文章和订阅源ID" +msgstr "显示文章和供稿ID" #: classes/Pref_Prefs.php:128 msgid "In the headlines buffer" @@ -528,14 +526,12 @@ msgid "On wider screens, if always expanded" msgstr "在宽屏上总是展开" #: classes/Pref_Prefs.php:131 -#, fuzzy -#| msgid "Set score" msgid "Required score" -msgstr "评分" +msgstr "所需评分" #: classes/Pref_Prefs.php:131 msgid "Include articles with this or above score" -msgstr "" +msgstr "包括此分数或以上分数的文章" #: classes/Pref_Prefs.php:233 msgid "The configuration was saved." @@ -710,8 +706,7 @@ msgid "" "The following plugins use per-feed content hooks. This may cause excessive " "data usage and origin server load resulting in a ban of your instance: " "<b>%s</b>" -msgstr "" -"以下插件使用按Feed内容挂钩。这可能会导致过多的数据使用和原始服务器负载,从而" +msgstr "以下插件使用和供稿内容挂钩。这可能会导致过多的数据使用和原始服务器负载,从而" "导致您的实例被禁:<b>%s</b>" #: classes/Pref_Prefs.php:903 js/CommonFilters.js:235 @@ -810,7 +805,7 @@ msgstr "<<" #: classes/Pref_System.php:90 #, php-format msgid "Page %d of %d" -msgstr "" +msgstr "第 %d页, 共 %d 页" #: classes/Pref_System.php:95 msgid ">>" @@ -870,7 +865,7 @@ msgstr "PHP信息" #: classes/Feeds.php:98 classes/Feeds.php:524 msgid "Feed not found." -msgstr "找不到订阅源。" +msgstr "找不到供稿。" #: classes/Feeds.php:163 msgid "Never" @@ -915,15 +910,15 @@ msgstr "暂时没有文章。" #: classes/Feeds.php:446 classes/Feeds.php:596 #, php-format msgid "Feeds last updated at %s" -msgstr "订阅源最后更新时间:%s" +msgstr "供稿最后更新时间:%s" #: classes/Feeds.php:457 classes/Feeds.php:607 msgid "Some feeds have update errors (click for details)" -msgstr "部分订阅源更新错误(点击了解详情)" +msgstr "部分供稿更新错误(点击了解详情)" #: classes/Feeds.php:585 msgid "No feed selected." -msgstr "未选择订阅源。" +msgstr "未选择供稿。" #: classes/Feeds.php:1306 msgid "Starred articles" @@ -970,7 +965,7 @@ msgstr "搜索结果:%s" #, php-format msgid "(%d feed)" msgid_plural "(%d feeds)" -msgstr[0] "(%d 个订阅源)" +msgstr[0] "(%d 个供稿)" #: classes/Pref_Feeds.php:549 #, php-format @@ -1057,19 +1052,19 @@ msgstr "取消" #: classes/Pref_Feeds.php:886 msgid "Feeds with errors" -msgstr "有错误的订阅源" +msgstr "有错误的供稿" #: classes/Pref_Feeds.php:892 msgid "Inactive feeds" -msgstr "未活动的订阅源" +msgstr "未活动的供稿" #: classes/Pref_Feeds.php:929 classes/RPC.php:653 js/CommonDialogs.js:34 msgid "Subscribe to feed" -msgstr "订阅信息源" +msgstr "订阅供稿" #: classes/Pref_Feeds.php:931 msgid "Edit selected feeds" -msgstr "编辑选定的订阅源" +msgstr "编辑选定的供稿" #: classes/Pref_Feeds.php:933 classes/Pref_Feeds.php:948 #: classes/Pref_Filters.php:693 @@ -1114,7 +1109,7 @@ msgstr "清空所有生成的 URL" #: classes/Pref_Feeds.php:1042 msgid "My feeds" -msgstr "我的订阅源" +msgstr "我的供稿" #: classes/Pref_Feeds.php:1047 msgid "OPML" @@ -1134,7 +1129,7 @@ msgstr "上次登录" #: classes/Pref_Users.php:66 classes/Pref_Users.php:256 msgid "Subscribed feeds" -msgstr "订阅的信息源" +msgstr "订阅的供稿" #: classes/Pref_Users.php:71 msgid "Stored articles" @@ -1196,7 +1191,7 @@ msgstr "Git错误[RC =%d]:%s" #: classes/Pref_Filters.php:211 classes/Pref_Filters.php:222 #: classes/Pref_Filters.php:442 classes/Pref_Filters.php:876 msgid "All feeds" -msgstr "全部订阅源" +msgstr "全部供稿" #: classes/Pref_Filters.php:233 classes/Pref_Filters.php:462 msgid "(inverse)" @@ -1263,12 +1258,12 @@ msgstr "返回偏好设置" #: classes/OPML.php:324 #, php-format msgid "Adding feed: %s" -msgstr "添加订阅源: %s" +msgstr "添加供稿: %s" #: classes/OPML.php:344 #, php-format msgid "Duplicate feed: %s" -msgstr "重复的订阅源:%s" +msgstr "重复的供稿:%s" #: classes/OPML.php:358 #, php-format @@ -1323,19 +1318,19 @@ msgstr "导航" #: classes/RPC.php:611 msgid "Open next feed" -msgstr "显示下一个订阅源" +msgstr "显示下一个供稿" #: classes/RPC.php:612 msgid "Open next unread feed" -msgstr "打开下一个未读订阅源" +msgstr "打开下一个未读供稿" #: classes/RPC.php:613 msgid "Open previous feed" -msgstr "显示前一个订阅源" +msgstr "显示前一个供稿" #: classes/RPC.php:614 msgid "Open previous unread feed" -msgstr "打开上一个未读订阅源" +msgstr "打开上一个未读供稿" #: classes/RPC.php:615 msgid "Open next article (in combined mode, scroll down)" @@ -1475,20 +1470,20 @@ msgstr "取消全选" #: classes/RPC.php:650 msgid "Feed" -msgstr "订阅源" +msgstr "供稿" #: classes/RPC.php:651 msgid "Refresh current feed" -msgstr "刷新当前订阅源" +msgstr "刷新当前供稿" #: classes/RPC.php:652 msgid "Un/hide read feeds" -msgstr "显示/隐藏 已读信息" +msgstr "显示/隐藏 已读供稿" #: classes/RPC.php:654 js/Headlines.js:1582 js/Headlines.js:1647 #: js/PrefFeedTree.js:114 js/CommonDialogs.js:381 js/FeedTree.js:99 msgid "Edit feed" -msgstr "编辑订阅源" +msgstr "编辑供稿" #: classes/RPC.php:656 msgid "Reverse headlines" @@ -1504,7 +1499,7 @@ msgstr "切换网格视图" #: classes/RPC.php:659 msgid "Debug feed update" -msgstr "调试订阅源更新" +msgstr "调试供稿更新" #: classes/RPC.php:660 msgid "Debug viewfeed()" @@ -1512,7 +1507,7 @@ msgstr "调试 viewfeed()" #: classes/RPC.php:661 js/FeedTree.js:164 msgid "Mark all feeds as read" -msgstr "标记所有订阅源为已读" +msgstr "标记所有供稿为已读" #: classes/RPC.php:662 msgid "Un/collapse current category" @@ -1715,17 +1710,10 @@ msgstr "" "能导致错误的结果,0 为关闭相似度检查。" #: plugins/af_psql_trgm/init.php:196 -#, fuzzy -#| msgid "" -#| "PostgreSQL trigram extension returns string similarity as a floating " -#| "point number (0-1). Setting it too low might produce false positives, " -#| "zero disables checking." msgid "" "Setting this value too low might produce false positives, zero disables " "checking." -msgstr "" -"PostgreSQL trigram 扩展将返回一个文本相似度的浮点数(0-1)。设置过低的阈值可" -"能导致错误的结果,0 为关闭相似度检查。" +msgstr "设置过低的阈值可能导致错误的结果,0 为关闭相似度检查。" #: plugins/af_psql_trgm/init.php:202 msgid "Minimum title length:" @@ -1733,7 +1721,7 @@ msgstr "最短标题长度:" #: plugins/af_psql_trgm/init.php:212 msgid "Enable for all feeds." -msgstr "为所有订阅源启用。" +msgstr "为所有供稿启用。" #: plugins/af_psql_trgm/init.php:231 msgid "Currently enabled for (click to edit):" @@ -1770,20 +1758,20 @@ msgstr "无法订阅到 <b>%s</b>。" #: plugins/bookmarklets/init.php:113 #, php-format msgid "No feeds found in <b>%s</b>." -msgstr "在 <b>%s</b> 中没有找到订阅源。" +msgstr "在 <b>%s</b> 中没有找到供稿。" #: plugins/bookmarklets/init.php:119 #, php-format msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL." -msgstr "无法订阅 <b>%s</b>。<br>无法下载订阅源的 URL。" +msgstr "无法订阅 <b>%s</b>。<br>无法下载供稿的 URL。" #: plugins/bookmarklets/init.php:130 msgid "Multiple feed URLs found:" -msgstr "发现了多个订阅源:" +msgstr "发现了多个供稿:" #: plugins/bookmarklets/init.php:138 msgid "Subscribe to selected feed" -msgstr "订阅选中的订阅源" +msgstr "订阅选中的供稿" #: plugins/bookmarklets/init.php:156 msgid "Edit subscription options" @@ -1815,7 +1803,7 @@ msgstr "分享" #: plugins/bookmarklets/init.php:287 msgid "Shared article will appear in the Published feed." -msgstr "分享的文章将会出现在已发布的订阅源中。" +msgstr "分享的文章将会出现在已发布的供稿中。" #: plugins/bookmarklets/init.php:326 include/login_form.php:198 msgid "Log in" @@ -1834,9 +1822,8 @@ msgstr "小书签" msgid "" "Drag the link below to your browser toolbar, open the feed you're interested " "in in your browser and click on the link to subscribe to it." -msgstr "" -"将以下链接拖拽至您的浏览器书签,在浏览器中打开您想看的订阅源,然后点击链接以" -"订阅。" +msgstr "将以下链接拖拽至您的浏览器书签,在浏览器中打开您想看的供稿,然后点击链接以订" +"阅。" #: plugins/bookmarklets/init.php:358 msgid "Subscribe in Tiny Tiny RSS" @@ -1868,7 +1855,7 @@ msgstr "原密码输入错误。" #: plugins/af_comics/init.php:63 msgid "Feeds supported by af_comics" -msgstr "af_comics 的 feed 源" +msgstr "af_comics 的供稿" #: plugins/af_comics/init.php:65 msgid "The following comics are currently supported:" @@ -2043,7 +2030,7 @@ msgstr "选择..." #: js/Headlines.js:825 js/Headlines.js:879 js/Headlines.js:896 msgid "Click to open next unread feed." -msgstr "点击打开下一个未读订阅源。" +msgstr "点击打开下一个未读供稿。" #: js/Headlines.js:893 msgid "New articles found, reload feed to continue." @@ -2116,7 +2103,7 @@ msgstr "打开网站" #: js/Headlines.js:1597 js/FeedTree.js:114 msgid "Debug feed" -msgstr "调试订阅源" +msgstr "调试供稿" #: js/Headlines.js:1618 msgid "Select articles in group" @@ -2128,7 +2115,7 @@ msgstr "将分类标记为已读" #: js/Headlines.js:1640 msgid "Mark feed as read" -msgstr "标记订阅源为已读" +msgstr "标记供稿为已读" #: js/PrefHelpers.js:20 msgid "Remove selected app passwords?" @@ -2136,7 +2123,7 @@ msgstr "删除所选的APP密码?" #: js/PrefHelpers.js:45 msgid "This will invalidate all previously generated feed URLs. Continue?" -msgstr "这将使之前生成的信息源 URL 将会回到未认证状态。是否继续?" +msgstr "这将使之前生成的供稿 URL 失效。是否继续?" #: js/PrefHelpers.js:46 plugins/share/share_prefs.js:6 msgid "Clearing URLs..." @@ -2399,7 +2386,7 @@ msgstr "将所有文章标记为已读?" #: js/Feeds.js:447 msgid "Marking all feeds as read..." -msgstr "标记所有订阅源为已读..." +msgstr "标记所有供稿为已读..." #: js/Feeds.js:464 msgid "Mark %w in %s older than 1 day as read?" @@ -2435,10 +2422,8 @@ msgid "Search syntax" msgstr "搜索语法" #: js/Feeds.js:716 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds" -msgstr "搜索 %s ..." +msgstr "搜索供稿" #: js/PrefUsers.js:19 msgid "Please enter username:" @@ -2490,7 +2475,7 @@ msgstr "删除分类" #, java-printf-format, javascript-format msgid "" "Remove category %s? Any nested feeds would be placed into Uncategorized." -msgstr "删除类别 %s?该类别下的源将被归入未分类中。" +msgstr "删除类别 %s?该类别下的供稿将被归入未分类中。" #: js/PrefFeedTree.js:201 msgid "Removing category..." @@ -2498,16 +2483,16 @@ msgstr "删除分类..." #: js/PrefFeedTree.js:213 msgid "Unsubscribe from selected feeds?" -msgstr "退订选择订阅源?" +msgstr "退订选择的供稿?" #: js/PrefFeedTree.js:215 msgid "Unsubscribing from selected feeds..." -msgstr "取消订阅选中的订阅源..." +msgstr "取消订阅选中的供稿..." #: js/PrefFeedTree.js:228 js/PrefFeedTree.js:297 js/PrefFeedTree.js:313 #: js/PrefFeedTree.js:518 js/CommonDialogs.js:251 js/CommonDialogs.js:272 msgid "No feeds selected." -msgstr "没有选中订阅源。" +msgstr "没有选中供稿。" #: js/PrefFeedTree.js:263 msgid "Remove selected categories?" @@ -2523,11 +2508,11 @@ msgstr "没有选中分类。" #: js/PrefFeedTree.js:324 msgid "Edit multiple feeds" -msgstr "编辑多个订阅源" +msgstr "编辑多个供稿" #: js/PrefFeedTree.js:353 msgid "Save changes to selected feeds?" -msgstr "保存对订阅源的更改?" +msgstr "保存对供稿的更改?" #: js/PrefFeedTree.js:402 msgid "Category title:" @@ -2539,34 +2524,33 @@ msgstr "创建分类..." #: js/PrefFeedTree.js:420 msgid "Subscribing to feeds..." -msgstr "订阅信息源.." +msgstr "订阅供稿.." #: js/PrefFeedTree.js:438 msgid "One valid feed per line (no detection is done)" -msgstr "每行添加一条RSS源(未进行检测)" +msgstr "每行添加一条供稿(未进行检测)" #: js/PrefFeedTree.js:491 msgid "Feeds without recent updates" -msgstr "最近没更新的订阅源" +msgstr "最近没更新的供稿" #: js/PrefFeedTree.js:499 js/CommonDialogs.js:230 msgid "Remove selected feeds?" -msgstr "移除选中的订阅源?" +msgstr "移除选中的供稿?" #: js/PrefFeedTree.js:500 js/CommonDialogs.js:231 msgid "Removing selected feeds..." -msgstr "正在移除选中的订阅源..." +msgstr "正在移除选中的供稿..." #: js/PrefFeedTree.js:541 js/CommonDialogs.js:298 msgid "Click to edit feed" -msgstr "点击以编辑订阅源" +msgstr "点击以编辑供稿" #: js/CommonDialogs.js:45 msgid "" "Provided URL is a HTML page referencing multiple feeds, please select " "required feed from the dropdown menu below." -msgstr "" -"提供的URL是引用多个订阅源的HTML页面,请从下面的下拉菜单中选择所需的订阅源。" +msgstr "提供的URL是引用多个供稿的HTML页面,请从下面的下拉菜单中选择所需的供稿。" #: js/CommonDialogs.js:137 msgid "" @@ -2578,7 +2562,7 @@ msgstr "" #: js/CommonDialogs.js:150 msgid "You are already subscribed to this feed." -msgstr "您已经订阅过这个订阅源啦。" +msgstr "您已经订阅过这个供稿啦。" #: js/CommonDialogs.js:154 #, java-printf-format, javascript-format @@ -2591,11 +2575,11 @@ msgstr "指定的 URL 无效。" #: js/CommonDialogs.js:166 msgid "Specified URL doesn't seem to contain any feeds." -msgstr "指定的 URL 没有包含任何订阅源。" +msgstr "指定的 URL 没有包含任何供稿。" #: js/CommonDialogs.js:179 msgid "Expand to select feed" -msgstr "展开选择的订阅源" +msgstr "展开选择的供稿" #: js/CommonDialogs.js:191 #, java-printf-format, javascript-format @@ -2609,7 +2593,7 @@ msgstr "XML 验证失败:%s" #: js/CommonDialogs.js:197 msgid "Error while creating feed database entry." -msgstr "创建订阅源数据库条目时出错。" +msgstr "创建供稿数据库条目时出错。" #: js/CommonDialogs.js:200 msgid "You are not allowed to perform this operation." @@ -2617,19 +2601,15 @@ msgstr "您无权执行此操作。" #: js/CommonDialogs.js:222 msgid "Feeds with update errors" -msgstr "订阅源更新错误" +msgstr "供稿更新错误" #: js/CommonDialogs.js:258 -#, fuzzy -#| msgid "Remove selected feeds?" msgid "Debug selected feeds?" -msgstr "移除选中的订阅源?" +msgstr "调试选定的供稿?" #: js/CommonDialogs.js:259 -#, fuzzy -#| msgid "Removing selected feeds..." msgid "Opening debugger for selected feeds..." -msgstr "正在移除选中的订阅源..." +msgstr "正在打开选定供稿的调试器..." #: js/CommonDialogs.js:328 msgid "Please enter label caption:" @@ -2642,11 +2622,11 @@ msgstr "从 %s 取消订阅?" #: js/CommonDialogs.js:350 msgid "Removing feed..." -msgstr "删除 feed..." +msgstr "删除供稿..." #: js/CommonDialogs.js:373 js/App.js:1167 js/App.js:1284 msgid "You can't edit this kind of feed." -msgstr "您无法编辑这种类型的订阅源。" +msgstr "您无法编辑这种类型的供稿。" #: js/CommonDialogs.js:398 msgid "Please select an image file." @@ -2662,15 +2642,15 @@ msgstr "上传失败。" #: js/CommonDialogs.js:451 msgid "Remove stored feed icon?" -msgstr "移除已保存的订阅源图标?" +msgstr "移除已保存的供稿图标?" #: js/CommonDialogs.js:452 msgid "Removing feed icon..." -msgstr "移除订阅源图标..." +msgstr "移除供稿图标..." #: js/CommonDialogs.js:455 msgid "Feed icon removed." -msgstr "订阅源图标已删除." +msgstr "供稿图标已删除." #: js/CommonDialogs.js:622 msgid "Upload new icon..." @@ -2678,11 +2658,11 @@ msgstr "上载新图示..." #: js/CommonDialogs.js:651 js/Headlines.js:642 msgid "Show as feed" -msgstr "以订阅源显示" +msgstr "以供稿显示" #: js/CommonDialogs.js:653 msgid "Generate new syndication address for this feed?" -msgstr "为本订阅源生成新的群地址?" +msgstr "为本供稿生成新的联合地址?" #: js/CommonDialogs.js:655 msgid "Trying to change address..." @@ -2690,7 +2670,7 @@ msgstr "尝试更改地址..." #: js/CommonDialogs.js:673 msgid "Could not change feed URL." -msgstr "无法更改订阅源网址。" +msgstr "无法更改供稿网址。" #: js/CommonDialogs.js:680 #, java-printf-format, javascript-format @@ -2711,7 +2691,7 @@ msgstr "更新守护程序未运行。" #: js/App.js:519 msgid "Update daemon is not updating feeds." -msgstr "更新程序未更新订阅源." +msgstr "更新程序未更新供稿." #: js/App.js:606 #, java-printf-format @@ -2752,7 +2732,7 @@ msgstr "请先启用af_readability." #: js/App.js:1293 msgid "Please select some feed first." -msgstr "请先选择订阅源。" +msgstr "请先选择供稿。" #: js/App.js:1298 msgid "You can't unsubscribe from the category." @@ -2852,7 +2832,7 @@ msgstr "应用操作" #: js/Headlines.js:474 msgid "mark feed as read" -msgstr "标记信息源为已读" +msgstr "标记供稿为已读" #: js/Headlines.js:527 msgid "Span all columns" @@ -2941,7 +2921,7 @@ msgstr "词干提取" #: js/Feeds.js:705 msgid "Show feeds matching..." -msgstr "" +msgstr "显示符合的供稿..." #: js/PrefUsers.js:76 msgid "Access level: " @@ -2961,11 +2941,11 @@ msgstr "更名分类到:" #: js/PrefFeedTree.js:466 msgid "Feeds require authentication." -msgstr "Feed需要登录认证。" +msgstr "供稿需要登录认证。" #: js/PrefFeedTree.js:555 js/CommonDialogs.js:312 msgid "Unsubscribe from selected feeds" -msgstr "退订选中的信息源" +msgstr "退订选中的供稿" #: js/CommonDialogs.js:18 msgid "" @@ -2977,29 +2957,27 @@ msgstr "" #: js/CommonDialogs.js:53 msgid "Feed or site URL" -msgstr "信息源或网站 URL" +msgstr "供稿或网站 URL" #: js/CommonDialogs.js:68 msgid "Available feeds" -msgstr "可用的订阅源" +msgstr "可用的供稿" #: js/CommonDialogs.js:101 msgid "This feed requires authentication." -msgstr "这个订阅源需要认证." +msgstr "这个供稿需要认证." #: js/CommonDialogs.js:315 -#, fuzzy -#| msgid "Edit selected feeds" msgid "Debug selected feeds" -msgstr "编辑选定的订阅源" +msgstr "编辑选定的供稿" #: js/CommonDialogs.js:526 msgid "Feed title" -msgstr "订阅源标题" +msgstr "供稿标题" #: js/CommonDialogs.js:533 msgid "Feed URL" -msgstr "信息源 URL" +msgstr "供稿 URL" #: js/CommonDialogs.js:552 msgid "Site URL:" diff --git a/locale/zh_TW/LC_MESSAGES/messages.mo b/locale/zh_TW/LC_MESSAGES/messages.mo Binary files differindex 93a2668a6..eb15ebe7e 100644 --- a/locale/zh_TW/LC_MESSAGES/messages.mo +++ b/locale/zh_TW/LC_MESSAGES/messages.mo diff --git a/locale/zh_TW/LC_MESSAGES/messages.po b/locale/zh_TW/LC_MESSAGES/messages.po index 8ac6fd122..fb54891ed 100644 --- a/locale/zh_TW/LC_MESSAGES/messages.po +++ b/locale/zh_TW/LC_MESSAGES/messages.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: Tiny Tiny RSS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-06-15 14:03+0300\n" -"PO-Revision-Date: 2022-08-25 06:49+0000\n" -"Last-Translator: TonyRL <[email protected]>\n" -"Language-Team: Chinese (Traditional) <https://weblate.tt-rss.org/projects/tt-" -"rss/messages/zh_Hant/>\n" +"PO-Revision-Date: 2024-06-21 18:10+0000\n" +"Last-Translator: TonyRL <[email protected]>\n" +"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" +"tt-rss/webui/zh_Hant/>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.14\n" +"X-Generator: Weblate 5.6-rc\n" #: backend.php:65 msgid "Use default" @@ -88,10 +88,8 @@ msgid "Disabled" msgstr "已停用" #: backend.php:96 -#, fuzzy -#| msgid "Readability" msgid "Read Only" -msgstr "Readability" +msgstr "唯讀" #: backend.php:97 classes/Pref_System.php:123 msgid "User" @@ -210,10 +208,8 @@ msgid "Search..." msgstr "搜尋..." #: index.php:265 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds..." -msgstr "搜尋 %s..." +msgstr "搜尋摘要..." #: index.php:266 msgid "Feed actions:" @@ -254,10 +250,8 @@ msgid "Toggle widescreen mode" msgstr "切換版面顯示" #: index.php:278 -#, fuzzy -#| msgid "Always expand articles" msgid "Toggle expand all articles" -msgstr "永遠展開文章" +msgstr "切換展開文章" #: index.php:279 msgid "Other actions:" @@ -531,14 +525,12 @@ msgid "On wider screens, if always expanded" msgstr "在寬螢幕上永遠展開文章" #: classes/Pref_Prefs.php:131 -#, fuzzy -#| msgid "Set score" msgid "Required score" -msgstr "評分" +msgstr "要求的分數" #: classes/Pref_Prefs.php:131 msgid "Include articles with this or above score" -msgstr "" +msgstr "包含這個分數以上的文章" #: classes/Pref_Prefs.php:233 msgid "The configuration was saved." @@ -1405,7 +1397,7 @@ msgstr "編輯自訂標籤" #: classes/RPC.php:630 msgid "Open in new window" -msgstr "在新視窗打開文章" +msgstr "在新視窗開啟文章" #: classes/RPC.php:631 js/Headlines.js:1482 msgid "Mark below as read" @@ -1721,17 +1713,10 @@ msgstr "" "限可能導致誤判,設定為 0 將關閉相似度檢查。" #: plugins/af_psql_trgm/init.php:196 -#, fuzzy -#| msgid "" -#| "PostgreSQL trigram extension returns string similarity as a floating " -#| "point number (0-1). Setting it too low might produce false positives, " -#| "zero disables checking." msgid "" "Setting this value too low might produce false positives, zero disables " "checking." -msgstr "" -"PostgreSQL trigram 擴充套件將傳回一個字串相似度的浮點數(0-1)。設定過低的界" -"限可能導致誤判,設定為 0 將關閉相似度檢查。" +msgstr "設定過低的數值可能導致誤判,設定為 0 將關閉相似度檢查。" #: plugins/af_psql_trgm/init.php:202 msgid "Minimum title length:" @@ -1840,8 +1825,7 @@ msgstr "書籤" msgid "" "Drag the link below to your browser toolbar, open the feed you're interested " "in in your browser and click on the link to subscribe to it." -msgstr "" -"將以下連結按鈕拖曳至您的瀏覽器書籤工具列。之後在瀏覽器中打開您想看的摘要,然" +msgstr "將以下連結按鈕拖曳至您的瀏覽器書籤工具列。之後在瀏覽器中開啟您想看的摘要,然" "後按下此連結按鈕即可訂閱。" #: plugins/bookmarklets/init.php:358 @@ -2050,7 +2034,7 @@ msgstr "選擇..." #: js/Headlines.js:825 js/Headlines.js:879 js/Headlines.js:896 msgid "Click to open next unread feed." -msgstr "點擊以打開下一個未讀的摘要。" +msgstr "點擊以開啟下一個未讀的摘要。" #: js/Headlines.js:893 msgid "New articles found, reload feed to continue." @@ -2102,7 +2086,7 @@ msgstr[0] "要將 %d 篇文章標記為已讀嗎?" #: js/Headlines.js:1420 msgid "Open original article" -msgstr "打開原始文章" +msgstr "開啟原始文章" #: js/Headlines.js:1427 msgid "Display article URL" @@ -2118,10 +2102,8 @@ msgstr "移除預定義標籤" #: js/Headlines.js:1588 js/FeedTree.js:105 js/Headlines.js:473 #: js/Headlines.js:522 js/Headlines.js:591 -#, fuzzy -#| msgid "Open next feed" msgid "Open site" -msgstr "顯示下一個摘要" +msgstr "開啟網站" #: js/Headlines.js:1597 js/FeedTree.js:114 msgid "Debug feed" @@ -2444,10 +2426,8 @@ msgid "Search syntax" msgstr "搜尋語法" #: js/Feeds.js:716 -#, fuzzy -#| msgid "Search %s..." msgid "Search feeds" -msgstr "搜尋 %s..." +msgstr "搜尋摘要" #: js/PrefUsers.js:19 msgid "Please enter username:" @@ -2943,7 +2923,7 @@ msgstr "附件" #: js/Feeds.js:293 msgid "Open Preferences" -msgstr "打開偏好設定" +msgstr "開啟偏好設定" #: js/Feeds.js:636 #, javascript-format @@ -2956,7 +2936,7 @@ msgstr "用於詞幹提取" #: js/Feeds.js:705 msgid "Show feeds matching..." -msgstr "" +msgstr "顯示符合的摘要…" #: js/PrefUsers.js:76 msgid "Access level: " @@ -3011,8 +2991,6 @@ msgid "Debug selected feeds" msgstr "編輯所選的摘要" #: js/CommonDialogs.js:526 -#, fuzzy -#| msgid "Feed Title" msgid "Feed title" msgstr "摘要標題" diff --git a/update.php b/update.php index ba31544f0..c8fe69fdb 100755 --- a/update.php +++ b/update.php @@ -253,7 +253,7 @@ exit(1); } - RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : Config::get(Config::DAEMON_FEED_LIMIT), $options); + RSSUtils::update_daemon_common(Config::get(Config::DAEMON_FEED_LIMIT), $options); if (!isset($options["pidlock"]) || $options["task"] == "0") RSSUtils::housekeeping_common(); diff --git a/update_daemon2.php b/update_daemon2.php index 27b066db0..4d80bed0a 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -133,7 +133,7 @@ print "Tiny Tiny RSS update daemon.\n\n"; print "Options:\n"; print " --log FILE - log messages to FILE\n"; - print " --log-level N - log verbosity level\n"; + print " --log-level N - log verbosity level\n"; print " --tasks N - amount of update tasks to spawn\n"; print " default: " . Config::get(Config::DAEMON_MAX_JOBS) . "\n"; print " --interval N - task spawn interval\n"; @@ -144,9 +144,13 @@ Debug::set_enabled(true); + $log_level = Debug::map_loglevel(Config::get(Config::DAEMON_LOG_LEVEL)); + if (isset($options["log-level"])) { - Debug::set_loglevel(Debug::map_loglevel((int)$options["log-level"])); - } + $log_level = Debug::map_loglevel((int)$options["log-level"]); + } + + Debug::set_loglevel((int) $log_level); if (isset($options["log"])) { Debug::set_quiet(isset($options['quiet'])); @@ -246,7 +250,7 @@ $my_pid = posix_getpid(); - passthru(Config::get(Config::PHP_EXECUTABLE) . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid"); + passthru(Config::get(Config::PHP_EXECUTABLE) . " update.php --daemon-loop $quiet $log --log-level $log_level --task $j --pidlock $my_pid"); sleep(1); |