diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index e1954018e..5346dad5a 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -585,7 +585,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_convert_about" = "In supergroups:"; "lng_profile_convert_feature1" = "— New members see the full message history"; "lng_profile_convert_feature2" = "— Messages are deleted for all members"; -"lng_profile_convert_feature3" = "— Members can edit their own messages"; +"lng_profile_convert_feature3" = "— Admins can pin important messages"; "lng_profile_convert_feature4" = "— Creator can set a public link for the group"; "lng_profile_convert_warning" = "{bold_start}Note:{bold_end} This action can not be undone"; "lng_profile_convert_confirm" = "Convert"; diff --git a/Telegram/Resources/langs/lang_de.strings b/Telegram/Resources/langs/lang_de.strings index c907026aa..9df91f2f0 100644 --- a/Telegram/Resources/langs/lang_de.strings +++ b/Telegram/Resources/langs/lang_de.strings @@ -585,7 +585,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_convert_about" = "Supergruppen:"; "lng_profile_convert_feature1" = "— Neue Mitglieder sehen gesamten Verlauf"; "lng_profile_convert_feature2" = "— Nachrichten werden bei allen gelöscht"; -"lng_profile_convert_feature3" = "— Jeder kann eigene Nachrichten bearbeiten"; +"lng_profile_convert_feature3" = "Administratoren können wichtige Nachrichten anpinnen"; "lng_profile_convert_feature4" = "— Gründer kann Gruppe öffentlich machen"; "lng_profile_convert_warning" = "{bold_start}Wichtig:{bold_end} Die Änderung in eine Supergruppe kann nicht rückgängig gemacht werden."; "lng_profile_convert_confirm" = "Ändern"; diff --git a/Telegram/Resources/langs/lang_es.strings b/Telegram/Resources/langs/lang_es.strings index ea9290158..425522101 100644 --- a/Telegram/Resources/langs/lang_es.strings +++ b/Telegram/Resources/langs/lang_es.strings @@ -585,7 +585,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_convert_about" = "En los supergrupos:"; "lng_profile_convert_feature1" = "— Los nuevos miembros ven todo el historial"; "lng_profile_convert_feature2" = "— Los mensajes son eliminados para todos"; -"lng_profile_convert_feature3" = "— Un miembro puede editar sus mensajes"; +"lng_profile_convert_feature3" = "— Los administradores pueden anclar mensajes importantes"; "lng_profile_convert_feature4" = "— El creador puede generar un enlace público"; "lng_profile_convert_warning" = "{bold_start}Importante:{bold_end} Esta acción no se puede deshacer"; "lng_profile_convert_confirm" = "Convertir"; diff --git a/Telegram/Resources/langs/lang_it.strings b/Telegram/Resources/langs/lang_it.strings index d5ca360b0..5f4c5853a 100644 --- a/Telegram/Resources/langs/lang_it.strings +++ b/Telegram/Resources/langs/lang_it.strings @@ -585,7 +585,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_convert_about" = "Nei supergruppi:"; "lng_profile_convert_feature1" = "— I nuovi membri vedono tutta la cronologia"; "lng_profile_convert_feature2" = "— I messaggi eliminati scompaiono per tutti"; -"lng_profile_convert_feature3" = "— I membri possono modificare i loro messaggi"; +"lng_profile_convert_feature3" = "— Gli amministratori possono fissare i messaggi"; "lng_profile_convert_feature4" = "— Il creatore può creare un link pubblico per il gruppo"; "lng_profile_convert_warning" = "{bold_start}Nota:{bold_end} Questa azione non può essere annullata"; "lng_profile_convert_confirm" = "Converti"; @@ -684,7 +684,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_stickers_default_set" = "Grandi menti"; "lng_stickers_you_have" = "Organizza e riordina i set di sticker"; "lng_stickers_packs" = "Set di sticker"; -"lng_stickers_reorder" = "Clicca e tieni premuto per riordinare i set di sticker"; +"lng_stickers_reorder" = "Clicca e trascina per riordinare i set di sticker"; "lng_stickers_remove" = "Elimina"; "lng_stickers_return" = "Annulla"; "lng_stickers_restore" = "Ripristina"; @@ -916,7 +916,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" = "2 \n{}"; +"lng_new_version_text" = "— Edit your messages everywhere within 2 days after posting (press the up arrow button to edit your last message).\n— Mention people in groups by typing @ and selecting them from the list — even if they don't have a username.\n\nMore: {link}"; "lng_menu_insert_unicode" = "Inserisci carattere di controllo Unicode"; diff --git a/Telegram/Resources/langs/lang_ko.strings b/Telegram/Resources/langs/lang_ko.strings index 55c196e81..08ea56633 100644 --- a/Telegram/Resources/langs/lang_ko.strings +++ b/Telegram/Resources/langs/lang_ko.strings @@ -456,7 +456,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_songs_header" = "음성 파일 내역"; "lng_profile_files" = "{count:_not_used_|# 파일|# 파일}"; "lng_profile_files_header" = "파일 내역"; -"lng_profile_audios" = "{count:_not_used_|# 음성메시지# 음성메시지}"; +"lng_profile_audios" = "{count:_not_used_|# 음성메시지|# 음성메시지}"; "lng_profile_audios_header" = "음성 메시지 내역"; "lng_profile_shared_links" = "{count:_not_used_|# 공유된 링크|# 공유된 링크}"; "lng_profile_shared_links_header" = "공유된 링크 현황"; @@ -585,7 +585,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_convert_about" = "슈퍼그룹:"; "lng_profile_convert_feature1" = "— 모든 구성원이 이전 대화 내용 조회"; "lng_profile_convert_feature2" = "— 메시지 삭제시 모두에게 삭제"; -"lng_profile_convert_feature3" = "— 개인 메시지 수정 가능"; +"lng_profile_convert_feature3" = "— 관리자는 중요한 메시지 고정 가능"; "lng_profile_convert_feature4" = "— 방 생성자가 그룹 공개링크 생성가능"; "lng_profile_convert_warning" = "{bold_start}주위:{bold_end} 이 작업은 되돌릴 수 없습니다."; "lng_profile_convert_confirm" = "변환"; diff --git a/Telegram/Resources/langs/lang_nl.strings b/Telegram/Resources/langs/lang_nl.strings index 18d874bef..dce61d74b 100644 --- a/Telegram/Resources/langs/lang_nl.strings +++ b/Telegram/Resources/langs/lang_nl.strings @@ -585,7 +585,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_convert_about" = "supergroepen:"; "lng_profile_convert_feature1" = "— Nieuwe leden zien de hele geschiedenis"; "lng_profile_convert_feature2" = "— Gewiste berichten gelden voor alle leden"; -"lng_profile_convert_feature3" = "— Leden kunnen eigen berichten bewerken"; +"lng_profile_convert_feature3" = "— Beheerders kunnen berichten vastzetten"; "lng_profile_convert_feature4" = "— Maker kan een publieke groepslink instellen"; "lng_profile_convert_warning" = "{bold_start}Let op:{bold_end} Je kunt dit niet ongedaan maken."; "lng_profile_convert_confirm" = "Opwaarderen"; diff --git a/Telegram/Resources/langs/lang_pt_BR.strings b/Telegram/Resources/langs/lang_pt_BR.strings index 4cb79b6b9..823e73c65 100644 --- a/Telegram/Resources/langs/lang_pt_BR.strings +++ b/Telegram/Resources/langs/lang_pt_BR.strings @@ -585,7 +585,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_convert_about" = "Em supergrupos:"; "lng_profile_convert_feature1" = "— Novos membros podem ver todo o histórico"; "lng_profile_convert_feature2" = "— Mensagens apagadas desaparecerão para todos"; -"lng_profile_convert_feature3" = "— Membros podem editar as próprias mensagens"; +"lng_profile_convert_feature3" = "— Admins podem ficar mensagens importantes"; "lng_profile_convert_feature4" = "— Criador pode definir um link público para o grupo"; "lng_profile_convert_warning" = "{bold_start}Nota:{bold_end} Essa ação não pode ser desfeita"; "lng_profile_convert_confirm" = "Converter"; diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 8cb84d1f9..3329d322d 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,49,5 - PRODUCTVERSION 0,9,49,5 + FILEVERSION 0,9,49,6 + PRODUCTVERSION 0,9,49,6 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.49.5" + VALUE "FileVersion", "0.9.49.6" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.49.5" + VALUE "ProductVersion", "0.9.49.6" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 2458b9a0a..1cf966edf 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,49,5 - PRODUCTVERSION 0,9,49,5 + FILEVERSION 0,9,49,6 + PRODUCTVERSION 0,9,49,6 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.9.49.5" + VALUE "FileVersion", "0.9.49.6" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.49.5" + VALUE "ProductVersion", "0.9.49.6" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 9429f63b0..9049cd0c1 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/basic_types.h" -#define BETA_VERSION_MACRO (9049005ULL) +#define BETA_VERSION_MACRO (9049006ULL) constexpr int AppVersion = 9049; constexpr str_const AppVersionStr = "0.9.49"; diff --git a/Telegram/SourceFiles/lang.h b/Telegram/SourceFiles/lang.h index d3465ddb4..4202e7845 100644 --- a/Telegram/SourceFiles/lang.h +++ b/Telegram/SourceFiles/lang.h @@ -183,7 +183,7 @@ private: class Translator : public QTranslator { public: - QString translate(const char *context, const char *sourceText, const char *disambiguation = 0, int n = -1) const; + QString translate(const char *context, const char *sourceText, const char *disambiguation = 0, int n = -1) const override; }; diff --git a/Telegram/SourceFiles/langloaderplain.cpp b/Telegram/SourceFiles/langloaderplain.cpp index f07a54e8e..2a8e2f33d 100644 --- a/Telegram/SourceFiles/langloaderplain.cpp +++ b/Telegram/SourceFiles/langloaderplain.cpp @@ -123,7 +123,11 @@ bool LangLoaderPlain::readKeyValue(const char *&from, const char *end) { while (from < end && ((*from >= 'a' && *from <= 'z') || (*from >= 'A' && *from <= 'Z') || *from == '_' || (*from >= '0' && *from <= '9'))) { ++from; } - if (from == tagStart) throw Exception(QString("Expected tag name in key '%1'!").arg(QLatin1String(varName))); + if (from == tagStart) { + readingValue = false; + warning(QString("Expected tag name in key '%1'!").arg(QLatin1String(varName))); + continue; + } QByteArray tagName = QByteArray(tagStart, int(from - tagStart)); if (from == end || (*from != '}' && *from != ':')) throw Exception(QString("Expected '}' or ':' after tag name in key '%1'!").arg(QLatin1String(varName))); diff --git a/Telegram/build/version b/Telegram/build/version index c692774d5..c1b8ac8da 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 0.9 AppVersionStrSmall 0.9.49 AppVersionStr 0.9.49 AlphaChannel 0 -BetaVersion 9049005 +BetaVersion 9049006