Merge branch 'master' into bots
This commit is contained in:
John Preston
commit
1e72c8a89b
|
|
@ -50,10 +50,11 @@ setup_chroot() {
|
|||
|
||||
if [ ! -f $archive ]; then
|
||||
# get root fs
|
||||
local curl=$(curl --fail -O "$ARCH_TRAVIS_MIRROR/iso/$ARCH_TRAVIS_ARCH_ISO/$archive" 2>&1)
|
||||
curl --fail -O "$ARCH_TRAVIS_MIRROR/iso/$ARCH_TRAVIS_ARCH_ISO/$archive" 2>&1
|
||||
local ret=$?
|
||||
|
||||
# if it fails, try arch iso form the previous month
|
||||
if [ $? -gt 0 ]; then
|
||||
if [ $ret -gt 0 ]; then
|
||||
ARCH_TRAVIS_ARCH_ISO="$(date +%Y.%m -d "-1 month").01"
|
||||
archive="archlinux-bootstrap-$ARCH_TRAVIS_ARCH_ISO-x86_64.tar.gz"
|
||||
as_normal "curl -O $ARCH_TRAVIS_MIRROR/iso/$ARCH_TRAVIS_ARCH_ISO/$archive"
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
de,es,it,ko,nl,pt_BR
|
||||
|
|
@ -891,7 +891,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
"lng_new_version_wrap" = "Telegram Desktop was updated to version {version}\n\n{changes}\n\nFull version history is available here:\n{link}";
|
||||
"lng_new_version_minor" = "— Bug fixes and other minor improvements";
|
||||
"lng_new_version_text" = "PUBLIC GROUPS, PINNED POSTS, 5,000 MEMBERS\n\n— Groups can now have 5,000 members (up from 1,000)\n— Groups of any size may be converted to supergroups\n\nNew tools for supergroup admins:\n\n— Make your group public by setting up a public link – anyone will be able to view the chat and join it\n— Pin messages to keep important updates visible and notify all members\n— Select messages to delete, report as spam, block users, or remove all messages from a user\n\nMore about this update:\n{link}";
|
||||
"lng_new_version_text" = "— Visual improvements";
|
||||
|
||||
"lng_menu_insert_unicode" = "Insert Unicode control character";
|
||||
|
||||
|
|
|
|||
|
|
@ -1025,12 +1025,11 @@ void AppClass::checkMapVersion() {
|
|||
if (Local::oldMapVersion() < AppVersion) {
|
||||
if (Local::oldMapVersion()) {
|
||||
QString versionFeatures;
|
||||
if ((cDevVersion() || cBetaVersion()) && Local::oldMapVersion() < 9035) {
|
||||
// QString ctrl = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? qsl("Cmd") : qsl("Ctrl");
|
||||
versionFeatures = QString::fromUtf8("\xe2\x80\x94 Design improvements\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D));
|
||||
// versionFeatures = lng_new_version_text(lt_link, qsl("https://telegram.org/blog/supergroups5k")).trimmed();
|
||||
} else if (Local::oldMapVersion() < 9031) {
|
||||
versionFeatures = lng_new_version_text(lt_link, qsl("https://telegram.org/blog/supergroups5k")).trimmed();
|
||||
if ((cDevVersion() || cBetaVersion()) && Local::oldMapVersion() < 9040) {
|
||||
// versionFeatures = QString::fromUtf8("\xe2\x80\x94 Design improvements\n\xe2\x80\x94 Bug fixes and other minor improvements");
|
||||
versionFeatures = langNewVersionText();
|
||||
} else if (Local::oldMapVersion() < 9040) {
|
||||
versionFeatures = langNewVersionText();
|
||||
} else {
|
||||
versionFeatures = lang(lng_new_version_minor).trimmed();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
static const int32 AppVersion = 9039;
|
||||
static const wchar_t *AppVersionStr = L"0.9.39";
|
||||
static const bool DevVersion = true;
|
||||
static const int32 AppVersion = 9040;
|
||||
static const wchar_t *AppVersionStr = L"0.9.40";
|
||||
static const bool DevVersion = false;
|
||||
//#define BETA_VERSION (9034004ULL) // just comment this line to build public version
|
||||
|
||||
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
|
||||
|
|
|
|||
|
|
@ -190,15 +190,10 @@ void HistoryInner::enumerateUserpicsInHistory(History *h, int htop, Method metho
|
|||
}
|
||||
|
||||
void HistoryInner::paintEvent(QPaintEvent *e) {
|
||||
if (App::wnd() && App::wnd()->contentOverlapped(this, e)) {
|
||||
if (!App::main() || (App::wnd() && App::wnd()->contentOverlapped(this, e))) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!App::main()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ((_history && _history->hasPendingResizedItems()) || (_migrated && _migrated->hasPendingResizedItems())) {
|
||||
if (hasPendingResizedItems()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1427,9 +1422,7 @@ void HistoryInner::visibleAreaUpdated(int top, int bottom) {
|
|||
_visibleAreaBottom = bottom;
|
||||
|
||||
// if history has pending resize events we should not update scrollTopItem
|
||||
if (_history->hasPendingResizedItems()) {
|
||||
return;
|
||||
} else if (_migrated && _migrated->hasPendingResizedItems()) {
|
||||
if (hasPendingResizedItems()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1651,7 +1644,7 @@ void HistoryInner::onTouchSelect() {
|
|||
}
|
||||
|
||||
void HistoryInner::onUpdateSelected() {
|
||||
if (!_history || _history->hasPendingResizedItems() || (_migrated && _migrated->hasPendingResizedItems())) {
|
||||
if (!_history || hasPendingResizedItems()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -3103,7 +3096,13 @@ void HistoryWidget::sendActionDone(const MTPBool &result, mtpRequestId req) {
|
|||
}
|
||||
|
||||
void HistoryWidget::activate() {
|
||||
if (_history) updateListSize(true);
|
||||
if (_history) {
|
||||
if (!_histInited) {
|
||||
updateListSize(true);
|
||||
} else if (hasPendingResizedItems()) {
|
||||
updateListSize();
|
||||
}
|
||||
}
|
||||
if (App::wnd()) App::wnd()->setInnerFocus();
|
||||
}
|
||||
|
||||
|
|
@ -4932,7 +4931,11 @@ void HistoryWidget::doneShow() {
|
|||
updateReportSpamStatus();
|
||||
updateBotKeyboard();
|
||||
updateControlsVisibility();
|
||||
updateListSize(true);
|
||||
if (!_histInited) {
|
||||
updateListSize(true);
|
||||
} else if (hasPendingResizedItems()) {
|
||||
updateListSize();
|
||||
}
|
||||
preloadHistoryIfNeeded();
|
||||
if (App::wnd()) {
|
||||
App::wnd()->checkHistoryActivation();
|
||||
|
|
@ -6199,7 +6202,7 @@ void HistoryWidget::notify_automaticLoadSettingsChangedGif() {
|
|||
}
|
||||
|
||||
void HistoryWidget::notify_handlePendingHistoryUpdate() {
|
||||
if ((_history && _history->hasPendingResizedItems()) || (_migrated && _migrated->hasPendingResizedItems())) {
|
||||
if (hasPendingResizedItems()) {
|
||||
updateListSize();
|
||||
_list->update();
|
||||
}
|
||||
|
|
@ -7848,7 +7851,12 @@ void HistoryWidget::drawPinnedBar(Painter &p) {
|
|||
}
|
||||
|
||||
void HistoryWidget::paintEvent(QPaintEvent *e) {
|
||||
if (!App::main() || (App::wnd() && App::wnd()->contentOverlapped(this, e))) return;
|
||||
if (!App::main() || (App::wnd() && App::wnd()->contentOverlapped(this, e))) {
|
||||
return;
|
||||
}
|
||||
if (hasPendingResizedItems()) {
|
||||
updateListSize();
|
||||
}
|
||||
|
||||
Painter p(this);
|
||||
QRect r(e->rect());
|
||||
|
|
|
|||
|
|
@ -183,6 +183,11 @@ private:
|
|||
void applyDragSelection(SelectedItems *toItems) const;
|
||||
void addSelectionRange(SelectedItems *toItems, int32 fromblock, int32 fromitem, int32 toblock, int32 toitem, History *h) const;
|
||||
|
||||
// Does any of the shown histories has this flag set.
|
||||
bool hasPendingResizedItems() const {
|
||||
return (_history && _history->hasPendingResizedItems()) || (_migrated && _migrated->hasPendingResizedItems());
|
||||
}
|
||||
|
||||
enum DragAction {
|
||||
NoDrag = 0x00,
|
||||
PrepareDrag = 0x01,
|
||||
|
|
@ -894,6 +899,11 @@ private:
|
|||
};
|
||||
void updateListSize(bool initial = false, bool loadedDown = false, const ScrollChange &change = { ScrollChangeNone, 0 });
|
||||
|
||||
// Does any of the shown histories has this flag set.
|
||||
bool hasPendingResizedItems() const {
|
||||
return (_history && _history->hasPendingResizedItems()) || (_migrated && _migrated->hasPendingResizedItems());
|
||||
}
|
||||
|
||||
// Counts scrollTop for placing the scroll right at the unread
|
||||
// messages bar, choosing from _history and _migrated unreadBar.
|
||||
int unreadBarTop() const;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ static const char *LanguageCodes[] = {
|
|||
"pt_BR",
|
||||
"ko",
|
||||
};
|
||||
static const int languageTest = -1, languageDefault = 0, languageCount = sizeof(LanguageCodes) / sizeof(LanguageCodes[0]);
|
||||
static constexpr int languageTest = -1, languageDefault = 0, languageCount = arraysize(LanguageCodes);
|
||||
|
||||
class LangString : public QString {
|
||||
public:
|
||||
|
|
@ -142,6 +142,10 @@ inline LangString langDateTimeFull(const QDateTime &date) {
|
|||
return lng_mediaview_date_time(lt_date, langDayOfMonthFull(date.date()), lt_time, date.time().toString(cTimeFormat()));
|
||||
}
|
||||
|
||||
inline LangString langNewVersionText() {
|
||||
return lang(lng_new_version_text).trimmed();
|
||||
}
|
||||
|
||||
class LangLoader {
|
||||
public:
|
||||
const QString &errors() const;
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
"lng_new_version_wrap" = "Telegram Desktop wurde aktualisiert auf Version {version}\n\n{changes}\n\nGesamter Versionsverlauf:\n{link}";
|
||||
"lng_new_version_minor" = "— Fehlerbehebungen und Softwareoptimierungen";
|
||||
"lng_new_version_text" = "ÖFFENTLICHE GRUPPEN, NACHRICHTEN ANHEFTEN, 5000 MITGLIEDER\n\n— Gruppen dürfen nun 5.000 Mitglieder haben (zuvor waren es 1.000)\n— Jede Gruppe - egal wie groß - kann ab sofort in eine Supergruppe geändert werden\n\nNeue Werkzeuge für Supergruppen-Admins:\n\n— Mache deine Gruppe öffentlich: Jeder kann den Inhalt einsehen und sie betreten\n— Hefte Nachrichten an: Perfekt um Gruppenmitglieder über Neuigkeiten zu informieren\n— Lösche mehrere Nachrichten, melde sie aufgrund von Spam, blockiere Mitglieder oder entferne alle Nachrichten von bestimmten Nutzern\n\nMehr Infos zum neuen Update:\n{link}";
|
||||
"lng_new_version_text" = "— Optische Verbesserungen (u.a. runde Profilbilder)";
|
||||
|
||||
"lng_menu_insert_unicode" = "Unicode-Steuerzeichen einfügen";
|
||||
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
"lng_new_version_wrap" = "Telegram Desktop ha sido actualizada a la versión {version}\n\n{changes}\n\nEl historial completo está disponible aquí:\n{link}";
|
||||
"lng_new_version_minor" = "— Corrección de errores y otras mejoras menores";
|
||||
"lng_new_version_text" = "GRUPOS PÚBLICOS, PUBLICACIONES ANCLADAS, 5000 MIEMBROS\n\n— Los grupos ahora pueden tener hasta 5000 miembros (antes eran 1000)\n— Los grupos de cualquier tamaño pueden ser convertidos en supergrupos\n\nNuevas herramientas para los administradores de supergrupos:\n\n— Haz público tu grupo, generando un enlace público. Cualquiera podrá ver el chat y unirse.\n— Ancla mensajes, para mantener visible lo importante, y notifica a todos los miembros.\n— Elige varios mensajes para eliminar, reportar como spam, bloquear usuarios o quitar todos los mensajes de un usuario en particular.\n\nMás sobre esta actualización:\n{link}";
|
||||
"lng_new_version_text" = "– Mejoras visuales";
|
||||
|
||||
"lng_menu_insert_unicode" = "Insertar caracteres de control Unicode";
|
||||
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
"lng_new_version_wrap" = "Telegram Desktop si è aggiornato alla versione {version}\n\n{changes}\n\nLa cronologia degli aggiornamenti è disponibile qui:\n{link}";
|
||||
"lng_new_version_minor" = "— Risoluzione di problemi e altri miglioramenti minori";
|
||||
"lng_new_version_text" = "GRUPPI PUBBLICI, POST FISSATI, 5000 MEMBRI\n\n— I gruppi possono ora avere fino a 5000 membri (dai precedenti 1000)\n— Puoi convertire qualsiasi gruppo in supergruppo\n\nNuovi strumenti per gli amministratori dei supergruppi:\n\n— Rendi pubblico il tuo gruppo inserendo un link - chiunque sarà in grado di vedere la chat e unirsi\n— Fissa i messaggi per rendere gli aggiornamenti importanti visibili\n— Seleziona diversi messaggi per eliminarli, segnalarli, bloccare utenti ed eliminare i loro messaggi\n\nPiù info su questo aggiornamento:\n{link}";
|
||||
"lng_new_version_text" = "— Miglioramenti visivi";
|
||||
|
||||
"lng_menu_insert_unicode" = "Inserisci carattere di controllo Unicode";
|
||||
|
||||
|
|
|
|||
|
|
@ -86,8 +86,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_cancel" = "취소";
|
||||
"lng_continue" = "계속";
|
||||
"lng_close" = "닫기";
|
||||
"lng_connecting" = "Connecting...";
|
||||
"lng_reconnecting" = "Reconnect {count:now|in # s|in # s}...";
|
||||
"lng_connecting" = "연결중...";
|
||||
"lng_reconnecting" = "재연결중..{count:now|in # 초|in # 초}...";
|
||||
"lng_reconnecting_try_now" = "다시 시도";
|
||||
|
||||
"lng_status_service_notifications" = "서비스 알림";
|
||||
|
|
@ -108,7 +108,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_status_lastseen_date" = "{date}에 마지막으로 접속";
|
||||
"lng_status_lastseen_date_time" = "{date}일 {time}에 마지막으로 접속";
|
||||
"lng_status_online" = "온라인";
|
||||
"lng_status_connecting" = "connecting...";
|
||||
"lng_status_connecting" = "연결중...";
|
||||
|
||||
"lng_chat_status_unaccessible" = "그룹 접근 불가";
|
||||
"lng_chat_status_members" = "{count:맴버 없음|#명|#명}";
|
||||
|
|
@ -127,7 +127,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_edit_deleted" = "메시지는 삭제 되었습니다.";
|
||||
"lng_edit_too_long" = "메시지 길이가 너무 깁니다.";
|
||||
"lng_edit_message" = "메시지 수정";
|
||||
"lng_edit_message_text" = "New message text...";
|
||||
"lng_edit_message_text" = "새로운 메시지...";
|
||||
"lng_deleted" = "알 수 없음";
|
||||
"lng_deleted_message" = "삭제된 메시지";
|
||||
"lng_pinned_message" = "고정된 메시지";
|
||||
|
|
@ -162,7 +162,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_code_telegram" = "[b]텔레그램[/b] 앱으로 부터 방금 수신받은,\n코드를 입력해주세요.";
|
||||
"lng_code_no_telegram" = "코드를 SMS로 전송";
|
||||
"lng_code_call" = "텔레그램이 {minutes}:{seconds}후에는 전화를 겁니다.";
|
||||
"lng_code_calling" = "Requesting a call from Telegram...";
|
||||
"lng_code_calling" = "텔레그램으로부터 전화 요청을 하고 있습니다...";
|
||||
"lng_code_called" = "텔레그램이 회원님의 전화번호로 전화를 걸었습니다.";
|
||||
|
||||
"lng_bad_phone" = "잘못된 전화번호입니다. 다시 시도해주세요.";
|
||||
|
|
@ -201,7 +201,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_dlg_new_channel_name" = "채널명";
|
||||
"lng_no_contacts" = "연락처가 없습니다.";
|
||||
"lng_no_chats" = "대화시 대화방이 존재 할 곳입니다.";
|
||||
"lng_contacts_loading" = "Loading...";
|
||||
"lng_contacts_loading" = "로딩중...";
|
||||
"lng_contacts_not_found" = "연락처를 찾을 수 없음";
|
||||
"lng_dlg_search_chat" = "이 채팅에서 검색";
|
||||
"lng_dlg_search_channel" = "이 채널방에서 검색";
|
||||
|
|
@ -210,7 +210,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_settings_save" = "저장";
|
||||
"lng_settings_upload" = "프로필 이미지 선택";
|
||||
"lng_settings_crop_profile" = "프로필 사진으로 사용할 사각영역을 선택하세요";
|
||||
"lng_settings_uploading_photo" = "Uploading photo...";
|
||||
"lng_settings_uploading_photo" = "사진 업로드 중...";
|
||||
|
||||
"lng_username_title" = "아이디";
|
||||
"lng_username_about" = "텔레그램 아이디를 설정할 수 있습니다. \n아이디를 설정하면 회원님의 전화번호를 몰라도 아이디로 회원님을 찾아 대화를 나눌 수 있습니다.\n아이디는 영문, 밑줄, 숫자로 a-z, _, 0-9, \n다섯 글자 이상으로 설정해 주세요.";
|
||||
|
|
@ -247,9 +247,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_settings_auto_update" = "자동 업데이트";
|
||||
"lng_settings_current_version" = " {version}";
|
||||
"lng_settings_check_now" = "업데이트 확인";
|
||||
"lng_settings_update_checking" = "Checking for updates...";
|
||||
"lng_settings_update_checking" = "업데이트 확인 중...";
|
||||
"lng_settings_latest_installed" = "최신 버전이 설치되어 있습니다.";
|
||||
"lng_settings_downloading" = "Downloading update {ready} / {total} MB...";
|
||||
"lng_settings_downloading" = "데이트를 다운로드 중 {ready} / {total} MB..";
|
||||
"lng_settings_update_ready" = "새로운 버전을 설치 할 수 있습니다.";
|
||||
"lng_settings_update_now" = "재시작 합니다.";
|
||||
"lng_settings_update_fail" = "업데이트 확인 실패 :(";
|
||||
|
|
@ -291,7 +291,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_download_path_failed" = "파일 다운로드를 시작 할 수 없습니다. 올바르지 않은 다운로드 경로가 원인 일 수도 있습니다.\n\n설정에 가시면 다운로드 경로를 변경하실 수 있습니다.";
|
||||
"lng_download_path_settings" = "설정";
|
||||
"lng_download_finish_failed" = "파일 다운로드를 끝낼 수 없습니다.\n\n다시 시도하시겠습니까?";
|
||||
"lng_download_path_clearing" = "Clearing...";
|
||||
"lng_download_path_clearing" = "초기화 중..";
|
||||
"lng_download_path_cleared" = "초기화 완료!";
|
||||
"lng_download_path_clear_failed" = "초기화 실패 :(";
|
||||
|
||||
|
|
@ -300,7 +300,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_settings_images_cached" = "{count:_not_used_|이미지 #개|이미지 #개}, {size}";
|
||||
"lng_settings_audios_cached" = "{count:_not_used_|음성 메시지 #개|음성 메시지 #개}, {size}";
|
||||
"lng_local_storage_clear" = "전체 정리";
|
||||
"lng_local_storage_clearing" = "Clearing...";
|
||||
"lng_local_storage_clearing" = "초기화 중..";
|
||||
"lng_local_storage_cleared" = "초기화 완료!";
|
||||
"lng_local_storage_clear_failed" = "초기화 실패 :(";
|
||||
|
||||
|
|
@ -331,7 +331,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_passcode_logout" = "로그아웃";
|
||||
"lng_passcode_need_unblock" = "잠금코드를 먼저 해제해주세요.";
|
||||
|
||||
"lng_cloud_password_waiting" = "Confirmation link sent to {email}...";
|
||||
"lng_cloud_password_waiting" = "{email}로 확인 이메일을 전송하였습니다..";
|
||||
"lng_cloud_password_change" = "클라우드 비밀번호 변경";
|
||||
"lng_cloud_password_create" = "클라우드 비밀번호";
|
||||
"lng_cloud_password_remove" = "클라우드 비밀번호 삭제";
|
||||
|
|
@ -358,9 +358,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_cloud_password_is_same" = "비밀번호가 변경되지 않았습니다.";
|
||||
|
||||
"lng_connection_type" = "연결 유형:";
|
||||
"lng_connection_auto_connecting" = "Default (connecting...)";
|
||||
"lng_connection_auto_connecting" = "기본값 (연결중...)";
|
||||
"lng_connection_auto" = "기본값 ({transport} 사용)";
|
||||
"lng_connection_proxy_connecting" = "Connecting through proxy...";
|
||||
"lng_connection_proxy_connecting" = "프록시 연결 중...";
|
||||
"lng_connection_proxy" = "{transport} 프록시 연결";
|
||||
"lng_connection_header" = "연결 유형";
|
||||
"lng_connection_auto_rb" = "자동 (사용 가능하다면 TCP 아니면 HTTP 사용)";
|
||||
|
|
@ -396,7 +396,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_sessions_other_desc" = "동일한 휴대번호로 다른 휴대기기, 태블릿과 데스크탑에서 텔레그램 로그인이 가능합니다. 모든 데이터는 즉시 동기화 됩니다.";
|
||||
"lng_sessions_terminate_all" = "다른 모든 세션 강제 종료";
|
||||
|
||||
"lng_preview_loading" = "Getting Link Info...";
|
||||
"lng_preview_loading" = "링크 정보를 가져오는 중..";
|
||||
|
||||
"lng_profile_chat_unaccessible" = "그룹에 접근할 수 없습니다.";
|
||||
"lng_topbar_info" = "정보";
|
||||
|
|
@ -439,7 +439,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_profile_sure_kick" = "{user}를 추방하시겠습니까?";
|
||||
"lng_profile_sure_kick_channel" = "{user}를 추방하시겠습니까?";
|
||||
"lng_profile_sure_kick_admin" = "{user}를 관리자에서 제외 하시겠습니까?";
|
||||
"lng_profile_loading" = "Loading...";
|
||||
"lng_profile_loading" = "로드중..";
|
||||
"lng_profile_shared_media" = "공유된 미디어";
|
||||
"lng_profile_no_media" = "대화에 미디어가 존재하지 않습니다.";
|
||||
"lng_profile_photos" = "{count:_not_used_|#개의 사진|#개의 사진} »";
|
||||
|
|
@ -455,7 +455,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_profile_shared_links" = "{count:_not_used_|# 공유된 링크|# 공유된 링크} »";
|
||||
"lng_profile_shared_links_header" = "공유된 링크 현황";
|
||||
"lng_profile_copy_phone" = "전화번호 복사";
|
||||
"lng_profile_copy_fullname" = "Copy name";
|
||||
"lng_profile_copy_fullname" = "이름 복사";
|
||||
|
||||
"lng_channel_add_admins" = "새로운 관리자";
|
||||
"lng_channel_add_members" = "구성원 추가";
|
||||
|
|
@ -660,13 +660,13 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_stickers_remove" = "삭제";
|
||||
"lng_stickers_return" = "실행취소";
|
||||
"lng_stickers_restore" = "복구";
|
||||
"lng_stickers_count" = "{count:Loading...|# sticker|# stickers}";
|
||||
"lng_stickers_count" = "{count:Loading...|# 스티커|# 스티커}";
|
||||
|
||||
"lng_in_dlg_photo" = "사진";
|
||||
"lng_in_dlg_video" = "Video file";
|
||||
"lng_in_dlg_audio_file" = "Audio file";
|
||||
"lng_in_dlg_video" = "비디오 파일";
|
||||
"lng_in_dlg_audio_file" = "음성 파일";
|
||||
"lng_in_dlg_contact" = "연락처";
|
||||
"lng_in_dlg_audio" = "Voice message";
|
||||
"lng_in_dlg_audio" = "음성 메시지";
|
||||
"lng_in_dlg_file" = "파일";
|
||||
"lng_in_dlg_sticker" = "스티커";
|
||||
"lng_in_dlg_sticker_emoji" = "{emoji} (스티커)";
|
||||
|
|
@ -680,20 +680,20 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_report_spam_sure_group" = "선택한 그룹메시지를 스팸으로 신고하시겠습니까?";
|
||||
"lng_report_spam_sure_channel" = "선택한 채널메시지를 스팸으로 신고하시겠습니까?";
|
||||
"lng_report_spam_ok" = "신고하기";
|
||||
"lng_cant_send_to_not_contact" = "Sorry, you can only send messages to\nmutual contacts at the moment.\n{more_info}";
|
||||
"lng_cant_invite_not_contact" = "Sorry, you can only add mutual contacts\nto groups at the moment.\n{more_info}";
|
||||
"lng_cant_invite_not_contact_channel" = "Sorry, you can only add mutual contacts\nto channels at the moment.\n{more_info}";
|
||||
"lng_cant_send_to_not_contact" = "죄송하지만, 현재 서로 연락처가 추가된 \n회원들끼리만 전송이 가능합니다. \n{more_info}";
|
||||
"lng_cant_invite_not_contact" = "죄송하지만, 현재 그룹방에 서로 연락처가 추가된 \n회원들끼리만 추가 가능합니다. {more_info}";
|
||||
"lng_cant_invite_not_contact_channel" = "죄송하지만, 현재 채널방에 서로 연락처가 추가된 \n회원들끼리만 추가 가능합니다. \n{more_info}";
|
||||
"lng_cant_more_info" = "자세한 정보 »";
|
||||
"lng_cant_invite_banned" = "Sorry, only admin can add this user.";
|
||||
"lng_cant_invite_banned" = "죄송하지만, 관리자만 회원 추가가 가능합니다.";
|
||||
"lng_cant_invite_privacy" = "죄송합니다, 개인설정으로 인하여 이 사용자를 그룹에 초대할 수 없습니다.";
|
||||
"lng_cant_invite_privacy_channel" = "죄송합니다, 개인설정으로 인하여 이 사용자를 채널에 초대할 수 없습니다.";
|
||||
"lng_cant_do_this" = "Sorry, this action is unavailable.";
|
||||
"lng_cant_do_this" = "죄송하지만, 할 수 없는 기능입니다.";
|
||||
|
||||
"lng_send_button" = "보내기";
|
||||
"lng_message_ph" = "Write a message...";
|
||||
"lng_comment_ph" = "Write a comment...";
|
||||
"lng_broadcast_ph" = "Broadcast a message...";
|
||||
"lng_broadcast_silent_ph" = "Silent broadcast...";
|
||||
"lng_message_ph" = "메시지 쓰기..";
|
||||
"lng_comment_ph" = "코멘트 쓰기...";
|
||||
"lng_broadcast_ph" = "단체메시지 쓰기...";
|
||||
"lng_broadcast_silent_ph" = "음소거 메시지...";
|
||||
"lng_record_cancel" = "이 영역 밖에서 마우스 클릭을 해제하시면 취소가 됩니다.";
|
||||
"lng_will_be_notified" = "메시지 작성시 구성원들에게 알림이 갑니다.";
|
||||
"lng_wont_be_notified" = "메시지 작성시 구성원들에게 알림이 가지 않습니다.";
|
||||
|
|
@ -721,29 +721,29 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_user_typing" = "{user}님이 입력중입니다.";
|
||||
"lng_users_typing" = "{user}님과 {second_user}님이 입력중입니다.";
|
||||
"lng_many_typing" = "{count:_not_used_|#명이|#명이} 입력중입니다";
|
||||
"lng_send_action_record_video" = "recording a video";
|
||||
"lng_user_action_record_video" = "{user} is recording a video";
|
||||
"lng_send_action_upload_video" = "sending a video";
|
||||
"lng_user_action_upload_video" = "{user} is sending a video";
|
||||
"lng_send_action_record_audio" = "recording a voice message";
|
||||
"lng_user_action_record_audio" = "{user} is recording a voice message";
|
||||
"lng_send_action_upload_audio" = "sending a voice message";
|
||||
"lng_user_action_upload_audio" = "{user} is sending a voice message";
|
||||
"lng_send_action_upload_photo" = "sending a photo";
|
||||
"lng_user_action_upload_photo" = "{user} is sending a photo";
|
||||
"lng_send_action_upload_file" = "sending a file";
|
||||
"lng_user_action_upload_file" = "{user} is sending a file";
|
||||
"lng_send_action_geo_location" = "picking a location";
|
||||
"lng_user_action_geo_location" = "{user} is picking a location";
|
||||
"lng_send_action_choose_contact" = "choosing a contact";
|
||||
"lng_user_action_choose_contact" = "{user} is choosing a contact";
|
||||
"lng_send_action_record_video" = "비디오 녹화 중";
|
||||
"lng_user_action_record_video" = "{user}님이 녹화중입니다";
|
||||
"lng_send_action_upload_video" = "비디오 전송 중";
|
||||
"lng_user_action_upload_video" = "{user}님이 비디오를 전송 중입니다.";
|
||||
"lng_send_action_record_audio" = "음송 메시지 녹음 중";
|
||||
"lng_user_action_record_audio" = "{user}님이 오디오를 녹음 중입니다";
|
||||
"lng_send_action_upload_audio" = "음성 메시지 전송 중";
|
||||
"lng_user_action_upload_audio" = "{user}님이 음성 메시지는 전송 중입니다";
|
||||
"lng_send_action_upload_photo" = "사진 전송 중";
|
||||
"lng_user_action_upload_photo" = "{user}님이 사진을 전송 중입니다";
|
||||
"lng_send_action_upload_file" = "파일 전송 중";
|
||||
"lng_user_action_upload_file" = "{user}님이 파일을 전송 중입니다";
|
||||
"lng_send_action_geo_location" = "위치 선택 중";
|
||||
"lng_user_action_geo_location" = "{user}님이 위치를 선택 중입닏";
|
||||
"lng_send_action_choose_contact" = "연락처 선택 중";
|
||||
"lng_user_action_choose_contact" = "{user}님이 연락처를 선택 중입니다";
|
||||
"lng_unread_bar" = "{count:_not_used_|#개의 읽지 않은 메시지|#개의 읽지 않은 메시지}";
|
||||
|
||||
"lng_maps_point" = "위치";
|
||||
"lng_save_photo" = "사진 저장";
|
||||
"lng_save_video" = "Save video file";
|
||||
"lng_save_audio_file" = "Save audio file";
|
||||
"lng_save_audio" = "Save voice message";
|
||||
"lng_save_video" = "동영상 저장";
|
||||
"lng_save_audio_file" = "음성파일 저장";
|
||||
"lng_save_audio" = "음성 메시지 저장";
|
||||
"lng_save_file" = "파일 저장";
|
||||
"lng_save_downloaded" = "{ready} / {total} {mb}";
|
||||
"lng_duration_and_size" = "{duration}, {size}";
|
||||
|
|
@ -760,7 +760,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_context_copy_email" = "이메일 복사";
|
||||
"lng_context_copy_hashtag" = "해시태그 복사";
|
||||
"lng_context_copy_mention" = "아이디 복사";
|
||||
"lng_context_save_image" = "Save Image As...";
|
||||
"lng_context_save_image" = "이미지를 다른 이름으로 저장..";
|
||||
"lng_context_forward_image" = "이미지 전달";
|
||||
"lng_context_delete_image" = "이미지 삭제";
|
||||
"lng_context_copy_image" = "이미지 복사";
|
||||
|
|
@ -768,12 +768,12 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_context_cancel_download" = "다운로드 취소";
|
||||
"lng_context_show_in_folder" = "탐색기에서 보기";
|
||||
"lng_context_show_in_finder" = "탐색기에서 보기";
|
||||
"lng_context_save_video" = "Save Video File As...";
|
||||
"lng_context_save_audio_file" = "Save Audio File As...";
|
||||
"lng_context_save_audio" = "Save Voice Message As...";
|
||||
"lng_context_save_video" = "비디오를 다른 이름으로 저장...";
|
||||
"lng_context_save_audio_file" = "음성파일을 다른 이름으로 저장...";
|
||||
"lng_context_save_audio" = "음성메시지를 다른 이름으로 저장...";
|
||||
"lng_context_pack_info" = "팩 정보";
|
||||
"lng_context_pack_add" = "스티커 추가";
|
||||
"lng_context_save_file" = "Save File As...";
|
||||
"lng_context_save_file" = "파일을 다른 이름으로 저장...";
|
||||
"lng_context_forward_file" = "파일 전달";
|
||||
"lng_context_delete_file" = "파일 삭제";
|
||||
"lng_context_close_file" = "파일 닫기";
|
||||
|
|
@ -800,7 +800,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_send_image_too_large" = "파일이 1.5GB 보다 큼으로 전송 할 수 없습니다 :(";
|
||||
"lng_send_folder" = " «{name}»은 폴더이기 때문에 전송 할 수 없습니다 :(";
|
||||
|
||||
"lng_forward_choose" = "Choose recipient...";
|
||||
"lng_forward_choose" = "수신자를 선택..";
|
||||
"lng_forward_cant" = "이쪽으로 전달 할 수 없습니다 :(";
|
||||
"lng_forward_confirm" = "{recipient} 님에게 전달하시겠습니까?";
|
||||
"lng_forward_share_contact" = "{recipient} 님에게 연락처를 공유하시겠습니까?";
|
||||
|
|
@ -863,7 +863,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_search_global_results" = "아이디 검색 결과";
|
||||
|
||||
"lng_media_save_progress" = "{ready} / {total} {mb}";
|
||||
"lng_mediaview_save_as" = "Save As...";
|
||||
"lng_mediaview_save_as" = " 다른 이름으로 저장...";
|
||||
"lng_mediaview_copy" = "복사하기";
|
||||
"lng_mediaview_forward" = "전달";
|
||||
"lng_mediaview_delete" = "삭제";
|
||||
|
|
@ -886,7 +886,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
"lng_new_version_wrap" = "텔레그램 데스크탑은 {version} 버전으로 업데이트 되었습니다.\n\n{changes}\n\n전체 버전 히스토리는 아래에서 확인 가능합니다:\n{link}";
|
||||
"lng_new_version_minor" = "— 버그 수정 및 일부 기능 향상";
|
||||
"lng_new_version_text" = "공개 그룹, 메시지 고정, 5,000명\n\n— 그룹은 5,000명까지 가능 (기존 1,000명)\n— 모든 그룹은 구성원 크기에 상관 없이 슈퍼그룹으로 변환 가능\n\n슈퍼그룹 관리기능 추가:\n\n— 공개링크를 생성하여 그룹공개 가능 - 누구나 참여하여 대화가능\n— 메시지를 고정하여 중요한 내용을 표시하고 모두에게 알림\n— 여러 메시지를 선택하여 삭제, 스팸신고, 차단 혹은 특정 유저에게 메시지 삭제 가능\n\n자세한 사항:\n{link}";
|
||||
"lng_new_version_text" = "— 비주얼 향상";
|
||||
|
||||
"lng_menu_insert_unicode" = "유니코드 문자를 입력하세요.";
|
||||
|
||||
|
|
|
|||
|
|
@ -663,10 +663,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_stickers_count" = "{count:Laden..|# sticker|# stickers}";
|
||||
|
||||
"lng_in_dlg_photo" = "Foto";
|
||||
"lng_in_dlg_video" = "Video file";
|
||||
"lng_in_dlg_audio_file" = "Audio file";
|
||||
"lng_in_dlg_video" = "Video";
|
||||
"lng_in_dlg_audio_file" = "Audiobestand";
|
||||
"lng_in_dlg_contact" = "Contact";
|
||||
"lng_in_dlg_audio" = "Voice message";
|
||||
"lng_in_dlg_audio" = "Spraakbericht";
|
||||
"lng_in_dlg_file" = "Bestand";
|
||||
"lng_in_dlg_sticker" = "Sticker";
|
||||
"lng_in_dlg_sticker_emoji" = "{emoji} (sticker)";
|
||||
|
|
@ -741,9 +741,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
"lng_maps_point" = "Locatie";
|
||||
"lng_save_photo" = "Afbeelding opslaan";
|
||||
"lng_save_video" = "Save video file";
|
||||
"lng_save_audio_file" = "Save audio file";
|
||||
"lng_save_audio" = "Save voice message";
|
||||
"lng_save_video" = "Video opslaan";
|
||||
"lng_save_audio_file" = "Audio opslaan";
|
||||
"lng_save_audio" = "Spraakbericht opslaan";
|
||||
"lng_save_file" = "Bestand opslaan";
|
||||
"lng_save_downloaded" = "{ready} / {total} {mb}";
|
||||
"lng_duration_and_size" = "{duration}, {size}";
|
||||
|
|
@ -768,9 +768,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_context_cancel_download" = "Download annuleren";
|
||||
"lng_context_show_in_folder" = "Weergeven in map";
|
||||
"lng_context_show_in_finder" = "Weergeven in Finder";
|
||||
"lng_context_save_video" = "Save Video File As...";
|
||||
"lng_context_save_audio_file" = "Save Audio File As...";
|
||||
"lng_context_save_audio" = "Save Voice Message As...";
|
||||
"lng_context_save_video" = "Video opslaan als...";
|
||||
"lng_context_save_audio_file" = "Video opslaan als...";
|
||||
"lng_context_save_audio" = "Spraakbericht opslaan als...";
|
||||
"lng_context_pack_info" = "Bundelinformatie";
|
||||
"lng_context_pack_add" = "Stickers toevoegen";
|
||||
"lng_context_save_file" = "Bestand opslaan als...";
|
||||
|
|
@ -886,7 +886,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
"lng_new_version_wrap" = "Telegram is bijgewerkt naar versie {version}\n\n{changes} \n\nVolledige versiegeschiedenis is hier te vinden:\n{link}";
|
||||
"lng_new_version_minor" = "— Probleemoplossing en andere kleine verbeteringen";
|
||||
"lng_new_version_text" = "PUBLIEKE GROEPEN, BERICHTEN VASTZETTEN, 5000 LEDEN\n\n— Ledenlimiet voor iedere groepsvorm opgehoogd naar 5000 (voorheen 1000).\n— Iedere groep met een willekeurig aantal leden kan nu worden opgewaardeerd naar een supergroep.\n\nNieuwe functies voor beheerders van supergroepen:\n\n— Maak je groep openbaar door een publieke link in te stellen - iedereen kan de chat zien en er lid van worden.\n— Zet berichten vast om belangrijke informatie weer te geven en alle leden te informeren.\n— Selecteer berichten om te verwijderen, ze als spam te melden, gebruikers te blokkeren of om alle berichten van bepaalde gebruikers ineens te verwijderen.\n\nMeer informatie over deze update:\n{link}";
|
||||
"lng_new_version_text" = "— Visuele verbeteringen";
|
||||
|
||||
"lng_menu_insert_unicode" = "Unicode-besturingsteken invoegen";
|
||||
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
"lng_new_version_wrap" = "Telegram Desktop foi atualizado para a versão {version}\n\n{changes}\n\nHistórico completo de mudanças disponível aqui:\n{link}";
|
||||
"lng_new_version_minor" = "— Resolução de bugs e outras melhorias menores";
|
||||
"lng_new_version_text" = "GRUPOS PÚBLICOS, POSTS FIXADOS, 5.000 MEMBROS\n\n— Grupos agora podem ter até 5.000 membros (mais que 1.000)\n— Grupos de qualquer tamanho podem ser convertidos a supergrupos\n\nNovas ferramentas para administradores dos supergrupos:\n\n— Torne seu grupo público configurando um link público - qualquer um poderá ver a conversa e entrar nela\n— Fixe mensagens para manter as atualizações mais importantes visíveis e notificar todos os membros\n— Selecione várias mensagens para apagar, reporte por spam, bloqueie usuários ou remova todas as mensagens de certos usuários\n\nMais sobre essa atualização:\n{link}";
|
||||
"lng_new_version_text" = "— Melhorias no visual";
|
||||
|
||||
"lng_menu_insert_unicode" = "Inserir caractere de controle Unicode";
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
#include "audio.h"
|
||||
|
||||
#include "langloaderplain.h"
|
||||
|
||||
TopBarWidget::TopBarWidget(MainWidget *w) : TWidget(w)
|
||||
, a_over(0)
|
||||
, _a_appearance(animation(this, &TopBarWidget::step_appearance))
|
||||
|
|
@ -1354,6 +1356,46 @@ DialogsIndexed &MainWidget::dialogsList() {
|
|||
return dialogs.dialogsList();
|
||||
}
|
||||
|
||||
namespace {
|
||||
QString parseCommandFromMessage(History *history, const QString &message) {
|
||||
if (history->peer->id != peerFromUser(ServiceUserId)) {
|
||||
return QString();
|
||||
}
|
||||
if (message.size() < 3 || message.at(0) != '*' || message.at(message.size() - 1) != '*') {
|
||||
return QString();
|
||||
}
|
||||
QString command = message.mid(1, message.size() - 2);
|
||||
QStringList commands;
|
||||
commands.push_back(qsl("new_version_text"));
|
||||
commands.push_back(qsl("all_new_version_texts"));
|
||||
if (commands.indexOf(command) < 0) {
|
||||
return QString();
|
||||
}
|
||||
return command;
|
||||
}
|
||||
|
||||
void executeParsedCommand(const QString &command) {
|
||||
if (command.isEmpty() || !App::wnd()) {
|
||||
return;
|
||||
}
|
||||
if (command == qsl("new_version_text")) {
|
||||
App::wnd()->serviceNotification(langNewVersionText());
|
||||
} else if (command == qsl("all_new_version_texts")) {
|
||||
for (int i = 0; i < languageCount; ++i) {
|
||||
LangLoaderResult result;
|
||||
if (i) {
|
||||
LangLoaderPlain loader(qsl(":/langs/lang_") + LanguageCodes[i] + qsl(".strings"), LangLoaderRequest(lng_language_name, lng_new_version_text));
|
||||
result = loader.found();
|
||||
} else {
|
||||
result.insert(lng_language_name, langOriginal(lng_language_name));
|
||||
result.insert(lng_new_version_text, langOriginal(lng_new_version_text));
|
||||
}
|
||||
App::wnd()->serviceNotification(result.value(lng_language_name, LanguageCodes[i] + qsl(" language")) + qsl(":\n\n") + result.value(lng_new_version_text, qsl("--none--")));
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
void MainWidget::sendMessage(History *hist, const QString &text, MsgId replyTo, bool broadcast, bool silent, WebPageId webPageId) {
|
||||
readServerHistory(hist, false);
|
||||
history.fastShowAtEnd(hist);
|
||||
|
|
@ -1367,8 +1409,10 @@ void MainWidget::sendMessage(History *hist, const QString &text, MsgId replyTo,
|
|||
EntitiesInText sendingEntities, leftEntities;
|
||||
QString sendingText, leftText = prepareTextWithEntities(text, leftEntities, itemTextOptions(hist, App::self()).flags);
|
||||
|
||||
QString command = parseCommandFromMessage(hist, text);
|
||||
|
||||
if (replyTo < 0) replyTo = history.replyToId();
|
||||
while (textSplit(sendingText, sendingEntities, leftText, leftEntities, MaxMessageSize)) {
|
||||
while (command.isEmpty() && textSplit(sendingText, sendingEntities, leftText, leftEntities, MaxMessageSize)) {
|
||||
FullMsgId newId(peerToChannel(hist->peer->id), clientMsgId());
|
||||
uint64 randomId = rand_value<uint64>();
|
||||
|
||||
|
|
@ -1415,6 +1459,8 @@ void MainWidget::sendMessage(History *hist, const QString &text, MsgId replyTo,
|
|||
}
|
||||
|
||||
finishForwarding(hist, broadcast, silent);
|
||||
|
||||
executeParsedCommand(command);
|
||||
}
|
||||
|
||||
void MainWidget::saveRecentHashtags(const QString &text) {
|
||||
|
|
|
|||
|
|
@ -1198,6 +1198,10 @@ void SettingsInner::onUpdatePhotoCancel() {
|
|||
}
|
||||
|
||||
void SettingsInner::onUpdatePhoto() {
|
||||
if (!self()) {
|
||||
return;
|
||||
}
|
||||
|
||||
saveError();
|
||||
|
||||
QStringList imgExtensions(cImgExtensions());
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.9.39</string>
|
||||
<string>0.9.40</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleURLTypes</key>
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico"
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 0,9,39,0
|
||||
PRODUCTVERSION 0,9,39,0
|
||||
FILEVERSION 0,9,40,0
|
||||
PRODUCTVERSION 0,9,40,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
|
@ -51,10 +51,10 @@ BEGIN
|
|||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Telegram Messenger LLP"
|
||||
VALUE "FileVersion", "0.9.39.0"
|
||||
VALUE "FileVersion", "0.9.40.0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
|
||||
VALUE "ProductName", "Telegram Desktop"
|
||||
VALUE "ProductVersion", "0.9.39.0"
|
||||
VALUE "ProductVersion", "0.9.40.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
|||
|
|
@ -1772,7 +1772,7 @@
|
|||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
CURRENT_PROJECT_VERSION = 0.9.39;
|
||||
CURRENT_PROJECT_VERSION = 0.9.40;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
|
|
@ -1791,7 +1791,7 @@
|
|||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
COPY_PHASE_STRIP = YES;
|
||||
CURRENT_PROJECT_VERSION = 0.9.39;
|
||||
CURRENT_PROJECT_VERSION = 0.9.40;
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
||||
GCC_OPTIMIZATION_LEVEL = fast;
|
||||
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
|
||||
|
|
@ -1820,10 +1820,10 @@
|
|||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
CODE_SIGN_IDENTITY = "";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
CURRENT_PROJECT_VERSION = 0.9.39;
|
||||
CURRENT_PROJECT_VERSION = 0.9.40;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
DYLIB_COMPATIBILITY_VERSION = 0.9;
|
||||
DYLIB_CURRENT_VERSION = 0.9.39;
|
||||
DYLIB_CURRENT_VERSION = 0.9.40;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
FRAMEWORK_SEARCH_PATHS = "";
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||
|
|
@ -1961,10 +1961,10 @@
|
|||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
CODE_SIGN_IDENTITY = "";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
CURRENT_PROJECT_VERSION = 0.9.39;
|
||||
CURRENT_PROJECT_VERSION = 0.9.40;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
DYLIB_COMPATIBILITY_VERSION = 0.9;
|
||||
DYLIB_CURRENT_VERSION = 0.9.39;
|
||||
DYLIB_CURRENT_VERSION = 0.9.40;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
FRAMEWORK_SEARCH_PATHS = "";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
cd ../../
|
||||
tx pull -fa
|
||||
while IFS='' read -r line || [[ -n "$line" ]]; do
|
||||
tx pull -f -l $line
|
||||
done < tdesktop/Telegram/Resources/LangList
|
||||
cd translations/telegram-desktop.langstrings/
|
||||
for file in *.strings; do
|
||||
if [ "$file" != "es_419.strings" ]; then
|
||||
iconv -f "UTF-16LE" -t "UTF-8" "$file" > "../../tdesktop/Telegram/SourceFiles/langs/lang_$file.tmp"
|
||||
awk '{ if (NR==1) sub(/^\xef\xbb\xbf/,""); sub(/
/,""); print }' "../../tdesktop/Telegram/SourceFiles/langs/lang_$file.tmp" > "../../tdesktop/Telegram/SourceFiles/langs/lang_$file"
|
||||
rm "../../tdesktop/Telegram/SourceFiles/langs/lang_$file.tmp"
|
||||
fi
|
||||
iconv -f "UTF-16LE" -t "UTF-8" "$file" > "../../tdesktop/Telegram/SourceFiles/langs/lang_$file.tmp"
|
||||
awk '{ if (NR==1) sub(/^\xef\xbb\xbf/,""); sub(/
/,""); print }' "../../tdesktop/Telegram/SourceFiles/langs/lang_$file.tmp" > "../../tdesktop/Telegram/SourceFiles/langs/lang_$file"
|
||||
rm "../../tdesktop/Telegram/SourceFiles/langs/lang_$file.tmp"
|
||||
done
|
||||
cd ../../tdesktop/Telegram/
|
||||
touch SourceFiles/telegram.qrc
|
||||
touch SourceFiles/telegram_linux.qrc
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
07084670195445A600B5AE3A /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastUpgradeCheck = 0510;
|
||||
LastUpgradeCheck = 0730;
|
||||
};
|
||||
buildConfigurationList = 07084673195445A600B5AE3A /* Build configuration list for PBXProject "Updater" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
|
|
@ -138,6 +138,7 @@
|
|||
CODE_SIGN_IDENTITY = "";
|
||||
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Telegram.app/Contents/Frameworks";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
cd ../../
|
||||
tx pull -fa
|
||||
while IFS='' read -r line || [[ -n "$line" ]]; do
|
||||
tx pull -f -l $line
|
||||
done < tdesktop/Telegram/Resources/LangList
|
||||
tx push -s
|
||||
cd tdesktop/Telegram/
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
AppVersion 9039
|
||||
AppVersion 9040
|
||||
AppVersionStrMajor 0.9
|
||||
AppVersionStrSmall 0.9.39
|
||||
AppVersionStr 0.9.39
|
||||
DevChannel 1
|
||||
AppVersionStrSmall 0.9.40
|
||||
AppVersionStr 0.9.40
|
||||
DevChannel 0
|
||||
BetaVersion 0 9034004
|
||||
|
|
|
|||
|
|
@ -43,6 +43,19 @@ index 8b2b988..9de806d 100644
|
|||
virtual void setFilter() = 0;
|
||||
virtual void selectNameFilter(const QString &filter) = 0;
|
||||
virtual QString selectedNameFilter() const = 0;
|
||||
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
|
||||
index b54e85a..49ccec6 100644
|
||||
--- a/src/gui/kernel/qwindow.cpp
|
||||
+++ b/src/gui/kernel/qwindow.cpp
|
||||
@@ -2460,7 +2460,7 @@ void QWindowPrivate::setCursor(const QCursor *newCursor)
|
||||
void QWindowPrivate::applyCursor()
|
||||
{
|
||||
Q_Q(QWindow);
|
||||
- if (platformWindow) {
|
||||
+ if (platformWindow && q->screen() && q->screen()->handle()) {
|
||||
if (QPlatformCursor *platformCursor = q->screen()->handle()->cursor()) {
|
||||
QCursor *c = QGuiApplication::overrideCursor();
|
||||
if (!c && hasCursor)
|
||||
diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
|
||||
index c58662e..432f2cd 100644
|
||||
--- a/src/gui/painting/qpaintengine_p.h
|
||||
|
|
@ -11662,7 +11675,7 @@ index cc697ba..e1d9bce 100644
|
|||
// but that cannot handle a Windows command line [yet].
|
||||
command.replace(QStringLiteral("%1"), url.toString(QUrl::FullyEncoded));
|
||||
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
|
||||
index 288f73c..73230ed 100644
|
||||
index 288f73c..c859833 100644
|
||||
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
|
||||
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
|
||||
@@ -973,7 +973,8 @@ void QWindowsWindow::destroyWindow()
|
||||
|
|
@ -11703,6 +11716,15 @@ index 288f73c..73230ed 100644
|
|||
static inline bool testShowWithoutActivating(const QWindow *window)
|
||||
{
|
||||
// QWidget-attribute Qt::WA_ShowWithoutActivating .
|
||||
@@ -1626,7 +1642,7 @@ void QWindowsWindow::setWindowState(Qt::WindowState state)
|
||||
|
||||
bool QWindowsWindow::isFullScreen_sys() const
|
||||
{
|
||||
- return window()->isTopLevel()
|
||||
+ return window()->isTopLevel() && window()->screen()
|
||||
&& geometry_sys() == QWindowsScaling::mapToNative(window()->screen()->geometry());
|
||||
}
|
||||
|
||||
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
|
||||
index fff90b4..47375a7 100644
|
||||
--- a/src/plugins/platforms/windows/qwindowswindow.h
|
||||
|
|
|
|||
Loading…
Reference in New Issue