From 1f3fae53ca6d729af58063357989e9d1c2ea231c Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 17 Jun 2015 00:04:18 +0300 Subject: [PATCH] removed QCoreWlanEnginePlugin, some langs updates --- Telegram/SourceFiles/langs/lang_es.strings | 8 ++++---- Telegram/SourceFiles/langs/lang_it.strings | 2 +- Telegram/SourceFiles/stdafx.cpp | 1 - Telegram/Telegram.xcodeproj/project.pbxproj | 2 -- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Telegram/SourceFiles/langs/lang_es.strings b/Telegram/SourceFiles/langs/lang_es.strings index 059bf3889..d420de98a 100644 --- a/Telegram/SourceFiles/langs/lang_es.strings +++ b/Telegram/SourceFiles/langs/lang_es.strings @@ -420,13 +420,13 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_media_video" = "Vídeo"; "lng_media_audio" = "Mensaje de voz"; -"lng_emoji_category0" = "Usados frecuentemente"; -"lng_emoji_category1" = "Gente"; +"lng_emoji_category0" = "Usados con frecuencia"; +"lng_emoji_category1" = "Personas"; "lng_emoji_category2" = "Naturaleza"; -"lng_emoji_category3" = "Comida y bebidas"; +"lng_emoji_category3" = "Comida y bebida"; "lng_emoji_category4" = "Celebración"; "lng_emoji_category5" = "Actividad"; -"lng_emoji_category6" = "Viajes y lugares"; +"lng_emoji_category6" = "Viajes y destinos"; "lng_emoji_category7" = "Objetos y símbolos"; "lng_switch_stickers" = "Stickers"; diff --git a/Telegram/SourceFiles/langs/lang_it.strings b/Telegram/SourceFiles/langs/lang_it.strings index f3bb493d5..0320d806c 100644 --- a/Telegram/SourceFiles/langs/lang_it.strings +++ b/Telegram/SourceFiles/langs/lang_it.strings @@ -383,7 +383,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_action_user_left" = "{from} ha lasciato il gruppo"; "lng_action_user_joined" = "{from} si è unito al gruppo"; "lng_action_user_joined_by_link" = "{from} si è unito al gruppo tramite link di invito"; -"lng_action_user_registered" = "{from} ha iniziato a usare Telegram"; +"lng_action_user_registered" = "{from} si è unito a Telegram"; "lng_action_removed_photo" = "{from} ha rimosso la foto del gruppo"; "lng_action_changed_photo" = "{from} ha cambiato la foto del gruppo"; "lng_action_changed_title" = "{from} ha cambiato il nome del gruppo in «{title}»"; diff --git a/Telegram/SourceFiles/stdafx.cpp b/Telegram/SourceFiles/stdafx.cpp index 2ec787729..2b0067974 100644 --- a/Telegram/SourceFiles/stdafx.cpp +++ b/Telegram/SourceFiles/stdafx.cpp @@ -22,7 +22,6 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWebpPlugin) #elif defined Q_OS_MAC -Q_IMPORT_PLUGIN(QCoreWlanEnginePlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QDDSPlugin) diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 732355afa..97a3546c3 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -214,7 +214,6 @@ E8D95529CED88F18818C9A8B /* intro.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0771C4C94B623FC34BF62983 /* intro.cpp */; settings = {ATTRIBUTES = (); }; }; E97B3CFAB59B49BACFFC5F7C /* moc_title.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 1080B6D395843B8F76A2E45E /* moc_title.cpp */; settings = {ATTRIBUTES = (); }; }; E9F1CE7F9B18C7C85A50E62D /* style_auto.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 99B8D38F7F5858601230911E /* style_auto.cpp */; settings = {ATTRIBUTES = (); }; }; - EBA5E17368D2BBC6014E92B9 /* qcorewlanbearer in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = EE03BC5CA4628A6D6BEB0122 /* qcorewlanbearer */; }; EBE29731916DB43BF49FE7A4 /* aboutbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = C194EDD00F76216057D48A5C /* aboutbox.cpp */; settings = {ATTRIBUTES = (); }; }; ED2557A57C6782721DC494AF /* moc_connectionbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = FEC58F9D8A0963E5A9D4BE6F /* moc_connectionbox.cpp */; settings = {ATTRIBUTES = (); }; }; F26454630C80841CBDCFE1CA /* Foundation.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = FCC237CA5AD60B9BA4447615 /* Foundation.framework */; }; @@ -718,7 +717,6 @@ CCA737EE379CDB10CC9A0F23 /* AVFoundation.framework in Link Binary With Libraries */, B78304F135DEF1F7A68393A6 /* CoreMedia.framework in Link Binary With Libraries */, F2A75ACAC9DF6A3F4E5711E7 /* AppKit.framework in Link Binary With Libraries */, - EBA5E17368D2BBC6014E92B9 /* qcorewlanbearer in Link Binary With Libraries */, D0EECF370C58DDCACBC71BAD /* CoreWLAN.framework in Link Binary With Libraries */, 8883FF366F2623E89D90A9E6 /* qgenericbearer in Link Binary With Libraries */, 5058CB9D7BFFCE9F404A3700 /* Qt5Network in Link Binary With Libraries */,