From dc13f5fb76af55427b5c28eaadf389117a8539d8 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Sat, 19 Oct 2019 07:35:53 +0300 Subject: [PATCH] Updated app name in locale --- Telegram/Resources/langs/lang.strings | 25 +++++++++++++++++++ Telegram/Resources/langs/rewrites/ru.json | 25 ++++++++++++++++++- Telegram/SourceFiles/boxes/connection_box.cpp | 2 +- .../SourceFiles/boxes/download_path_box.cpp | 2 +- Telegram/SourceFiles/boxes/passcode_box.cpp | 2 +- Telegram/SourceFiles/calls/calls_instance.cpp | 2 +- Telegram/SourceFiles/core/changelogs.cpp | 2 +- .../SourceFiles/data/data_cloud_themes.cpp | 4 +-- .../SourceFiles/dialogs/dialogs_widget.cpp | 2 +- .../export/view/export_view_progress.cpp | 2 +- Telegram/SourceFiles/facades.cpp | 4 +-- Telegram/SourceFiles/history/history_item.cpp | 2 +- Telegram/SourceFiles/intro/introcode.cpp | 2 +- .../SourceFiles/lang/lang_cloud_manager.cpp | 2 +- Telegram/SourceFiles/mainwindow.cpp | 8 +++--- .../passport/passport_panel_controller.cpp | 2 +- .../platform/mac/main_window_mac.mm | 2 +- .../platform/win/main_window_win.cpp | 2 +- .../settings/settings_advanced.cpp | 8 +++--- .../SourceFiles/settings/settings_calls.cpp | 2 +- .../settings/settings_privacy_security.cpp | 2 +- .../window/themes/window_theme_editor.cpp | 2 +- .../window/window_outdated_bar.cpp | 4 +-- 23 files changed, 79 insertions(+), 31 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 116236af1..7f0c54afd 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -2289,4 +2289,29 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ktg_net_boost_restart_desc" = "You'll need to restart app to change network boost.\n\nRestart now?"; +"ktg_open_from_tray" = "Open Kotatogram"; +"ktg_quit_from_tray" = "Quit Kotatogram"; +"ktg_tray_icon_text" = "Kotatogram is still running here,\nyou can change this from settings page.\nIf this icon disappears from tray menu,\nyou can drag it here from hidden icons."; +"ktg_error_start_minimized_passcoded" = "You have set a local passcode, so Kotatogram Desktop can't be launched minimised; it will ask you to enter your passcode before it can start working."; +"ktg_proxy_unsupported" = "Your Kotatogram Desktop version doesn't support this proxy type or the proxy link is invalid. Please update Kotatogram Desktop to the latest version."; +"ktg_update_telegram" = "Update Kotatogram"; +"ktg_settings_auto_start" = "Launch Kotatogram when system starts"; +"ktg_settings_add_sendto" = "Place Kotatogram in \"Send to\" menu"; +"ktg_theme_no_desktop" = "Sorry, this theme doesn't include a version for Kotatogram Desktop."; +"ktg_download_path_default_radio" = "Kotatogram folder in system «Downloads»"; +"ktg_passcode_about" = "When a local passcode is set, a lock icon appears at the top of your chats list. Click it to lock the app.\n\nNote: if you forget your local passcode, you'll need to relogin in Kotatogram Desktop."; +"ktg_message_unsupported" = "This message is not supported by your version of Kotatogram Desktop. Please update to the latest version in Settings, or install it from {link}"; +"ktg_bot_share_location_unavailable" = "Sorry, location sharing is currently unavailable in Kotatogram Desktop."; +"ktg_new_version_wrap" = "Kotatogram Desktop was rebased on Telegram Desktop {version}\n\n{changes}\n\nFull version history is available here:\n{link}"; +"ktg_theme_editor_need_unlock" = "You need to unlock Kotatogram to save your theme."; +"ktg_payments_not_supported" = "Sorry, Kotatogram Desktop doesn't support payments yet. Please use one of our mobile apps to do this."; +"ktg_no_mic_permission" = "Kotatogram needs access to your microphone so that you can make calls and record voice messages."; +"ktg_passport_app_out_of_date" = "Sorry, your Telegram app is out of date and can't handle this request. Please update Kotatogram."; +"ktg_export_progress" = "You can close this window now. Please don't quit Kotatogram until the data export is completed."; +"ktg_language_not_ready_about" = "Unfortunately, this custom language pack ({lang_name}) doesn't contain data for Telegram Desktop. You can contribute to this language pack using the {link}."; +"ktg_outdated_soon" = "Otherwise, Kotatogram Desktop will stop updating on {date}."; +"ktg_outdated_now" = "So that Kotatogram Desktop can update to newer versions."; +"ktg_mac_menu_show" = "Show Kotatogram"; + + // Keys finished diff --git a/Telegram/Resources/langs/rewrites/ru.json b/Telegram/Resources/langs/rewrites/ru.json index 54378c5e6..58a838add 100644 --- a/Telegram/Resources/langs/rewrites/ru.json +++ b/Telegram/Resources/langs/rewrites/ru.json @@ -54,5 +54,28 @@ "ktg_net_speed_boost_slight": "Небольшое", "ktg_net_speed_boost_medium": "Среднее", "ktg_net_speed_boost_big": "Высокое", - "ktg_net_boost_restart_desc": "Для изменения ускорения загрузки требуется перезапуск.\n\nПерезапустить сейчас?" + "ktg_net_boost_restart_desc": "Для изменения ускорения загрузки требуется перезапуск.\n\nПерезапустить сейчас?", + "ktg_open_from_tray": "Открыть Kotatogram", + "ktg_quit_from_tray": "Закрыть Kotatogram", + "ktg_tray_icon_text": "Kotatogram продолжает работать,\nВы можете изменить это в настройках.\nЕсли значок исчезнет из области уведомлений,\nего можно перенести из скрытых значков.", + "ktg_error_start_minimized_passcoded": "Вы установили для приложения код-пароль, поэтому оно не может запускаться в свёрнутом виде. Для входа в приложение нужно сначала ввести код-пароль.", + "ktg_proxy_unsupported": "Ссылка некорректна или тип прокси-сервера не поддерживается в Kotatogram Desktop. Убедитесь, что используете последнюю версию приложения.", + "ktg_update_telegram": "Обновить Kotatogram", + "ktg_settings_auto_start": "Запускать Kotatogram при запуске системы", + "ktg_settings_add_sendto": "Добавить в меню \"Отправить...\"", + "ktg_theme_no_desktop": "К сожалению, тема не подходит для приложения Kotatogram Desktop.", + "ktg_download_path_default_radio": "Папка Kotatogram в «Загрузках» системы", + "ktg_passcode_about": "Когда код-пароль включен, в списке чатов появляется значок замка для блокировки и разблокировки приложения.\n\nВажно: если Вы забудете код-пароль, нужно будет выйти и заново авторизоваться в Kotatogram Desktop.", + "ktg_message_unsupported": "Это сообщение не поддерживается в вашей версии Kotatogram. Пожалуйста, обновитесь до последней версии через Настройки или установите её по ссылке {link}", + "ktg_bot_share_location_unavailable": "В Kotatogram Desktop пока нельзя делиться геопозицией.", + "ktg_new_version_wrap": "Kotatogram Desktop обновил исходники Telegram Desktop до {version}\n\n{changes}\n\nВся история изменений доступна здесь:\n{link}", + "ktg_theme_editor_need_unlock": "Чтобы сохранить тему, необходимо разблокировать приложение.", + "ktg_payments_not_supported": "К сожалению, Kotatogram Desktop ещё не поддерживает платежи. Пожалуйста, используйте для этого мобильные приложения.", + "ktg_no_mic_permission": "Чтобы Вы могли пользоваться звонками и записывать голосовые сообщения, Kotatogram требуется доступ к микрофону.", + "ktg_passport_app_out_of_date": "К сожалению, ваша версия приложения устарела и не может обработать этот запрос. Пожалуйста, обновите Kotatogram.", + "ktg_export_progress": "Это окно можно пока закрыть. Пожалуйста, не выходите из Kotatogram, пока экспорт не завершится.", + "ktg_language_not_ready_about": "К сожалению, в этом неофициальном переводе ({lang_name}) нет текстов приложения Kotatogram Desktop. Вы можете использовать {link}, чтобы помочь с переводом приложения.", + "ktg_outdated_soon": "Иначе приложение перестанет обновляться с {date}.", + "ktg_outdated_now": "Чтобы приложение Kotatogram могло получать обновления.", + "ktg_mac_menu_show": "Показать Kotatogram" } diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp index 7aa97edcd..ad9235dbf 100644 --- a/Telegram/SourceFiles/boxes/connection_box.cpp +++ b/Telegram/SourceFiles/boxes/connection_box.cpp @@ -1033,7 +1033,7 @@ void ProxiesBoxController::ShowApplyConfirmation( } else { Ui::show(Box( (proxy.status() == ProxyData::Status::Unsupported - ? tr::lng_proxy_unsupported(tr::now) + ? tr::ktg_proxy_unsupported(tr::now) : tr::lng_proxy_invalid(tr::now)))); } } diff --git a/Telegram/SourceFiles/boxes/download_path_box.cpp b/Telegram/SourceFiles/boxes/download_path_box.cpp index 18ca38bc6..073606cf0 100644 --- a/Telegram/SourceFiles/boxes/download_path_box.cpp +++ b/Telegram/SourceFiles/boxes/download_path_box.cpp @@ -20,7 +20,7 @@ DownloadPathBox::DownloadPathBox(QWidget *parent) : _path(Global::DownloadPath()) , _pathBookmark(Global::DownloadPathBookmark()) , _group(std::make_shared>(typeFromPath(_path))) -, _default(this, _group, Directory::Downloads, tr::lng_download_path_default_radio(tr::now), st::defaultBoxCheckbox) +, _default(this, _group, Directory::Downloads, tr::ktg_download_path_default_radio(tr::now), st::defaultBoxCheckbox) , _temp(this, _group, Directory::Temp, tr::lng_download_path_temp_radio(tr::now), st::defaultBoxCheckbox) , _dir(this, _group, Directory::Custom, tr::lng_download_path_dir_radio(tr::now), st::defaultBoxCheckbox) , _pathLink(this, QString(), st::boxLinkButton) { diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp index 1391df364..ddc9e8de6 100644 --- a/Telegram/SourceFiles/boxes/passcode_box.cpp +++ b/Telegram/SourceFiles/boxes/passcode_box.cpp @@ -116,7 +116,7 @@ void PasscodeBox::prepare() { ? *_cloudFields.customDescription : _cloudPwd ? tr::lng_cloud_password_about(tr::now) - : tr::lng_passcode_about(tr::now))); + : tr::ktg_passcode_about(tr::now))); _aboutHeight = _about.countHeight(st::boxWidth - st::boxPadding.left() * 1.5); const auto onlyCheck = onlyCheckCurrent(); if (onlyCheck) { diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp index 5154c8019..b8d6a0a9c 100644 --- a/Telegram/SourceFiles/calls/calls_instance.cpp +++ b/Telegram/SourceFiles/calls/calls_instance.cpp @@ -291,7 +291,7 @@ void Instance::requestMicrophonePermissionOrFail(Fn onSuccess) { if (alreadyInCall()) { _currentCall->hangup(); } - Ui::show(Box(tr::lng_no_mic_permission(tr::now), tr::lng_menu_settings(tr::now), crl::guard(this, [] { + Ui::show(Box(tr::ktg_no_mic_permission(tr::now), tr::lng_menu_settings(tr::now), crl::guard(this, [] { Platform::OpenSystemSettingsForPermission(Platform::PermissionType::Microphone); Ui::hideLayer(); }))); diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index dc92ebcae..e38c56735 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -136,7 +136,7 @@ void Changelogs::addLocalLogs() { addBetaLogs(); } if (!_addedSomeLocal) { - const auto text = tr::lng_new_version_wrap( + const auto text = tr::ktg_new_version_wrap( tr::now, lt_version, QString::fromLatin1(AppVersionStr), diff --git a/Telegram/SourceFiles/data/data_cloud_themes.cpp b/Telegram/SourceFiles/data/data_cloud_themes.cpp index e4ec1aaff..c6e932f4d 100644 --- a/Telegram/SourceFiles/data/data_cloud_themes.cpp +++ b/Telegram/SourceFiles/data/data_cloud_themes.cpp @@ -152,7 +152,7 @@ void CloudThemes::resolve( }).fail([=](const RPCError &error) { if (error.type() == qstr("THEME_FORMAT_INVALID")) { Ui::show(Box( - tr::lng_theme_no_desktop(tr::now))); + tr::ktg_theme_no_desktop(tr::now))); } }).send(); } @@ -175,7 +175,7 @@ void CloudThemes::showPreview(const CloudTheme &cloud) { cloud)); } else { Ui::show(Box( - tr::lng_theme_no_desktop(tr::now))); + tr::ktg_theme_no_desktop(tr::now))); } } diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index 020dfed4c..135cf452d 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -486,7 +486,7 @@ void Widget::checkUpdateStatus() { if (_updateTelegram) return; _updateTelegram.create( this, - tr::lng_update_telegram(tr::now), + tr::ktg_update_telegram(tr::now), st::dialogsUpdateButton, st::dialogsInstallUpdate, st::dialogsInstallUpdateOver); diff --git a/Telegram/SourceFiles/export/view/export_view_progress.cpp b/Telegram/SourceFiles/export/view/export_view_progress.cpp index 785b3b48b..6eabfac2d 100644 --- a/Telegram/SourceFiles/export/view/export_view_progress.cpp +++ b/Telegram/SourceFiles/export/view/export_view_progress.cpp @@ -245,7 +245,7 @@ ProgressWidget::ProgressWidget( _about = _body->add( object_ptr( this, - tr::lng_export_progress(tr::now), + tr::ktg_export_progress(tr::now), st::exportAboutLabel), st::exportAboutPadding); diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index 2c53b156c..42a756c5d 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -84,7 +84,7 @@ void activateBotCommand( } break; case ButtonType::Buy: { - Ui::show(Box(tr::lng_payments_not_supported(tr::now))); + Ui::show(Box(tr::ktg_payments_not_supported(tr::now))); } break; case ButtonType::Url: { @@ -104,7 +104,7 @@ void activateBotCommand( case ButtonType::RequestLocation: { hideSingleUseKeyboard(msg); - Ui::show(Box(tr::lng_bot_share_location_unavailable(tr::now))); + Ui::show(Box(tr::ktg_bot_share_location_unavailable(tr::now))); } break; case ButtonType::RequestPhone: { diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index bb31a2075..af041fd59 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -67,7 +67,7 @@ not_null CreateUnsupportedMessage( UserId from) { const auto siteLink = qsl("https://kotatogram.github.io"); auto text = TextWithEntities{ - tr::lng_message_unsupported(tr::now, lt_link, siteLink) + tr::ktg_message_unsupported(tr::now, lt_link, siteLink) }; TextUtilities::ParseEntities(text, Ui::ItemTextNoMonoOptions().flags); text.entities.push_front( diff --git a/Telegram/SourceFiles/intro/introcode.cpp b/Telegram/SourceFiles/intro/introcode.cpp index 2558f7969..14a8a3791 100644 --- a/Telegram/SourceFiles/intro/introcode.cpp +++ b/Telegram/SourceFiles/intro/introcode.cpp @@ -339,7 +339,7 @@ void CodeWidget::gotPassword(const MTPaccount_Password &result) { if (*box) (*box)->closeBox(); }; *box = Ui::show(Box( - tr::lng_passport_app_out_of_date(tr::now), + tr::ktg_passport_app_out_of_date(tr::now), tr::lng_menu_update(tr::now), callback)); return; diff --git a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp index aade61114..73b074f50 100644 --- a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp +++ b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp @@ -118,7 +118,7 @@ NotReadyBox::NotReadyBox( void NotReadyBox::prepare() { setTitle(tr::lng_language_not_ready_title()); - auto text = tr::lng_language_not_ready_about( + auto text = tr::ktg_language_not_ready_about( lt_lang_name, rpl::single(_name) | Ui::Text::ToWithEntities(), lt_link, diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 40b80f9fd..ff501c9dd 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -142,14 +142,14 @@ void MainWindow::firstShow() { : tr::lng_enable_notifications_from_tray(tr::now); if (Platform::IsLinux()) { - trayIconMenu->addAction(tr::lng_open_from_tray(tr::now), this, SLOT(showFromTray())); + trayIconMenu->addAction(tr::ktg_open_from_tray(tr::now), this, SLOT(showFromTray())); trayIconMenu->addAction(tr::lng_minimize_to_tray(tr::now), this, SLOT(minimizeToTray())); trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray())); - trayIconMenu->addAction(tr::lng_quit_from_tray(tr::now), this, SLOT(quitFromTray())); + trayIconMenu->addAction(tr::ktg_quit_from_tray(tr::now), this, SLOT(quitFromTray())); } else { trayIconMenu->addAction(tr::lng_minimize_to_tray(tr::now), this, SLOT(minimizeToTray())); trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray())); - trayIconMenu->addAction(tr::lng_quit_from_tray(tr::now), this, SLOT(quitFromTray())); + trayIconMenu->addAction(tr::ktg_quit_from_tray(tr::now), this, SLOT(quitFromTray())); } Global::RefWorkMode().setForced(Global::WorkMode().value(), true); @@ -571,7 +571,7 @@ void MainWindow::updateTrayMenu(bool force) { connect(toggleAction, SIGNAL(triggered(bool)), this, active ? SLOT(minimizeToTray()) : SLOT(showFromTray())); toggleAction->setText(active ? tr::lng_minimize_to_tray(tr::now) - : tr::lng_open_from_tray(tr::now)); + : tr::ktg_open_from_tray(tr::now)); // On macOS just remove trayIcon menu if the window is not active. // So we will activate the window on click instead of showing the menu. diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.cpp b/Telegram/SourceFiles/passport/passport_panel_controller.cpp index 051c876b1..bdc7cfc81 100644 --- a/Telegram/SourceFiles/passport/passport_panel_controller.cpp +++ b/Telegram/SourceFiles/passport/passport_panel_controller.cpp @@ -982,7 +982,7 @@ void PanelController::showUpdateAppBox() { }; show( Box( - tr::lng_passport_app_out_of_date(tr::now), + tr::ktg_passport_app_out_of_date(tr::now), tr::lng_menu_update(tr::now), callback, [=] { _form->cancelSure(); }), diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 970873969..07154fcc7 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -718,7 +718,7 @@ void MainWindow::createGlobalMenu() { psNewGroup = window->addAction(tr::lng_mac_menu_new_group(tr::now), App::wnd(), SLOT(onShowNewGroup())); psNewChannel = window->addAction(tr::lng_mac_menu_new_channel(tr::now), App::wnd(), SLOT(onShowNewChannel())); window->addSeparator(); - psShowTelegram = window->addAction(tr::lng_mac_menu_show(tr::now), App::wnd(), SLOT(showFromTray())); + psShowTelegram = window->addAction(tr::ktg_mac_menu_show(tr::now), App::wnd(), SLOT(showFromTray())); updateGlobalMenu(); } diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp index 61d7e33d6..4159c0877 100644 --- a/Telegram/SourceFiles/platform/win/main_window_win.cpp +++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp @@ -698,7 +698,7 @@ void MainWindow::psSetupTrayIcon() { void MainWindow::showTrayTooltip() { if (trayIcon && !cSeenTrayTooltip()) { - trayIcon->showMessage(str_const_toString(AppName), tr::lng_tray_icon_text(tr::now), QSystemTrayIcon::Information, 10000); + trayIcon->showMessage(str_const_toString(AppName), tr::ktg_tray_icon_text(tr::now), QSystemTrayIcon::Information, 10000); cSetSeenTrayTooltip(true); Local::writeSettings(); } diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp index 0da98cd4f..2be9ca08f 100644 --- a/Telegram/SourceFiles/settings/settings_advanced.cpp +++ b/Telegram/SourceFiles/settings/settings_advanced.cpp @@ -115,7 +115,7 @@ void SetupUpdate(not_null container) { st::settingsButton); const auto update = Ui::CreateChild