Merge branch 'dev'

This commit is contained in:
John Preston 2016-06-26 17:28:29 +03:00
commit 7ec2c833f2
7 changed files with 51 additions and 21 deletions

View file

@ -697,7 +697,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_in_dlg_audio" = "Sprachnachricht";
"lng_in_dlg_file" = "Datei";
"lng_in_dlg_sticker" = "Sticker";
"lng_in_dlg_sticker_emoji" = "{emoji} (Sticker)";
"lng_in_dlg_sticker_emoji" = "{emoji} Sticker";
"lng_ban_user" = "Nutzer sperren";
"lng_delete_all_from" = "Alles von diesem Nutzer löschen";
@ -726,7 +726,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_wont_be_notified" = "Mitglieder werden nicht benachrichtigt";
"lng_empty_history" = "";
"lng_willbe_history" = "Chat auswählen, um zu schreiben";
"lng_message_with_from" = "[c]{from}:[/c] {message}";
"lng_from_you" = "Ich";
"lng_from_draft" = "Entwurf";
"lng_bot_description" = "Was kann dieser Bot?";
@ -735,6 +734,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_channel_mute" = "Stumm";
"lng_channel_unmute" = "Stumm aus";
"lng_dialogs_text_with_from" = "{from_part} {message}";
"lng_dialogs_text_from_wrapped" = "{from}:";
"lng_dialogs_text_media" = "{media_part} {caption}";
"lng_dialogs_text_media_wrapped" = "{media},";
"lng_open_this_link" = "Diesen Link öffnen?";
"lng_open_link" = "Öffnen";
@ -880,6 +884,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_selected_upload_stop" = "Abbrechen";
"lng_selected_delete_sure_this" = "Diese Nachricht wirklich löschen?";
"lng_selected_delete_sure" = "Willst du {count:_not_used_|# Nachricht|# Nachrichten} löschen?";
"lng_delete_photo_sure" = "Dieses Bild wirklich löschen?";
"lng_box_delete" = "Löschen";
"lng_box_leave" = "Verlassen";
@ -916,7 +921,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" = "— Entwürfe: Ungesendete Nachrichten werden als Entwurf auf all deinen Geräten synchronisiert und sind in der Chatliste erkennbar.\n— Gruppen- und Nutzerprofile wurden neu gestaltet.\n— Anzahl ungelesener Nachrichten auf dem 'Nach unten wechseln'-Knopf.\n\nMehr Infos: {link}";
"lng_new_version_text" = "— Fehlerbehebung: Bildbetrachter sollte Änderungen der Bildschirmauflösung korrekt handhaben\n— Fehlerbehebung: Bilder per DragnDrop weiterleiten\n— Verschiedene optische Verbesserungen und sonstige Fehlerbehebungen";
"lng_menu_insert_unicode" = "Unicode-Steuerzeichen einfügen";

View file

@ -697,7 +697,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_in_dlg_audio" = "Mensaje de voz";
"lng_in_dlg_file" = "Archivo";
"lng_in_dlg_sticker" = "Sticker";
"lng_in_dlg_sticker_emoji" = "{emoji} (sticker)";
"lng_in_dlg_sticker_emoji" = "{emoji} Sticker";
"lng_ban_user" = "Suspender usuario";
"lng_delete_all_from" = "Eliminar todo lo de este usuario";
@ -726,7 +726,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_wont_be_notified" = "Tu publicación no será notificada";
"lng_empty_history" = "";
"lng_willbe_history" = "Selecciona un chat para comenzar";
"lng_message_with_from" = "[c]{from}:[/c] {message}";
"lng_from_you" = "Tú";
"lng_from_draft" = "Borrador";
"lng_bot_description" = "¿Qué puede hacer este bot?";
@ -735,6 +734,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_channel_mute" = "Silenciar";
"lng_channel_unmute" = "No silenciar";
"lng_dialogs_text_with_from" = "{from_part} {message}";
"lng_dialogs_text_from_wrapped" = "{from}:";
"lng_dialogs_text_media" = "{media_part} {caption}";
"lng_dialogs_text_media_wrapped" = "{media},";
"lng_open_this_link" = "¿Abrir este enlace?";
"lng_open_link" = "Abrir";
@ -880,6 +884,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_selected_upload_stop" = "Detener";
"lng_selected_delete_sure_this" = "¿Quieres eliminar este mensaje?";
"lng_selected_delete_sure" = "¿Quieres eliminar {count:_not_used_|# mensaje|# mensajes}?";
"lng_delete_photo_sure" = "¿Quieres eliminar esta foto?";
"lng_box_delete" = "Eliminar";
"lng_box_leave" = "Salir";
@ -916,7 +921,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" = "— Presentamos los borradores: sincronización para los mensajes no enviados en todos tus dispositivos. Los borradores ahora son visibles en tu lista de chats.\n— Perfiles de grupos y usuarios completamente rediseñados.\n— Contador de mensajes “no leídos” en el botón de “desplazar hacia abajo”.\n\nMás sobre esta actualización: {link}";
"lng_new_version_text" = "— Corrección en el visor de fotos, para manejar correctamente el cambio de la resolución de la pantalla\n— Corrección en el reenvío de fotos a través de arrastrar y soltar \n— Varias mejoras de diseño y corrección de otros errores";
"lng_menu_insert_unicode" = "Insertar caracteres de control Unicode";

View file

@ -285,7 +285,7 @@ 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, svuotata quando esci";
"lng_download_path_temp_radio" = "Cartella temporanea, pulita 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 all'uscita o alla disinstallazione del programma.";
@ -418,7 +418,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_profile_add_contact" = "Aggiungi contatto";
"lng_profile_edit_contact" = "Modifica";
"lng_profile_enable_notifications" = "Notifiche";
"lng_profile_clear_history" = "Cancella la cronologia";
"lng_profile_clear_history" = "Cancella cronologia";
"lng_profile_delete_conversation" = "Elimina chat";
"lng_profile_clear_and_exit" = "Elimina ed esci";
"lng_profile_leave_channel" = "Lascia il canale";
@ -697,7 +697,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_in_dlg_audio" = "Messaggio vocale";
"lng_in_dlg_file" = "File";
"lng_in_dlg_sticker" = "Sticker";
"lng_in_dlg_sticker_emoji" = "{emoji} (sticker)";
"lng_in_dlg_sticker_emoji" = "{emoji} Sticker";
"lng_ban_user" = "Rimuovi utente";
"lng_delete_all_from" = "Elimina tutto da questo utente";
@ -726,7 +726,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_wont_be_notified" = "I post non saranno notificati ai membri";
"lng_empty_history" = "";
"lng_willbe_history" = "Seleziona una chat per iniziare a chattare";
"lng_message_with_from" = "[c]{from}:[/c] {message}";
"lng_from_you" = "Tu";
"lng_from_draft" = "Bozza";
"lng_bot_description" = "Cosa può fare questo bot?";
@ -735,6 +734,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_channel_mute" = "Silenzia";
"lng_channel_unmute" = "Suona";
"lng_dialogs_text_with_from" = "{from_part} {message}";
"lng_dialogs_text_from_wrapped" = "{from}:";
"lng_dialogs_text_media" = "{media_part} {caption}";
"lng_dialogs_text_media_wrapped" = "{media},";
"lng_open_this_link" = "Aprire questo link?";
"lng_open_link" = "Apri";
@ -880,6 +884,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_selected_upload_stop" = "Arresta ";
"lng_selected_delete_sure_this" = "Vuoi eliminare questo messaggio?";
"lng_selected_delete_sure" = "Vuoi eliminare {count:_not_used_|# messaggio|# messaggi}?";
"lng_delete_photo_sure" = "Vuoi eliminare questa foto?";
"lng_box_delete" = "Elimina";
"lng_box_leave" = "Lascia";
@ -916,7 +921,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" = "— Introdotte le bozze: Sincronizzazione istantanea dei messaggi non inviati su tutti i dispositivi. Le bozze saranno visibili nella lista chat.\n— Pagina di info del gruppo e dei profili completamente ridisegnate.\n— Contatore messaggi non letti sul pulsante 'Scorri verso il basso'.\n\nPiù info su questo update: {link}";
"lng_new_version_text" = "— Il visualizzatore delle foto ora gestisce i cambi di risoluzione dello schermo correttamente\n— Risolto l'inoltro di foto via drag-n-drop\n— Miglioramenti di design e risoluzione di problemi";
"lng_menu_insert_unicode" = "Inserisci carattere di controllo Unicode";

View file

@ -697,7 +697,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_in_dlg_audio" = "음성 메시지";
"lng_in_dlg_file" = "파일";
"lng_in_dlg_sticker" = "스티커";
"lng_in_dlg_sticker_emoji" = "{emoji} (스티커)";
"lng_in_dlg_sticker_emoji" = "{emoji} 스티커";
"lng_ban_user" = "차단하기";
"lng_delete_all_from" = "모두에게 메시지 삭제";
@ -726,7 +726,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_wont_be_notified" = "메시지 작성시 구성원들에게 알림이 가지 않습니다.";
"lng_empty_history" = "";
"lng_willbe_history" = "대화하실 방을 선택해주세요.";
"lng_message_with_from" = "[c]{from}:[/c] {message}";
"lng_from_you" = "회원님";
"lng_from_draft" = "임시저장";
"lng_bot_description" = "봇이 할 수 있는 일은 무엇일까요?";
@ -735,6 +734,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_channel_mute" = "음소거";
"lng_channel_unmute" = "음소거 취소";
"lng_dialogs_text_with_from" = "{from_part} {message}";
"lng_dialogs_text_from_wrapped" = "{from}:";
"lng_dialogs_text_media" = "{media_part} {caption}";
"lng_dialogs_text_media_wrapped" = "{media},";
"lng_open_this_link" = "이 링크로 이동하시겠나요?";
"lng_open_link" = "열기";
@ -880,6 +884,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_selected_upload_stop" = "정지";
"lng_selected_delete_sure_this" = "메시지를 삭제하시겠습니까?";
"lng_selected_delete_sure" = "{count:_not_used_|# 메시지|# 메시지}를 삭제하시겠습니까?";
"lng_delete_photo_sure" = "사진을 삭제하시겠습니까?";
"lng_box_delete" = "삭제";
"lng_box_leave" = "나가기";
@ -916,7 +921,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" = "— 임시저장을 소개합니다: 임시로 작성된 메시지 동기화. 채팅목록에 임시저장된 내역이 표시됩니다.\n— 그룹 및 구성원 프로필 디자인 리뉴얼.\n— '맨 밑으로 스크롤' 버튼에 안 읽은 메시지 카운터 표시.\n\n업데이트 자세한 내역: {link}";
"lng_new_version_text" = "— 해상도 변경에 따라 사진 뷰어가 정상적으로 표시되도록 수정\n— 드래그앤드롭으로 사진 전송 수정\n— 디자인 및 버그 수정";
"lng_menu_insert_unicode" = "유니코드 문자를 입력하세요.";

View file

@ -697,7 +697,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_in_dlg_audio" = "Spraakbericht";
"lng_in_dlg_file" = "Bestand";
"lng_in_dlg_sticker" = "Sticker";
"lng_in_dlg_sticker_emoji" = "{emoji} (sticker)";
"lng_in_dlg_sticker_emoji" = "{emoji} Sticker";
"lng_ban_user" = "Blacklist gebruiker";
"lng_delete_all_from" = "Verwijder alles van gebruiker";
@ -726,7 +726,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_wont_be_notified" = "Geen berichtgeving voor leden";
"lng_empty_history" = "";
"lng_willbe_history" = "Kies een chat om te beginnen";
"lng_message_with_from" = "[c]{from}:[/c] {message}";
"lng_from_you" = "Jij";
"lng_from_draft" = "Concept";
"lng_bot_description" = "Wat kan deze bot? ";
@ -735,6 +734,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_channel_mute" = "Geluid uit";
"lng_channel_unmute" = "Geluid aan";
"lng_dialogs_text_with_from" = "{from_part} {message}";
"lng_dialogs_text_from_wrapped" = "{from}:";
"lng_dialogs_text_media" = "{media_part} {caption}";
"lng_dialogs_text_media_wrapped" = "{media},";
"lng_open_this_link" = "Link openen?";
"lng_open_link" = "Openen";
@ -880,6 +884,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_selected_upload_stop" = "Stoppen";
"lng_selected_delete_sure_this" = "Wil je dit bericht verwijderen?";
"lng_selected_delete_sure" = "Wil je {count:_not_used_|# bericht|# berichten} verwijderen?";
"lng_delete_photo_sure" = "Wil je deze foto verwijderen?";
"lng_box_delete" = "Verwijder";
"lng_box_leave" = "Verlaat";
@ -916,7 +921,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" = "— Concepten: Synchroniseer conceptberichten over al je apparaten. Concepten zijn vanaf nu zichtbaar in het hoofdscherm.\n— Nieuw design voor profielen van groepen en gebruikers.\n— Aantal ongelezen berichten in de 'Scroll naar beneden'-knop.\n\nMeer over deze update: {link}";
"lng_new_version_text" = "— Probleem met foto-weergave opgelost\n— Probleem met doorsturen via slepen opgelost\n— Diverse designverbeteringen en andere opgeloste problemen";
"lng_menu_insert_unicode" = "Unicode-besturingsteken invoegen";

View file

@ -697,7 +697,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_in_dlg_audio" = "Mensagem de voz";
"lng_in_dlg_file" = "Arquivo";
"lng_in_dlg_sticker" = "Sticker";
"lng_in_dlg_sticker_emoji" = "{emoji} (sticker)";
"lng_in_dlg_sticker_emoji" = "{emoji} Sticker";
"lng_ban_user" = "Banir Usuário";
"lng_delete_all_from" = "Apagar tudo deste usuário";
@ -726,7 +726,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_wont_be_notified" = "Os membros não serão notificados quando você postar";
"lng_empty_history" = "";
"lng_willbe_history" = "Selecione um chat para começar a conversar";
"lng_message_with_from" = "[c]{from}:[/c] {message}";
"lng_from_you" = "Você";
"lng_from_draft" = "Rascunho";
"lng_bot_description" = "O que esse bot pode fazer?";
@ -735,6 +734,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_channel_mute" = "Silenciar";
"lng_channel_unmute" = "Restaurar Som";
"lng_dialogs_text_with_from" = "{from_part} {message}";
"lng_dialogs_text_from_wrapped" = "{from}:";
"lng_dialogs_text_media" = "{media_part} {caption}";
"lng_dialogs_text_media_wrapped" = "{media},";
"lng_open_this_link" = "Abrir este link?";
"lng_open_link" = "Abrir";
@ -880,6 +884,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_selected_upload_stop" = "Parar";
"lng_selected_delete_sure_this" = "Você deseja apagar essa mensagem?";
"lng_selected_delete_sure" = "Você deseja apagar {count:_not_used_|# mensagem|# mensagens}?";
"lng_delete_photo_sure" = "Você deseja apagar essa foto?";
"lng_box_delete" = "Apagar";
"lng_box_leave" = "Sair";
@ -916,7 +921,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" = "— Introduzindo os rascunhos: Sincronização entre todos os seus dispositivos para mensagens não enviadas. Os rascunhos agora são visíveis em sua lista de conversas.\n— Perfis de usuários e grupos completamente redesenhados.\n— Contador de mensagens não lidas no botão “Rolar para baixo”.\n\nMais sobre essa atualização em: {link}";
"lng_new_version_text" = "— O visualizador de fotos agora maneja corretamente a mudança de resolução da tela\n— O bug ao encaminhar fotos arrastando e soltando foi resolvido. \n— Várias melhorias de design e outras resoluções de bugs";
"lng_menu_insert_unicode" = "Inserir caractere de controle Unicode";

View file

@ -507,7 +507,7 @@ bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) {
return _inner->chooseSelected(ChooseMethod::ByEnter);
}
}
if (moderate && (ev->key() >= Qt::Key_1 && ev->key() <= Qt::Key_9 || ev->key() == Qt::Key_Q)) {
if (moderate && ((ev->key() >= Qt::Key_1 && ev->key() <= Qt::Key_9) || ev->key() == Qt::Key_Q)) {
bool handled = false;
emit moderateKeyActivate(ev->key(), &handled);
return handled;