diff --git a/Telegram/Resources/langs/lang_es.strings b/Telegram/Resources/langs/lang_es.strings index 7169fba85d4b0a..6734c85376da6a 100644 --- a/Telegram/Resources/langs/lang_es.strings +++ b/Telegram/Resources/langs/lang_es.strings @@ -601,10 +601,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_forwarded_signed" = "{channel} ({user})"; "lng_in_reply_to" = "Respondiendo a"; -"lng_bot_share_location_unavailable" = "Sorry, the location sharing is currently unavailable in Telegram Desktop."; -"lng_bot_inline_geo_unavailable" = "Sorry, this bot requires location sharing.\nIt is not unavailable in Telegram Desktop."; -"lng_bot_share_phone" = "Share Phone Number?"; -"lng_bot_share_phone_confirm" = "Share"; +"lng_bot_share_location_unavailable" = "Lo sentimos, compartir la ubicación no está disponible actualmente en Telegram Desktop."; +"lng_bot_inline_geo_unavailable" = "Lo sentimos, este bot requiere compartir la ubicación.\nNo está disponible en Telegram Desktop."; +"lng_bot_share_phone" = "¿Compartir número de teléfono?"; +"lng_bot_share_phone_confirm" = "Compartir"; "lng_attach_failed" = "Fallido"; "lng_attach_file" = "Archivo"; @@ -690,8 +690,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_cant_invite_not_contact_channel" = "Por ahora, sólo puedes añadir \ncontactos mutuos a canales. \n{more_info}"; "lng_cant_more_info" = "Más información »"; "lng_cant_invite_banned" = "Sólo el administrador puede añadir a este usuario."; -"lng_cant_invite_privacy" = "Sorry, you cannot add this user to groups because of their privacy settings."; -"lng_cant_invite_privacy_channel" = "Sorry, you cannot add this user to channels because of their privacy settings."; +"lng_cant_invite_privacy" = "No puedes añadir a este usuario a grupos por sus ajustes de privacidad."; +"lng_cant_invite_privacy_channel" = "No puedes añadir a este usuario a canales por sus ajustes de privacidad."; "lng_cant_do_this" = "Lo sentimos, esta acción no está disponible."; "lng_send_button" = "Enviar"; @@ -815,8 +815,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_forward_messages" = "{count:_not_used_|Mensaje adjunto|# mensajes adjuntos}"; "lng_forwarding_from" = "{user} y {count:_not_used_|# otro|# otros}"; "lng_forwarding_from_two" = "{user} y {second_user}"; -"lng_inline_switch_choose" = "Choose conversation..."; -"lng_inline_switch_cant" = "Sorry, no way to write here :("; +"lng_inline_switch_choose" = "Elige una conversación..."; +"lng_inline_switch_cant" = "Lo sentimos, no puedes escribir aquí :("; "lng_share_cant" = "Lo sentimos. No hay forma de compartir aquí :("; "lng_reply_cant" = "Lo sentimos, no puedes responder un mensaje viejo en un supergrupo :("; diff --git a/Telegram/Resources/langs/lang_ko.strings b/Telegram/Resources/langs/lang_ko.strings index 6706109ba9b602..97d5a7905fd5b2 100644 --- a/Telegram/Resources/langs/lang_ko.strings +++ b/Telegram/Resources/langs/lang_ko.strings @@ -602,7 +602,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_in_reply_to" = "다음 유저에게 답장 :"; "lng_bot_share_location_unavailable" = "죄송합니다, 위치 공유는 텔레그램 테스크탑에서는 현재 지원을 하고 있지 않습니다."; -"lng_bot_inline_geo_unavailable" = "죄송합니다, 이 봇은 위치 공유가 필요합니다.\n텔레그램 테스크탑에서 현재 지원을 하고 있지 않습니다."; +"lng_bot_inline_geo_unavailable" = "죄송합니다, 위치 공유는 텔레그램 테스크탑에서는 현재 지원을 하고 있지 않습니다."; "lng_bot_share_phone" = "전화번호를 공유하겠습니까?"; "lng_bot_share_phone_confirm" = "공유"; diff --git a/Telegram/Resources/langs/lang_pt_BR.strings b/Telegram/Resources/langs/lang_pt_BR.strings index e12f8967b5f6a2..a2e1567588ae8a 100644 --- a/Telegram/Resources/langs/lang_pt_BR.strings +++ b/Telegram/Resources/langs/lang_pt_BR.strings @@ -602,7 +602,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_in_reply_to" = "Em resposta a"; "lng_bot_share_location_unavailable" = "O compartilhamento de localização está atualmente indisponível no Telegram Desktop."; -"lng_bot_inline_geo_unavailable" = "Esse bot requer o compartilhamento da localização\nIsso está indisponível no Telegram Desktop."; +"lng_bot_inline_geo_unavailable" = "Esse bot requer compartilhamento de localização\nIsso não está disponível no Telegram Desktop."; "lng_bot_share_phone" = "Compartilhar Número de Telefone?"; "lng_bot_share_phone_confirm" = "Compartilhar"; diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro index 14c8d4bfee34a4..40af4d79f7e26b 100644 --- a/Telegram/Telegram.pro +++ b/Telegram/Telegram.pro @@ -108,7 +108,7 @@ SOURCES += \ ./SourceFiles/mainwidget.cpp \ ./SourceFiles/settings.cpp \ ./SourceFiles/settingswidget.cpp \ - ./SourceFiles/shortcuts.cpp \ + ./SourceFiles/shortcuts.cpp \ ./SourceFiles/structs.cpp \ ./SourceFiles/sysbuttons.cpp \ ./SourceFiles/title.cpp \ @@ -215,9 +215,8 @@ HEADERS += \ ./SourceFiles/mainwidget.h \ ./SourceFiles/settings.h \ ./SourceFiles/settingswidget.h \ - ./SourceFiles/shortcuts.h \ + ./SourceFiles/shortcuts.h \ ./SourceFiles/structs.h \ - ./SourceFiles/gui/style.h \ ./SourceFiles/sysbuttons.h \ ./SourceFiles/title.h \ ./SourceFiles/basic_types.h \ @@ -254,6 +253,7 @@ HEADERS += \ ./SourceFiles/ui/flattextarea.h \ ./SourceFiles/ui/images.h \ ./SourceFiles/ui/scrollarea.h \ + ./SourceFiles/ui/style.h \ ./SourceFiles/ui/style_core.h \ ./SourceFiles/ui/text.h \ ./SourceFiles/ui/twidget.h \ diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 29bb730a0e3baa..476237bb204436 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -87,6 +87,9 @@ 07AF95FA1AFD03C80060B057 /* telegram_mac.qrc in Resources */ = {isa = PBXBuildFile; fileRef = 07AF95F81AFD03C80060B057 /* telegram_mac.qrc */; }; 07B604321B46A0EC00CA29FE /* playerwidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07B604301B46A0EC00CA29FE /* playerwidget.cpp */; }; 07B604351B46A20900CA29FE /* moc_playerwidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07B604341B46A20900CA29FE /* moc_playerwidget.cpp */; }; + 07B817091CB9A235006F7869 /* dialogs_indexed_list.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07B817021CB9A235006F7869 /* dialogs_indexed_list.cpp */; }; + 07B8170A1CB9A235006F7869 /* dialogs_layout.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07B817041CB9A235006F7869 /* dialogs_layout.cpp */; }; + 07B8170B1CB9A235006F7869 /* dialogs_list.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07B817061CB9A235006F7869 /* dialogs_list.cpp */; }; 07BE850F1A2093C9008ACB9F /* localstorage.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07BE850D1A2093C9008ACB9F /* localstorage.cpp */; }; 07BE85121A20961F008ACB9F /* moc_localstorage.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07BE85111A20961F008ACB9F /* moc_localstorage.cpp */; }; 07C7596F1B1F7E0000662169 /* autoupdater.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07C7596D1B1F7E0000662169 /* autoupdater.cpp */; }; @@ -368,6 +371,14 @@ 07B604301B46A0EC00CA29FE /* playerwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = playerwidget.cpp; path = SourceFiles/playerwidget.cpp; sourceTree = SOURCE_ROOT; }; 07B604311B46A0EC00CA29FE /* playerwidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playerwidget.h; path = SourceFiles/playerwidget.h; sourceTree = SOURCE_ROOT; }; 07B604341B46A20900CA29FE /* moc_playerwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_playerwidget.cpp; path = GeneratedFiles/Debug/moc_playerwidget.cpp; sourceTree = SOURCE_ROOT; }; + 07B817011CB9A235006F7869 /* dialogs_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialogs_common.h; path = SourceFiles/dialogs/dialogs_common.h; sourceTree = SOURCE_ROOT; }; + 07B817021CB9A235006F7869 /* dialogs_indexed_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dialogs_indexed_list.cpp; path = SourceFiles/dialogs/dialogs_indexed_list.cpp; sourceTree = SOURCE_ROOT; }; + 07B817031CB9A235006F7869 /* dialogs_indexed_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialogs_indexed_list.h; path = SourceFiles/dialogs/dialogs_indexed_list.h; sourceTree = SOURCE_ROOT; }; + 07B817041CB9A235006F7869 /* dialogs_layout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dialogs_layout.cpp; path = SourceFiles/dialogs/dialogs_layout.cpp; sourceTree = SOURCE_ROOT; }; + 07B817051CB9A235006F7869 /* dialogs_layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialogs_layout.h; path = SourceFiles/dialogs/dialogs_layout.h; sourceTree = SOURCE_ROOT; }; + 07B817061CB9A235006F7869 /* dialogs_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dialogs_list.cpp; path = SourceFiles/dialogs/dialogs_list.cpp; sourceTree = SOURCE_ROOT; }; + 07B817071CB9A235006F7869 /* dialogs_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialogs_list.h; path = SourceFiles/dialogs/dialogs_list.h; sourceTree = SOURCE_ROOT; }; + 07B817081CB9A235006F7869 /* dialogs_row.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialogs_row.h; path = SourceFiles/dialogs/dialogs_row.h; sourceTree = SOURCE_ROOT; }; 07BE850D1A2093C9008ACB9F /* localstorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = localstorage.cpp; path = SourceFiles/localstorage.cpp; sourceTree = SOURCE_ROOT; }; 07BE850E1A2093C9008ACB9F /* localstorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = localstorage.h; path = SourceFiles/localstorage.h; sourceTree = SOURCE_ROOT; }; 07BE85111A20961F008ACB9F /* moc_localstorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_localstorage.cpp; path = GeneratedFiles/Debug/moc_localstorage.cpp; sourceTree = SOURCE_ROOT; }; @@ -863,6 +874,21 @@ name = langs; sourceTree = ""; }; + 07B816FF1CB9A219006F7869 /* dialogs */ = { + isa = PBXGroup; + children = ( + 07B817011CB9A235006F7869 /* dialogs_common.h */, + 07B817021CB9A235006F7869 /* dialogs_indexed_list.cpp */, + 07B817031CB9A235006F7869 /* dialogs_indexed_list.h */, + 07B817041CB9A235006F7869 /* dialogs_layout.cpp */, + 07B817051CB9A235006F7869 /* dialogs_layout.h */, + 07B817061CB9A235006F7869 /* dialogs_list.cpp */, + 07B817071CB9A235006F7869 /* dialogs_list.h */, + 07B817081CB9A235006F7869 /* dialogs_row.h */, + ); + name = dialogs; + sourceTree = ""; + }; 07C8FDF81CB66D80007A8702 /* inline_bots */ = { isa = PBXGroup; children = ( @@ -1030,12 +1056,13 @@ isa = PBXGroup; children = ( ADC8DBF4C6F26E14C77F68B4 /* boxes */, - 579DA7AEF5751DF4988869A0 /* ui */, + 07B816FF1CB9A219006F7869 /* dialogs */, 07C8FDF81CB66D80007A8702 /* inline_bots */, 5E35A03E5F2C51353EBCBF00 /* intro */, 074968CB1A44D0B800394F46 /* langs */, 1A6AA22F4A758C4B5F5138FB /* mtproto */, 0702E99F1CB8D290007A7495 /* serialize */, + 579DA7AEF5751DF4988869A0 /* ui */, 0764D5581ABAD6F900FBFEED /* apiwrap.cpp */, 0764D5591ABAD6F900FBFEED /* apiwrap.h */, 06E379415713F34B83F99C35 /* app.cpp */, @@ -1786,11 +1813,13 @@ 3F6EB1F5B98E704960FEA686 /* moc_scrollarea.cpp in Compile Sources */, 60CB4898955209B665E7B07D /* moc_twidget.cpp in Compile Sources */, 077A4B051CA41EE2002188D2 /* moc_connection_http.cpp in Compile Sources */, + 07B8170A1CB9A235006F7869 /* dialogs_layout.cpp in Compile Sources */, 7062978F12EEA525893A5E6F /* moc_aboutbox.cpp in Compile Sources */, E8B28580819B882A5964561A /* moc_addcontactbox.cpp in Compile Sources */, 07B604321B46A0EC00CA29FE /* playerwidget.cpp in Compile Sources */, D6874C00733283846ACA9AB2 /* moc_confirmbox.cpp in Compile Sources */, 075FEBEC1C82336D0003ECA3 /* shortcuts.cpp in Compile Sources */, + 07B817091CB9A235006F7869 /* dialogs_indexed_list.cpp in Compile Sources */, ED2557A57C6782721DC494AF /* moc_connectionbox.cpp in Compile Sources */, 5FC914F652D1B16FDA8F0634 /* moc_contactsbox.cpp in Compile Sources */, 074968D01A44D14C00394F46 /* languagebox.cpp in Compile Sources */, @@ -1800,6 +1829,7 @@ 07C759721B1F7E2800662169 /* moc_autoupdater.cpp in Compile Sources */, 07DB674E1AD07C9200A51329 /* sessionsbox.cpp in Compile Sources */, 49C3C1BF153F7FC078A25CE4 /* moc_downloadpathbox.cpp in Compile Sources */, + 07B8170B1CB9A235006F7869 /* dialogs_list.cpp in Compile Sources */, 9D294F23E02CFDF22C288382 /* moc_emojibox.cpp in Compile Sources */, 9809A3AF1946D51ACB41D716 /* moc_photocropbox.cpp in Compile Sources */, AC6C131416AEC557C854BA70 /* moc_photosendbox.cpp in Compile Sources */, diff --git a/Telegram/Telegram.xcodeproj/qt_preprocess.mak b/Telegram/Telegram.xcodeproj/qt_preprocess.mak index 166b0b8a4a7e1b..727c563f485f66 100644 --- a/Telegram/Telegram.xcodeproj/qt_preprocess.mak +++ b/Telegram/Telegram.xcodeproj/qt_preprocess.mak @@ -114,7 +114,7 @@ GeneratedFiles/qrc_telegram.cpp: Resources/telegram.qrc \ Resources/art/fonts/OpenSans-Semibold.ttf \ Resources/art/newmsg.wav \ Resources/art/bg.jpg \ - Resources/art/bg0.jpg \ + Resources/art/bg0.png \ Resources/art/sprite.png \ Resources/art/sprite_125x.png \ Resources/art/sprite_150x.png \ @@ -123,11 +123,11 @@ GeneratedFiles/qrc_telegram.cpp: Resources/telegram.qrc \ Resources/art/icon256.png \ Resources/art/iconbig256.png \ Resources/art/chatcolor1.png \ - Resources/art/chatcolor2.png + Resources/art/chatcolor2.png \ Resources/art/chatcolor3.png \ Resources/art/chatcolor4.png \ Resources/art/channelcolor1.png \ - Resources/art/channelcolor2.png + Resources/art/channelcolor2.png \ Resources/art/channelcolor3.png \ Resources/art/channelcolor4.png \ Resources/art/usercolor1.png \ @@ -144,7 +144,7 @@ GeneratedFiles/qrc_telegram.cpp: Resources/telegram.qrc \ Resources/langs/lang_de.strings \ Resources/langs/lang_nl.strings \ Resources/langs/lang_pt_BR.strings \ - Resources/langs/lang_ko.strings \ + Resources/langs/lang_ko.strings /usr/local/Qt-5.5.1/bin/rcc -name telegram Resources/telegram.qrc -o GeneratedFiles/qrc_telegram.cpp GeneratedFiles/qrc_telegram_emojis.cpp: Resources/telegram_emojis.qrc \