From 5b7d936140ad97e4690678b9cee857927235033e Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 29 Sep 2016 00:33:05 +0300 Subject: [PATCH] Some langs updated. Build fixed for Xcode. --- Telegram/Resources/langs/lang_de.strings | 10 +++++++++- Telegram/Resources/langs/lang_es.strings | 8 ++++++++ Telegram/Resources/langs/lang_it.strings | 10 +++++++++- Telegram/Resources/langs/lang_nl.strings | 8 ++++++++ Telegram/Resources/langs/lang_pt_BR.strings | 2 +- Telegram/SourceFiles/inline_bots/inline_bot_result.cpp | 4 ++++ Telegram/SourceFiles/inline_bots/inline_bot_result.h | 2 ++ Telegram/SourceFiles/media/media_clip_reader.h | 5 +++++ Telegram/SourceFiles/pspecific_mac.cpp | 1 + Telegram/SourceFiles/ui/animation.cpp | 5 ----- Telegram/SourceFiles/ui/animation.h | 5 ----- 11 files changed, 47 insertions(+), 13 deletions(-) diff --git a/Telegram/Resources/langs/lang_de.strings b/Telegram/Resources/langs/lang_de.strings index 353b954db..ab3cfef13 100644 --- a/Telegram/Resources/langs/lang_de.strings +++ b/Telegram/Resources/langs/lang_de.strings @@ -580,7 +580,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_action_pinned_media_contact" = "einen Kontakt"; "lng_action_pinned_media_location" = "einen Standort"; "lng_action_pinned_media_sticker" = "einen Sticker"; -"lng_action_game_score" = "{from} erzielte {count:Punkte|Punkt|Punkte} bei {game}"; +"lng_action_pinned_media_emoji_sticker" = "einen {emoji} Sticker"; +"lng_action_pinned_media_game" = "ein Spiel «{game}»"; +"lng_action_game_score" = "{from} erzielte {count:# Punkte|# Punkt|# Punkte} bei {game}"; "lng_profile_migrate_reached" = "Limit von {count:_not_used_|# Mitglied|# Mitgliedern} erreicht"; "lng_profile_migrate_body" = "Um das Limit aufzuheben, ändere die Gruppe in eine Supergruppe."; @@ -774,6 +776,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_bot_groups_not_found" = "Keine Gruppen gefunden"; "lng_bot_sure_invite" = "Den Bot zu «{group}» hinzufügen?"; "lng_bot_already_in_group" = "Der Bot ist schon in dieser Gruppe."; +"lng_bot_choose_chat" = "Chat auswählen"; +"lng_bot_no_chats" = "Du hast keine Chats"; +"lng_bot_chats_not_found" = "Keine Chats gefunden"; +"lng_bot_sure_share_game" = "Das Spiel mit {user} teilen?"; +"lng_bot_sure_share_game_group" = "Das Spiel mit «{group}» teilen?"; "lng_typing" = "tippt"; "lng_user_typing" = "{user} tippt"; @@ -808,6 +815,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_duration_played" = "{played} / {duration}"; "lng_date_and_duration" = "{date}, {duration}"; "lng_choose_images" = "Bilder auswählen"; +"lng_game_tag" = "Spiel"; "lng_context_view_profile" = "Profil öffnen"; "lng_context_view_group" = "Gruppeninfo zeigen"; diff --git a/Telegram/Resources/langs/lang_es.strings b/Telegram/Resources/langs/lang_es.strings index b844de3b2..840e0eb86 100644 --- a/Telegram/Resources/langs/lang_es.strings +++ b/Telegram/Resources/langs/lang_es.strings @@ -580,6 +580,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_action_pinned_media_contact" = "un contacto"; "lng_action_pinned_media_location" = "una ubicación"; "lng_action_pinned_media_sticker" = "un sticker"; +"lng_action_pinned_media_emoji_sticker" = "un {emoji} sticker"; +"lng_action_pinned_media_game" = "un juego «{game}»"; "lng_action_game_score" = "{from} ha conseguido {count:# puntos|# punto|# puntos} en {game}"; "lng_profile_migrate_reached" = "Límite de {count:_not_used_|# miembro|# miembros} alcanzado"; @@ -774,6 +776,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_bot_groups_not_found" = "No se encontraron grupos"; "lng_bot_sure_invite" = "¿Añadir el bot a «{group}»?"; "lng_bot_already_in_group" = "El bot ya es un miembro del grupo."; +"lng_bot_choose_chat" = "Elige un chat"; +"lng_bot_no_chats" = "No tienes chats"; +"lng_bot_chats_not_found" = "No se encontraron chats"; +"lng_bot_sure_share_game" = "¿Compartir el juego con {user}?"; +"lng_bot_sure_share_game_group" = "¿Compartir el juego en «{group}»?"; "lng_typing" = "escribiendo"; "lng_user_typing" = "{user} está escribiendo"; @@ -808,6 +815,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_duration_played" = "{played} / {duration}"; "lng_date_and_duration" = "{date}, {duration}"; "lng_choose_images" = "Elegir imágenes"; +"lng_game_tag" = "Juego"; "lng_context_view_profile" = "Ver información"; "lng_context_view_group" = "Ver información"; diff --git a/Telegram/Resources/langs/lang_it.strings b/Telegram/Resources/langs/lang_it.strings index 2d2d99dd4..42fa1df3d 100644 --- a/Telegram/Resources/langs/lang_it.strings +++ b/Telegram/Resources/langs/lang_it.strings @@ -580,7 +580,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_action_pinned_media_contact" = "un contatto"; "lng_action_pinned_media_location" = "una posizione"; "lng_action_pinned_media_sticker" = "uno sticker"; -"lng_action_game_score" = "{from} ha segnato {count:# punti|# punto|# punti} in {game}"; +"lng_action_pinned_media_emoji_sticker" = "uno {emoji} sticker"; +"lng_action_pinned_media_game" = "un gioco «{game}»"; +"lng_action_game_score" = "{from} ha segnato {count:# punti|# punto|# punti} a {game}"; "lng_profile_migrate_reached" = "Limite di {count:_not_used_|# membro|# membri} raggiunto"; "lng_profile_migrate_body" = "Per superare questo limite, puoi aggiornare il gruppo a supergruppo."; @@ -774,6 +776,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_bot_groups_not_found" = "Nessun gruppo trovato"; "lng_bot_sure_invite" = "Aggiungere il bot a «{group}»?"; "lng_bot_already_in_group" = "Questo bot è già membro del gruppo."; +"lng_bot_choose_chat" = "Scegli chat"; +"lng_bot_no_chats" = "Non hai chat"; +"lng_bot_chats_not_found" = "Nessuna chat trovata"; +"lng_bot_sure_share_game" = "Condividere questo gioco con {user}?"; +"lng_bot_sure_share_game_group" = "Condividere questo gioco con «{group}»?"; "lng_typing" = "sta scrivendo"; "lng_user_typing" = "{user} sta scrivendo"; @@ -808,6 +815,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_duration_played" = "{played} / {duration}"; "lng_date_and_duration" = "{date}, {duration}"; "lng_choose_images" = "Scegli immagini"; +"lng_game_tag" = "Gioco"; "lng_context_view_profile" = "Visualizza profilo"; "lng_context_view_group" = "Visualizza info gruppo"; diff --git a/Telegram/Resources/langs/lang_nl.strings b/Telegram/Resources/langs/lang_nl.strings index c2b2b2ff6..df84eb3ee 100644 --- a/Telegram/Resources/langs/lang_nl.strings +++ b/Telegram/Resources/langs/lang_nl.strings @@ -580,6 +580,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_action_pinned_media_contact" = "een contact"; "lng_action_pinned_media_location" = "een locatie"; "lng_action_pinned_media_sticker" = "een sticker"; +"lng_action_pinned_media_emoji_sticker" = "een {emoji} sticker"; +"lng_action_pinned_media_game" = "een spel «{game}»"; "lng_action_game_score" = "{from} heeft met {game} {count:#punten|#punt|#punten} behaald"; "lng_profile_migrate_reached" = "{count:_not_used_|# lid |# leden} limiet bereikt"; @@ -774,6 +776,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_bot_groups_not_found" = "Geen groepen gevonden"; "lng_bot_sure_invite" = "De bot toevoegen aan \"{group}\"?"; "lng_bot_already_in_group" = "Deze bot is al een groepslid."; +"lng_bot_choose_chat" = "Kies chat"; +"lng_bot_no_chats" = "Je hebt nog geen chats"; +"lng_bot_chats_not_found" = "Geen chats gevonden"; +"lng_bot_sure_share_game" = "Spel met {user} delen?"; +"lng_bot_sure_share_game_group" = "Spel met «{group}» delen?"; "lng_typing" = "aan het typen"; "lng_user_typing" = "{user} is aan het typen"; @@ -808,6 +815,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_duration_played" = "{played} / {duration}"; "lng_date_and_duration" = "{date}, {duration}"; "lng_choose_images" = "Afbeeldingen kiezen"; +"lng_game_tag" = "Spel"; "lng_context_view_profile" = "Profiel weergeven"; "lng_context_view_group" = "Groepsinformatie weergeven"; diff --git a/Telegram/Resources/langs/lang_pt_BR.strings b/Telegram/Resources/langs/lang_pt_BR.strings index 16b443849..ac452d955 100644 --- a/Telegram/Resources/langs/lang_pt_BR.strings +++ b/Telegram/Resources/langs/lang_pt_BR.strings @@ -580,7 +580,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_action_pinned_media_contact" = "um contato"; "lng_action_pinned_media_location" = "uma localização"; "lng_action_pinned_media_sticker" = "um sticker"; -"lng_action_game_score" = "{from} marcou {count:pontos|ponto|pontos} em {game}"; +"lng_action_game_score" = "{from} marcou {count:# pontos|# ponto|# pontos} em {game}"; "lng_profile_migrate_reached" = "{count:_not_used_|# membro|# membros} limite alcançado"; "lng_profile_migrate_body" = "Para ir além desse limite, você pode converter seu grupo em um supergrupo."; diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp index ab9824bb3..482b20a37 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp @@ -303,6 +303,10 @@ QString Result::getLayoutDescription() const { return sendData->getLayoutDescription(this); } +// just to make unique_ptr see the destructors. +Result::~Result() { +} + void Result::createPhoto() { if (_photo) return; diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.h b/Telegram/SourceFiles/inline_bots/inline_bot_result.h index 09c58aad9..944b0a807 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_result.h +++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.h @@ -74,6 +74,8 @@ public: QString getLayoutTitle() const; QString getLayoutDescription() const; + ~Result(); + private: void createPhoto(); void createDocument(); diff --git a/Telegram/SourceFiles/media/media_clip_reader.h b/Telegram/SourceFiles/media/media_clip_reader.h index 220632c55..0b3a8a395 100644 --- a/Telegram/SourceFiles/media/media_clip_reader.h +++ b/Telegram/SourceFiles/media/media_clip_reader.h @@ -171,6 +171,11 @@ private: }; +template +inline ReaderPointer MakeReader(Args&&... args) { + return ReaderPointer(new Reader(std_::forward(args)...)); +} + enum class ProcessResult { Error, Started, diff --git a/Telegram/SourceFiles/pspecific_mac.cpp b/Telegram/SourceFiles/pspecific_mac.cpp index bfc1baba0..2ed9fd9b7 100644 --- a/Telegram/SourceFiles/pspecific_mac.cpp +++ b/Telegram/SourceFiles/pspecific_mac.cpp @@ -25,6 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "localstorage.h" #include "passcodewidget.h" +#include "history/history_location_manager.h" #include diff --git a/Telegram/SourceFiles/ui/animation.cpp b/Telegram/SourceFiles/ui/animation.cpp index 0fd8b7995..88d79b43f 100644 --- a/Telegram/SourceFiles/ui/animation.cpp +++ b/Telegram/SourceFiles/ui/animation.cpp @@ -35,11 +35,6 @@ ReaderPointer::~ReaderPointer() { _pointer = nullptr; } -class Tmp; -void f(Tmp *t) { - delete t; -} - } // namespace Clip } // namespace Media diff --git a/Telegram/SourceFiles/ui/animation.h b/Telegram/SourceFiles/ui/animation.h index dc9e7b83a..4bbe4e49c 100644 --- a/Telegram/SourceFiles/ui/animation.h +++ b/Telegram/SourceFiles/ui/animation.h @@ -77,11 +77,6 @@ private: }; -template -inline ReaderPointer MakeReader(Args&&... args) { - return ReaderPointer(new Reader(std_::forward(args)...)); -} - class Manager; enum Notification {