diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 3ac7440c1..e1954018e 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -468,6 +468,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_top_bar_share_contact" = "Share"; "lng_report_title" = "Report channel"; +"lng_report_group_title" = "Report group"; "lng_report_reason_spam" = "Spam"; "lng_report_reason_violence" = "Violence"; "lng_report_reason_pornography" = "Pornography"; diff --git a/Telegram/Resources/langs/lang_de.strings b/Telegram/Resources/langs/lang_de.strings index d9b0e31b3..4b1ef1460 100644 --- a/Telegram/Resources/langs/lang_de.strings +++ b/Telegram/Resources/langs/lang_de.strings @@ -897,7 +897,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" = "— Bearbeite deine Nachrichten nachträglich (innerhalb von 2 Tagen).\n— Erwähne Leute in Gruppen - ohne das diese einen Benutzernamen haben müssen (einfach @ eingeben und aus der Liste auswählen).\n\nMehr: {link}"; +"lng_new_version_text" = "— Optische Verbesserungen (u.a. runde Profilbilder)"; "lng_menu_insert_unicode" = "Unicode-Steuerzeichen einfügen"; diff --git a/Telegram/Resources/langs/lang_es.strings b/Telegram/Resources/langs/lang_es.strings index 932ef8681..fb07a66ea 100644 --- a/Telegram/Resources/langs/lang_es.strings +++ b/Telegram/Resources/langs/lang_es.strings @@ -236,7 +236,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_settings_show_preview" = "Mostrar la vista previa del mensaje"; "lng_settings_use_windows" = "Usar notificaciones de Windows"; "lng_settings_sound_notify" = "Reproducir sonido"; -"lng_settings_include_muted" = "Incluir los chats silenciados en el conteo de 'no leídos'"; +"lng_settings_include_muted" = "Incluir los chats silenciados en el conteo de “no leídos”"; "lng_notification_preview" = "Tienes un nuevo mensaje"; @@ -553,10 +553,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_migrate_reached" = "Límite de {count:_not_used_|# miembro|# miembros} alcanzado"; "lng_profile_migrate_about" = "Para superar el límite y tener características adicionales, conviértelo en un supergrupo:"; -"lng_profile_migrate_feature1" = "– Permiten hasta {count:_not_used_|# usuario|# usuarios}"; -"lng_profile_migrate_feature2" = "– Nuevos miembros ven todo el historial"; -"lng_profile_migrate_feature3" = "– Un admin. borra mensajes para todos"; -"lng_profile_migrate_feature4" = "– Notificaciones silenciadas por defecto"; +"lng_profile_migrate_feature1" = "— Permiten hasta {count:_not_used_|# usuario|# usuarios}"; +"lng_profile_migrate_feature2" = "— Nuevos miembros ven todo el historial"; +"lng_profile_migrate_feature3" = "— Un admin. borra mensajes para todos"; +"lng_profile_migrate_feature4" = "— Notificaciones silenciadas por defecto"; "lng_profile_migrate_button" = "Convertir en supergrupo"; "lng_profile_migrate_sure" = "¿Quieres convertir este grupo en un supergrupo? No puedes deshacer esta acción."; "lng_profile_convert_button" = "Convertir en supergrupo"; @@ -893,11 +893,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_mediaview_saved" = "La imagen fue guardada en tu carpeta [c]Descargas[/c]"; -"lng_new_authorization" = "{name}:\nDetectamos un inicio de sesión en tu cuenta desde un nuevo dispositivo el {day}, {date} a las {time}\n\nDispositivo: {device}\nUbicación: {location}\n\nSi no eras tú, puedes ir a Ajustes — Mostrar todas las sesiones y cerrar esa sesión.\n\nSi crees que alguien inició tu sesión sin tu consentimiento, puedes activar la verificación en dos pasos en Ajustes.\n\nGracias.\nEl equipo de Telegram"; +"lng_new_authorization" = "{name}:\nDetectamos un inicio de sesión en tu cuenta desde un nuevo dispositivo el {day}, {date} a las {time}\n\nDispositivo: {device}\nUbicación: {location}\n\nSi no eras tú, puedes ir a Ajustes > Mostrar todas las sesiones y cerrar esa sesión.\n\nSi crees que alguien inició tu sesión sin tu consentimiento, puedes activar la verificación en dos pasos en Ajustes.\n\nGracias.\nEl equipo de Telegram"; "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" = "— Edita tus mensajes, en todas partes, hasta 2 días después del envío.\n— Menciona a personas en grupos escribiendo @ y eligiéndolas desde la lista, incluso si no tienen un alias.\n\nMás: {link}"; +"lng_new_version_text" = "— Mejoras visuales"; "lng_menu_insert_unicode" = "Insertar caracteres de control Unicode"; @@ -924,13 +924,13 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_mac_choose_program_menu" = "Otra..."; "lng_mac_choose_app" = "Elegir aplicación"; -"lng_mac_choose_text" = "Elige una aplicación para abrir el archivo \"{file}\"."; +"lng_mac_choose_text" = "Elige una aplicación para abrir el archivo “{file}”."; "lng_mac_enable_filter" = "Habilitar:"; "lng_mac_recommended_apps" = "Aplicaciones recomendadas"; "lng_mac_all_apps" = "Todas las aplicaciones"; "lng_mac_always_open_with" = "Siempre abrir con"; -"lng_mac_this_app_can_open" = "Esta aplicación puede abrir \"{file}\"."; -"lng_mac_not_known_app" = "No se sabe si esta aplicación puede abrir \"{file}\"."; +"lng_mac_this_app_can_open" = "Esta aplicación puede abrir “{file}”."; +"lng_mac_not_known_app" = "No se sabe si esta aplicación puede abrir “{file}”."; "lng_mac_menu_services" = "Servicios"; "lng_mac_menu_hide_telegram" = "Ocultar {telegram}"; diff --git a/Telegram/Resources/langs/lang_it.strings b/Telegram/Resources/langs/lang_it.strings index f102d8467..1783bf5b7 100644 --- a/Telegram/Resources/langs/lang_it.strings +++ b/Telegram/Resources/langs/lang_it.strings @@ -265,7 +265,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_settings_replace_emojis" = "Riconosci emoji"; "lng_settings_view_emojis" = "Visualizza lista"; "lng_settings_emoji_list" = "Emoji supportate"; -"lng_settings_send_enter" = "Invia con tasto invio"; +"lng_settings_send_enter" = "Invia con tasto Invio"; "lng_settings_send_ctrlenter" = "Invia con Ctrl+Invio"; "lng_settings_send_cmdenter" = "Invia con Cmd+Invio"; @@ -284,10 +284,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_download_path_clear" = "Elimina tutto"; "lng_download_path_header" = "Scegli il percorso di download"; "lng_download_path_default_radio" = "Cartella Telegram in «Download»"; -"lng_download_path_temp_radio" = "Cartella temporanea, pulita se disconnetti"; +"lng_download_path_temp_radio" = "Cartella temporanea, svuotata quando esci"; "lng_download_path_dir_radio" = "Cartella personalizzata, pulita a mano"; "lng_download_path_choose" = "Scegli il percorso di download"; -"lng_sure_clear_downloads" = "Vuoi eliminare tutti i file scaricati nella cartella temporanea? Sarà fatto automaticamente alla disconnessione o alla disinstallazione del programma"; +"lng_sure_clear_downloads" = "Vuoi eliminare tutti i file scaricati nella cartella temporanea? Sarà fatto automaticamente all'uscita o alla disinstallazione del programma."; "lng_download_path_failed" = "Il download del file non può iniziare. La causa potrebbe essere una posizione sbagliata per i download.\n\nPuoi cambiare il percorso di download nelle Impostazioni."; "lng_download_path_settings" = "Impostazioni"; "lng_download_finish_failed" = "Il download del file non può essere concluso.\n\nVuoi riprovare?"; @@ -328,7 +328,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_passcode_is_same" = "Il codice non è stato cambiato"; "lng_passcode_enter" = "Inserisci il tuo codice"; "lng_passcode_submit" = "Invia"; -"lng_passcode_logout" = "Disconnetti"; +"lng_passcode_logout" = "Esci"; "lng_passcode_need_unblock" = "Devi prima sbloccarmi."; "lng_cloud_password_waiting" = "Link di conferma inviato a {email}..."; @@ -383,8 +383,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_settings_faq_button" = "Domande frequenti"; "lng_settings_ask_ok" = "Chiedi"; "lng_settings_faq" = "Domande frequenti"; -"lng_settings_logout" = "Disconnetti"; -"lng_sure_logout" = "Sicuro di volerti disconnettere?"; +"lng_settings_logout" = "Esci"; +"lng_sure_logout" = "Sicuro di voler uscire?"; "lng_settings_need_restart" = "Devi riavviare per applicare alcune delle nuove impostazioni. Riavviare ora?"; "lng_settings_restart_now" = "RIAVVIA"; @@ -703,7 +703,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_comment_ph" = "Scrivi un commento..."; "lng_broadcast_ph" = "Pubblica un post..."; "lng_broadcast_silent_ph" = "Post silenzioso..."; -"lng_record_cancel" = "Rilascia fuori da qui per annullare"; +"lng_record_cancel" = "Rilascia fuori per annullare"; "lng_will_be_notified" = "I post saranno notificati ai membri"; "lng_wont_be_notified" = "I post non saranno notificati ai membri"; "lng_empty_history" = ""; @@ -730,19 +730,19 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_user_typing" = "{user} sta scrivendo"; "lng_users_typing" = "{user} e {second_user} stanno scrivendo"; "lng_many_typing" = "{count:_not_used_|# sta|# stanno} scrivendo"; -"lng_send_action_record_video" = "registrando un video"; +"lng_send_action_record_video" = "sta registrando un video"; "lng_user_action_record_video" = "{user} sta registrando un video"; -"lng_send_action_upload_video" = "inviando un video"; +"lng_send_action_upload_video" = "sta inviando un video"; "lng_user_action_upload_video" = "{user} sta inviando un video"; -"lng_send_action_record_audio" = "registrando un messaggio vocale"; -"lng_user_action_record_audio" = "{user} sta registrando un messaggio vocale"; -"lng_send_action_upload_audio" = "inviando un messaggio vocale"; -"lng_user_action_upload_audio" = "{user} sta inviando un messaggio vocale"; -"lng_send_action_upload_photo" = "inviando una foto"; +"lng_send_action_record_audio" = "sta registrando un audio"; +"lng_user_action_record_audio" = "{user} sta registrando un audio"; +"lng_send_action_upload_audio" = "sta inviando un audio"; +"lng_user_action_upload_audio" = "{user} sta inviando un audio"; +"lng_send_action_upload_photo" = "sta inviando una foto"; "lng_user_action_upload_photo" = "{user} sta inviando una foto"; -"lng_send_action_upload_file" = "inviando un file"; +"lng_send_action_upload_file" = "sta inviando un file"; "lng_user_action_upload_file" = "{user} sta inviando un file"; -"lng_send_action_geo_location" = "scegliendo una posizione"; +"lng_send_action_geo_location" = "sta scegliendo una posizione"; "lng_user_action_geo_location" = "{user} sta scegliendo una posizione"; "lng_send_action_choose_contact" = "scegliendo un contatto"; "lng_user_action_choose_contact" = "{user} sta scegliendo un contatto"; @@ -845,9 +845,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_create_group_photo" = "Imposta foto"; "lng_create_group_description" = "Descrizione (opzionale)"; -"lng_drag_images_here" = "Rilascia immagini qui"; -"lng_drag_photos_here" = "Rilascia foto qui"; -"lng_drag_files_here" = "Rilascia file qui"; +"lng_drag_images_here" = "Trascina qui le immagini"; +"lng_drag_photos_here" = "Trascina qui le foto"; +"lng_drag_files_here" = "Trascina qui i file"; "lng_drag_to_send_quick" = "per inviarle in modo veloce"; "lng_drag_to_send_no_compression" = "per inviarle senza compressione"; @@ -897,7 +897,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" = "— Modifica i tuoi messaggi ovunque entro 2 giorni dall'invio.\n— Menziona le persone nei gruppi digitando @ e selezionandole dalla lista — anche se non hanno un username.\n\nPiù informazioni: {link}"; +"lng_new_version_text" = "— Miglioramenti visivi"; "lng_menu_insert_unicode" = "Inserisci carattere di controllo Unicode"; @@ -940,7 +940,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_mac_menu_quit_telegram" = "Esci da {telegram}"; "lng_mac_menu_about_telegram" = "Informazioni su {telegram}"; "lng_mac_menu_file" = "File"; -"lng_mac_menu_logout" = "Disconnetti"; +"lng_mac_menu_logout" = "Esci"; "lng_mac_menu_edit" = "Modifica"; "lng_mac_menu_undo" = "Annulla"; "lng_mac_menu_redo" = "Ripeti"; diff --git a/Telegram/Resources/langs/lang_ko.strings b/Telegram/Resources/langs/lang_ko.strings index c98c9df76..dd2d58f13 100644 --- a/Telegram/Resources/langs/lang_ko.strings +++ b/Telegram/Resources/langs/lang_ko.strings @@ -897,7 +897,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" = "— 메시지 작성 후 2일내 수정 기능\n— 그룹내에서 @를 입력하고 상대방을 선택하여 멘션 기능 ㅡ 아이디가 없어도 가능\n\n자세한 설명: {link}"; +"lng_new_version_text" = "— 비주얼 향상"; "lng_menu_insert_unicode" = "유니코드 문자를 입력하세요."; diff --git a/Telegram/Resources/langs/lang_nl.strings b/Telegram/Resources/langs/lang_nl.strings index 71c18f934..9603fbf7a 100644 --- a/Telegram/Resources/langs/lang_nl.strings +++ b/Telegram/Resources/langs/lang_nl.strings @@ -897,7 +897,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" = "— 2 dagen om je berichten naderhand te bewerken.\n— Anderen vermelden in groepen via '@', kies daarna de persoon uit de lijst. Ook als ze geen gebruikersnaam hebben!\n\nMeer over deze update: {link}"; +"lng_new_version_text" = "— Visuele verbeteringen"; "lng_menu_insert_unicode" = "Unicode-besturingsteken invoegen"; diff --git a/Telegram/Resources/langs/lang_pt_BR.strings b/Telegram/Resources/langs/lang_pt_BR.strings index 76b254907..7f05ac745 100644 --- a/Telegram/Resources/langs/lang_pt_BR.strings +++ b/Telegram/Resources/langs/lang_pt_BR.strings @@ -897,7 +897,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" = "— Edite suas mensagens em qualquer lugar, até 2 dias após postagem.\n— Mencione pessoas nos grupos digitando @ e selecionando-os através da lista — mesmo que eles não tenham nome de usuário.\n\nMais: {link}"; +"lng_new_version_text" = "— Melhorias no visual"; "lng_menu_insert_unicode" = "Inserir caractere de controle Unicode"; diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 37fda6f2f..05fc7cf89 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,2 - PRODUCTVERSION 0,9,49,2 + FILEVERSION 0,9,49,3 + PRODUCTVERSION 0,9,49,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.49.2" + VALUE "FileVersion", "0.9.49.3" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.49.2" + VALUE "ProductVersion", "0.9.49.3" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 4bd3c7c1d..59db21642 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,2 - PRODUCTVERSION 0,9,49,2 + FILEVERSION 0,9,49,3 + PRODUCTVERSION 0,9,49,3 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.2" + VALUE "FileVersion", "0.9.49.3" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.49.2" + VALUE "ProductVersion", "0.9.49.3" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/boxes/report_box.cpp b/Telegram/SourceFiles/boxes/report_box.cpp index aec3dbc3f..af048e2d8 100644 --- a/Telegram/SourceFiles/boxes/report_box.cpp +++ b/Telegram/SourceFiles/boxes/report_box.cpp @@ -50,7 +50,7 @@ void ReportBox::paintEvent(QPaintEvent *e) { Painter p(this); if (paint(p)) return; - paintTitle(p, lang(lng_report_title)); + paintTitle(p, lang(_channel->isMegagroup() ? lng_report_title : lng_report_group_title)); } void ReportBox::resizeEvent(QResizeEvent *e) { diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 8c2e2cae9..592f52993 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 (9049002ULL) +#define BETA_VERSION_MACRO (9049003ULL) constexpr int AppVersion = 9049; constexpr str_const AppVersionStr = "0.9.49"; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 756007d45..282a5e7fe 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -1555,7 +1555,7 @@ HistoryInner::~HistoryInner() { bool HistoryInner::focusNextPrevChild(bool next) { if (_selected.isEmpty()) { - return focusNextPrevChild(next); + return TWidget::focusNextPrevChild(next); } else { clearSelectedItems(); return true; diff --git a/Telegram/build/version b/Telegram/build/version index 25d21d5fd..657352a48 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 9049002 +BetaVersion 9049003