From f1ef2e969366c8fcb4474c5f70bcae54b7cd902c Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 19 Sep 2017 13:24:40 +0200 Subject: [PATCH] lang sync --- localization/rssguard_cs.ts | 36 +++--- localization/rssguard_lt.ts | 22 ++-- localization/rssguard_zh.ts | 224 +++++++++++++++++----------------- src/gui/dialogs/formabout.cpp | 14 ++- src/gui/dialogs/formabout.h | 4 - 5 files changed, 150 insertions(+), 150 deletions(-) diff --git a/localization/rssguard_cs.ts b/localization/rssguard_cs.ts index 104d9f081..f052af9e8 100644 --- a/localization/rssguard_cs.ts +++ b/localization/rssguard_cs.ts @@ -1150,23 +1150,23 @@ or this functionality is not implemented yet. Limit number of downloaded messages per feed - + Limitovat počet stahovaných zpráv na kanál = unlimited - + = neomezeno Limiting number of downloaded messages per feed makes updating of feeds faster but if your feed contains bigger number of messages than specified limit, then some messages might not be downloaded during feed update. - + Omezení počtu stahovaných zpráv na kanál udělá aktualizaci kanálů rychleší, ale pokud váš kanál obsahuje více zpráv než je limit, tak se může stát, že některé zprávy se z kanálu nebudou stahovat. = unlimited - + = neomezeno messages - + zpráv @@ -2851,15 +2851,15 @@ Nyní ho můžete nainstalovat. Open with external tool - + Otevřít s externím nástrojem Cannot run external tool - + Nelze spustit externí nástroj External tool '%1' could not be started. - + Externí nástroj '%1' nelze spustit. @@ -3061,7 +3061,7 @@ Je vyžadování verze API minimálně %1. Passed external tool representation is not valid. - + Reprezentace externího nástroje není správná. @@ -3277,39 +3277,39 @@ File filter for external tool selection dialog. External tools - + Externá nástroje pro zprávy On this page, you can setup a list of external tools which can open URLs of selected messages. - + Na této stránce si můžete nakonfigurovat seznam externích nástrojů pro otevírání URL ze zpráv. Add external tool - + Přidat ext. nástroj Delete selected external tool - + Smazat vybraný ext. nástroj Executable - + Spouštěč Parameters - + Parametry Select external tool - + Vybrat externí nástroj Enter parameters - + Zadat parametry ext. nástroje Enter (optional) parameters separated by single space to send to executable when opening URLs. - + Zadejte (volitelné) parametry oddělené jednou mezerou, které budou předány nástroji při otevírání URL adres. diff --git a/localization/rssguard_lt.ts b/localization/rssguard_lt.ts index 3a3305963..aad7b3465 100644 --- a/localization/rssguard_lt.ts +++ b/localization/rssguard_lt.ts @@ -1151,23 +1151,23 @@ arba šis funkcionalumas dar nėra įgyvendintas. Limit number of downloaded messages per feed - + Apriboti vienam kanalui atsiunčiamų žinučių skaičių = unlimited - + = neribotai Limiting number of downloaded messages per feed makes updating of feeds faster but if your feed contains bigger number of messages than specified limit, then some messages might not be downloaded during feed update. - + Vienam kanalui atsiunčiamų žinučių apribojimas padaro kanalų atnaujinimą greitesnį, tačiau jeigu jūsų kanale yra daugiau žinučių negu nurodyta riba, tuomet kanalo atnaujinimo metu kai kurios žinutės gali būti neatsiųstos. = unlimited - + = neribotai messages - + žinutės(-ių) @@ -2862,7 +2862,7 @@ Jūs dabar galite jį įdiegti. External tool '%1' could not be started. - + Nepavyko paleisti "%1" išorinio įrankio. @@ -3064,7 +3064,7 @@ Reikalingas bent API lygis %1. Passed external tool representation is not valid. - + Perduoto išorinio įrankio atvaizdavimas yra neteisingas. @@ -3284,7 +3284,7 @@ File filter for external tool selection dialog. On this page, you can setup a list of external tools which can open URLs of selected messages. - + Šiame puslapyje galite nusistatyti išorinių įrankių, kurie gali atverti pažymėtų žinučių URL adresus, sąrašą. Add external tool @@ -3304,15 +3304,15 @@ File filter for external tool selection dialog. Select external tool - + Pasirinkite išorinį įrankį Enter parameters - + Įveskite parametrus Enter (optional) parameters separated by single space to send to executable when opening URLs. - + Įveskite (pasirinktinai) vienu tarpu atskirtus parametrus, kurie, atveriant URL adresus, bus persiunčiami vykdomiesiems. diff --git a/localization/rssguard_zh.ts b/localization/rssguard_zh.ts index 805f5c92c..d67366511 100755 --- a/localization/rssguard_zh.ts +++ b/localization/rssguard_zh.ts @@ -529,7 +529,7 @@ Auto-update status: %3 Context menu for empty space - + 空白处的上下文菜单 Selected item cannot be edited because another critical operation is ongoing. @@ -541,7 +541,7 @@ Auto-update status: %3 Context menu for categories - + 分类的上下文菜单 Selected item cannot be edited, this is not (yet?) supported. @@ -575,7 +575,7 @@ or this functionality is not implemented yet. Context menu for other items - + 其它项目的上下文菜单 Not supported @@ -843,46 +843,46 @@ or this functionality is not implemented yet. Remove all messages from recycle bin - + 删除回收站的所有消息 Remove all starred messages (including those from recycle bin) - + 删除所有的星号消息(包括来自回收站的消息) unknown - + 未知 file: %1, data: %2 - + 文件: %1, 数据: %2 FormEditAccount Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported. - + 有些订阅需要身份验证，包括GMail订阅。BASIC,NTLM-2 和 DIGEST-MD5 认证方案都得到了支持。 Authentication - + 身份验证 Username - + 用户名 Password - + 密码 Show password - + 显示密码 Requires HTTP authentication - + 请求 HTTP 身份验证 URL @@ -890,146 +890,146 @@ or this functionality is not implemented yet. &Test setup - + &测试设置 HTTP authentication username - + HTTP 身份验证用户名 HTTP authentication password - + HTTP 身份验证密码 Password for your TT-RSS account - + 您的 TT-RSS 帐号密码 Username for your TT-RSS account - + 您的 TT-RSS 帐号用户名 FULL URL of your TT-RSS instance WITH trailing "/api/" string - + 您的 TT-RSS 末尾带有 "/api/" 字符串的完整 URL 链接 No test done yet. - + 还没有测试完成。 Here, results of connection test are shown. - + 这里显示了连接测试的结果。 Add new Tiny Tiny RSS account - + 添加新的 Tiny Tiny RSS 帐号 Edit existing Tiny Tiny RSS account - + 编辑已有的 Tiny Tiny RSS 帐号 API access on selected server is not enabled. - + 选择的服务器上的API访问是不启用的。 Entered credentials are incorrect. - + 输入凭证不正确。 Other error occurred, contact developers. - + 其他错误发生了，联系开发人员。 Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required. - + 选择的 Tiny Tiny RSS服务器正在运行不支持的API版本(%1)。至少API级别的%2是必需的。 Selected Tiny Tiny RSS server is running unsupported version of API. - + 选择的Tiny Tiny RSS服务器正在运行不支持的API版本。 Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required. - + Tiny Tiny RSS 服务器正常, 正在运行 API 级别为 %1, 然而至少需要 API 级别为 %2 . Tiny Tiny RSS server is okay. - + Tiny Tiny RSS 服务器正常。 Network error: '%1'. - + 网络错误: '%1'. Network error, have you entered correct Tiny Tiny RSS API endpoint and password? - + 网络错误，您是否输入了正确的RSS API 端口和密码? Username cannot be empty. - + 用户名不能为空。 Username is okay. - + 用户名可用。 Password cannot be empty. - + 密码不能为空。 Password is okay. - + 密码可用。 Username is ok or it is not needed. - + 用户名可用，但不是必须的。 Username is empty. - + 用户名为空。 Password is ok or it is not needed. - + 密码可用，但不是必须的。 Password is empty. - + 密码为空。 URL cannot be empty. - + URL 链接不能为空。 URL is okay. - + URL 链接可用。 Note that at least API level %1 is required. - + 请注意，至少需要 API 级别的 %1。 URL should end with "/api/". - + URL 链接必须以 "/api/" 结尾。 Unspecified error, did you enter correct URL? - + 未知的错误，您输入正确的网址了吗? Force execution of server-side update when updating feeds from RSS Guard - + 当从 RSS Guard 更新订阅时，强制执行服务器端更新 Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. - + 选择这个选项将导致订阅更新变得更慢，而且可能会经常超时。 FormEditOwnCloudAccount URL - + URL 链接 Force execution of server-side update when updating feeds from RSS Guard @@ -1041,7 +1041,7 @@ or this functionality is not implemented yet. Authentication - + 身份验证 Username @@ -1073,11 +1073,11 @@ or this functionality is not implemented yet. No test done yet. - + 还没有测试完成。 Here, results of connection test are shown. - + 这里显示了连接测试的结果。 Add new ownCloud News account @@ -1097,7 +1097,7 @@ or this functionality is not implemented yet. Network error: '%1'. - + 网络错误: '%1'. Network error, have you entered correct ownCloud endpoint and password? @@ -1105,31 +1105,31 @@ or this functionality is not implemented yet. Unspecified error, did you enter correct URL? - + 未知的错误，您输入正确的网址了吗? Username cannot be empty. - + 用户名不能为空。 Username is okay. - + 用户名可用。 Password cannot be empty. - + 密码不能为空 Password is okay. - + 密码可用。 URL cannot be empty. - + URL 链接不能为空。 URL is okay. - + URL 链接可用。 Password for your ownCloud account @@ -1176,59 +1176,59 @@ or this functionality is not implemented yet. Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported. - + 有些订阅需要身份验证，包括GMail订阅。BASIC,NTLM-2 和 DIGEST-MD5 认证方案都得到了支持。 Authentication - + 身份验证 Username - + 用户名 Password - + 密码 Show password - + 显示密码 Requires HTTP authentication - + 请求 HTTP 身份验证 &Test setup - + &测试设置 Force execution of server-side update when updating feeds from RSS Guard - + 当从 RSS Guard 更新订阅时，强制执行服务器端更新 Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. - + 选择这个选项将导致订阅更新变得更慢，而且可能会经常超时。 Note that at least API level %1 is required. - + 请注意，至少需要 API 级别的 %1。 HTTP authentication username - + HTTP 身份验证用户名 HTTP authentication password - + HTTP 身份验证密码 Password for your TT-RSS account - + 您的 TT-RSS 帐号密码 Username for your TT-RSS account - + 您的 TT-RSS 帐号用户名 URL of your TT-RSS instance WITHOUT trailing "/api/" string @@ -1236,95 +1236,95 @@ or this functionality is not implemented yet. No test done yet. - + 还没有测试完成。 Here, results of connection test are shown. - + 这里显示了连接测试的结果。 Add new Tiny Tiny RSS account - + 添加新的 Tiny Tiny RSS 帐号 Edit existing Tiny Tiny RSS account - + 编辑已有的 Tiny Tiny RSS 帐号 API access on selected server is not enabled. - + 选择的服务器上的API访问是不启用的。 Entered credentials are incorrect. - + 输入凭证不正确。 Other error occurred, contact developers. - + 其他错误发生了，联系开发人员。 Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required. - + 选择的 Tiny Tiny RSS服务器正在运行不支持的API版本(%1)。至少API级别的%2是必需的。 Selected Tiny Tiny RSS server is running unsupported version of API. - + 选择的Tiny Tiny RSS服务器正在运行不支持的API版本。 Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required. - + Tiny Tiny RSS 服务器正常, 正在运行 API 级别为 %1, 然而至少需要 API 级别为 %2 . Tiny Tiny RSS server is okay. - + Tiny Tiny RSS 服务器正常。 Network error: '%1'. - + 网络错误: '%1'. Network error, have you entered correct Tiny Tiny RSS API endpoint and password? - + 网络错误，您是否输入了正确的RSS API 端口和密码? Unspecified error, did you enter correct URL? - + 未知的错误，您输入正确的网址了吗? Username cannot be empty. - + 用户名不能为空。 Username is okay. - + 用户名可用。 Password cannot be empty. - + 密码不能为空 Password is okay. - + 密码可用。 Username is ok or it is not needed. - + 用户名可用，但不是必须的。 Username is empty. - + 用户名是空的。 Password is ok or it is not needed. - + 密码可用，但不是必须的。 Password is empty. - + 密码为空。 URL cannot be empty. - + URL 链接不能为空。 URL should NOT end with "/api/". @@ -1332,7 +1332,7 @@ or this functionality is not implemented yet. URL is okay. - + URL 链接可用。 @@ -1395,19 +1395,19 @@ or this functionality is not implemented yet. Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported. - + 有些订阅需要身份验证，包括GMail订阅。BASIC,NTLM-2 和 DIGEST-MD5 认证方案都得到了支持。 Requires HTTP authentication - + 请求 HTTP 身份验证 Username - + 用户名 Password - + 密码 Fetch metadata @@ -1451,19 +1451,19 @@ or this functionality is not implemented yet. Username is ok or it is not needed. - + 用户名可用，但不是必须的。 Username is empty. - + 用户名是空的。 Password is ok or it is not needed. - + 密码可用，但不是必须的。 Password is empty. - + 密码为空。 Select icon file for the feed @@ -2425,7 +2425,7 @@ You have to restart manually. unknown Unknown release. - + 未知 List with updates was not @@ -3175,7 +3175,7 @@ At least API level %1 is required. Username - + 用户名 Your username for proxy server authentication @@ -3183,7 +3183,7 @@ At least API level %1 is required. Password - + 密码 Your password for proxy server authentication @@ -3325,11 +3325,11 @@ Authors of this application are NOT responsible for lost data. Username - + 用户名 Password - + 密码 Test setup @@ -3357,7 +3357,7 @@ Authors of this application are NOT responsible for lost data. Username is empty. - + 用户名是空的。 Username looks ok. @@ -3365,7 +3365,7 @@ Authors of this application are NOT responsible for lost data. Password is empty. - + 密码为空。 Password looks ok. diff --git a/src/gui/dialogs/formabout.cpp b/src/gui/dialogs/formabout.cpp index 3f59b702e..49379cb6f 100755 --- a/src/gui/dialogs/formabout.cpp +++ b/src/gui/dialogs/formabout.cpp @@ -18,6 +18,7 @@ #include "gui/dialogs/formabout.h" +#include "definitions/definitions.h" #include "exceptions/applicationexception.h" #include "gui/guiutilities.h" #include "miscellaneous/iconfactory.h" @@ -47,7 +48,9 @@ void FormAbout::loadSettingsAndPaths() { m_ui.m_txtPathsSettingsType->setText(tr("NOT portable")); } - m_ui.m_txtPathsDatabaseRoot->setText(QDir::toNativeSeparators(qApp->userDataFolder() + QDir::separator() + QString(APP_DB_SQLITE_PATH))); + m_ui.m_txtPathsDatabaseRoot->setText(QDir::toNativeSeparators(qApp->userDataFolder() + + QDir::separator() + + QString(APP_DB_SQLITE_PATH))); m_ui.m_txtPathsSettingsFile->setText(QDir::toNativeSeparators(qApp->settings()->fileName())); m_ui.m_txtPathsSkinsRoot->setText(QDir::toNativeSeparators(qApp->skins()->customSkinBaseFolder())); } @@ -85,8 +88,8 @@ void FormAbout::loadLicenseAndInformation() { m_ui.m_lblDesc->setText(tr("%8
" "Version: %1 (built on %2/%3)
" "Revision: %4
" "Build date: %5
" "Qt: %6 (compiled against %7)
").arg( qApp->applicationVersion(), APP_SYSTEM_NAME, APP_SYSTEM_VERSION, APP_REVISION, - TextFactory - ::parseDateTime(QString("%1 %2").arg(__DATE__, __TIME__)).toString(Qt::DefaultLocaleShortDate), + TextFactory::parseDateTime(QString("%1 %2").arg(__DATE__, + __TIME__)).toString(Qt::DefaultLocaleShortDate), qVersion(), QT_VERSION_STR, APP_NAME)); m_ui.m_txtInfo->setText(tr("%5 is a (very) tiny feed reader." @@ -96,7 +99,8 @@ void FormAbout::loadLicenseAndInformation() { "
  • %2 ~website
    • " "You can obtain source code for %5 from its website." "


    Copyright (C) 2011-%3 %4").arg(APP_EMAIL, APP_URL, - QString - ::number(QDateTime::currentDateTime().date().year()), + QString::number(QDateTime::currentDateTime() + .date() + .year()), APP_AUTHOR, APP_NAME)); } diff --git a/src/gui/dialogs/formabout.h b/src/gui/dialogs/formabout.h index ec6df583a..1ce421293 100755 --- a/src/gui/dialogs/formabout.h +++ b/src/gui/dialogs/formabout.h @@ -23,14 +23,10 @@ #include "ui_formabout.h" -#include "definitions/definitions.h" - class FormAbout : public QDialog { Q_OBJECT public: - - // Constructors and destructors. explicit FormAbout(QWidget* parent); virtual ~FormAbout();