merged with master

10 years ago · 66ac7824ba
11 changed files with 73 additions and 17 deletions
--- a/app.manifest
+++ b/app.manifest
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Fri Jul 10 2015 19:42:39 GMT+0300 (MSK)
+# Time: Fri Jul 10 2015 21:03:45 GMT+0300 (MSK)


 CACHE:
--- a/css/app.css
+++ b/css/app.css
@ -1541,7 +1541,7 @@ img.img_fullsize{margin:0 auto}
 .composer_emoji_tooltip_tab_grid.active{background-position:-9px -222px}
 .composer_emoji_tooltip_tab_stickers{background-position:-9px -361px}
 .composer_emoji_tooltip_tab_stickers.active{background-position:-9px -333px}
-.composer_emoji_tooltip_scrollable_container{height:174px;position:relative}
+.composer_emoji_tooltip .scroller_scrollable_container{height:174px;position:relative}
 .composer_emoji_tooltip_content{padding-right:8px;outline:0!important}
 a.composer_emoji_btn{margin:0 1px 0 0;padding:6px;display:block;float:left;border-radius:2px}
 a.composer_emoji_btn:hover{background-color:#edf2f5}
@ -1810,6 +1810,7 @@ a.md_modal_list_peer_name{color:inherit}
 .md_modal_list_peer_description{margin-top:4px;color:#999}
 .md_modal_list_peer_description .status_online,.md_modal_list_peer_description.status_online{color:#3a6d99}
 .md_modal_footer{padding:15px 27px}
+.md_modal_footer_empty{padding:15px 27px 0}
 .md_photo_loading{display:block;width:72px;height:72px;border-radius:36px;overflow:hidden;background:#48769b;text-align:center;line-height:72px;padding:0}
 .md_photo_loading i{display:inline-block;background:#fff;width:8px;height:8px;border-radius:4px;vertical-align:middle;border:0;margin-left:6px}
 .md_photo_loading i:first-child{margin-left:0}
--- a/js/app.js
+++ b/js/app.js
--- a/js/locales/de-de.json
+++ b/js/locales/de-de.json
@ -103,8 +103,12 @@
    "user_modal_block_user": "Kontakt blockieren",
    "user_modal_unblock_user": "Kontakt freigeben",
    "user_modal_delete_chat": "Chat löschen",
+    "user_modal_add_to_group": "Zu einer Gruppe hinzufügen",
    "user_modal_info": "Info",
    "user_modal_phone": "Telefon",
+    "user_modal_about": "Info",
+    "user_modal_bot_settings": "Einstellungen",
+    "user_modal_bot_help": "Hilfe",
    "user_modal_username": "Benutzername",
    "user_modal_settings": "Einstellungen",
    "user_modal_notifications": "Benachrichtigungen",
@ -128,6 +132,9 @@
    "user_status_last_week": "innerhalb einer Woche gesehen",
    "user_status_last_month": "diesen Monat gesehen",
    "user_status_long_ago": "vor langer Zeit zuletzt gesehen",
+    "user_status_bot": "Bot",
+    "user_status_bot_noprivacy": "Zugriff auf Nachrichten",
+    "user_status_bot_privacy": "kein Zugriff auf Nachrichten",
    "chat_title_deleted": "GELÖSCHT",
    "format_size_progress_mulitple": "{done} von {total} {parts}",
    "format_size_progress": "{done} von {total}",
@ -244,7 +251,8 @@
    "message_service_kicked_user": "hat {user} entfernt",
    "message_service_left_group": "hat die Gruppe verlassen",
    "message_service_joined_by_link": "ist per Einladungslink der Gruppe beigetreten",
-    "message_service_unsupported_action": "Nicht unterstützte Aktion {action}",
+    "message_service_unsupported_action": "nicht unterstützte Aktion: {action}",
+    "message_service_bot_intro_header": "Was kann dieser Bot?",
    "error_modal_warning_title": "Warnung",
    "error_modal_bad_request_title": "Fehler",
    "error_modal_unauthorized_title": "Nicht autorisiert",
@ -352,6 +360,7 @@
    "im_delete": "Lösche {count}",
    "im_forward": "{count} weiterleiten",
    "im_reply": "Antworten",
+    "im_start": "Starten",
    "im_reply_loading": "Lade{dots}",
    "im_photos_drop_text": "Bilder hier reinschieben um sie zu verschicken",
    "im_message_field_placeholder": "Schreibe eine Nachricht...",
--- a/js/locales/en-us.json
+++ b/js/locales/en-us.json
@ -194,6 +194,7 @@
 	"confirm_modal_forward_to_peer": "Forward to {peer}?",
 	"confirm_modal_send_to_peer": "Send to {peer}?",
 	"confirm_modal_share_file_peer": "Share with {peer}?",
+	"confirm_modal_invite_peer": "Invite to {peer}?",
 	"confirm_modal_apply_lang_with_reload_md": "Reload the App to apply language?",
 	"confirm_modal_migrate_to_https_md": "Telegram Web now supports additional SSL encryption. Would you like to switch to HTTPS?\nThe HTTP version will be disabled soon.",
 	"confirm_modal_resize_desktop_md": "Would you like to switch to desktop version?",
--- a/js/locales/es-es.json
+++ b/js/locales/es-es.json
@ -103,8 +103,12 @@
    "user_modal_block_user": "Bloquear usuario",
    "user_modal_unblock_user": "Desbloquear usuario",
    "user_modal_delete_chat": "Eliminar chat",
+    "user_modal_add_to_group": "Add to group",
    "user_modal_info": "Información",
    "user_modal_phone": "Teléfono",
+    "user_modal_about": "About",
+    "user_modal_bot_settings": "Settings",
+    "user_modal_bot_help": "Help",
    "user_modal_username": "Alias",
    "user_modal_settings": "Ajustes",
    "user_modal_notifications": "Notificaciones",
@ -128,6 +132,9 @@
    "user_status_last_week": "última vez hace unos días",
    "user_status_last_month": "última vez hace unas semanas",
    "user_status_long_ago": "última vez hace mucho tiempo",
+    "user_status_bot": "bot",
+    "user_status_bot_noprivacy": "has access to messages",
+    "user_status_bot_privacy": "has no access to messages",
    "chat_title_deleted": "ELIMINADO",
    "format_size_progress_mulitple": "{done} de {total} {parts}",
    "format_size_progress": "{done} de {total}",
@ -244,7 +251,8 @@
    "message_service_kicked_user": "expulsó a {user}",
    "message_service_left_group": "dejó el grupo",
    "message_service_joined_by_link": "se unió al grupo con un enlace de invitación",
-    "message_service_unsupported_action": "Acción no soportada: {action}",
+    "message_service_unsupported_action": "unsupported action {action}",
+    "message_service_bot_intro_header": "What can this bot do?",
    "error_modal_warning_title": "Advertencia",
    "error_modal_bad_request_title": "Error",
    "error_modal_unauthorized_title": "No autorizado",
@ -352,6 +360,7 @@
    "im_delete": "Eliminar {count}",
    "im_forward": "Reenviar {count}",
    "im_reply": "Responder",
+    "im_start": "Start",
    "im_reply_loading": "Cargando{dots}",
    "im_photos_drop_text": "Suelta las fotos aquí para enviarlas",
    "im_message_field_placeholder": "Escribe un mensaje...",
--- a/js/locales/it-it.json
+++ b/js/locales/it-it.json
@ -103,8 +103,12 @@
    "user_modal_block_user": "Blocca utente",
    "user_modal_unblock_user": "Sblocca utente",
    "user_modal_delete_chat": "Elimina chat",
+    "user_modal_add_to_group": "Aggiungi a un gruppo",
    "user_modal_info": "Info",
    "user_modal_phone": "Telefono",
+    "user_modal_about": "Info",
+    "user_modal_bot_settings": "Impostazioni",
+    "user_modal_bot_help": "Aiuto",
    "user_modal_username": "Username",
    "user_modal_settings": "Impostazioni",
    "user_modal_notifications": "Notifiche",
@ -128,6 +132,9 @@
    "user_status_last_week": "ultimo accesso entro una settimana",
    "user_status_last_month": "ultimo accesso entro un mese",
    "user_status_long_ago": "ultimo accesso molto tempo fa",
+    "user_status_bot": "bot",
+    "user_status_bot_noprivacy": "ha accesso ai messaggi",
+    "user_status_bot_privacy": "non ha accesso ai messaggi",
    "chat_title_deleted": "ELIMINATO",
    "format_size_progress_mulitple": "{done} su {total} {parts}",
    "format_size_progress": "{done} su {total}",
@ -244,7 +251,8 @@
    "message_service_kicked_user": "ha rimosso {user}",
    "message_service_left_group": "ha lasciato il gruppo",
    "message_service_joined_by_link": "si è unito al gruppo tramite link di invito",
-    "message_service_unsupported_action": "Azione non supportata {action}",
+    "message_service_unsupported_action": "azione non supportata {action}",
+    "message_service_bot_intro_header": "Cosa può fare questo bot?",
    "error_modal_warning_title": "Attenzione",
    "error_modal_bad_request_title": "Errore",
    "error_modal_unauthorized_title": "Non autorizzato",
@ -352,6 +360,7 @@
    "im_delete": "Elimina {count}",
    "im_forward": "Inoltra {count}",
    "im_reply": "Rispondi",
+    "im_start": "Avvia",
    "im_reply_loading": "Caricamento{dots}",
    "im_photos_drop_text": "Rilascia le foto qui per inviarle",
    "im_message_field_placeholder": "Scrivi un messaggio..",
--- a/js/locales/nl-nl.json
+++ b/js/locales/nl-nl.json
@ -103,8 +103,12 @@
    "user_modal_block_user": "Blokkeer gebruiker",
    "user_modal_unblock_user": "Deblokkeer gebruiker",
    "user_modal_delete_chat": "Chat verwijderen",
+    "user_modal_add_to_group": "Add to group",
    "user_modal_info": "Info",
    "user_modal_phone": "Telefoon",
+    "user_modal_about": "About",
+    "user_modal_bot_settings": "Settings",
+    "user_modal_bot_help": "Help",
    "user_modal_username": "Gebruikersnaam",
    "user_modal_settings": "Instellingen",
    "user_modal_notifications": "Meldingen",
@ -128,6 +132,9 @@
    "user_status_last_week": "afgelopen week gezien",
    "user_status_last_month": "afgelopen maand gezien",
    "user_status_long_ago": "lang geleden gezien",
+    "user_status_bot": "bot",
+    "user_status_bot_noprivacy": "has access to messages",
+    "user_status_bot_privacy": "has no access to messages",
    "chat_title_deleted": "VERWIJDERD",
    "format_size_progress_mulitple": "{done} van {total} {parts}",
    "format_size_progress": "{done} van {total}",
@ -244,7 +251,8 @@
    "message_service_kicked_user": "{user} verwijderd",
    "message_service_left_group": "heeft de groep verlaten",
    "message_service_joined_by_link": "Neemt deel aan de groep via uitnodigingslink",
-    "message_service_unsupported_action": "Actie is niet ondersteund {action}",
+    "message_service_unsupported_action": "unsupported action {action}",
+    "message_service_bot_intro_header": "What can this bot do?",
    "error_modal_warning_title": "Waarschuwing",
    "error_modal_bad_request_title": "Fout",
    "error_modal_unauthorized_title": "Geen bevoegdheid",
@ -352,6 +360,7 @@
    "im_delete": "Verwijder {count}",
    "im_forward": "Doorsturen {count}",
    "im_reply": "Antwoord",
+    "im_start": "Start",
    "im_reply_loading": "Laden{dots}",
    "im_photos_drop_text": "Sleep foto's hierheen om te versturen.",
    "im_message_field_placeholder": "Bericht schrijven",
--- a/js/locales/pt-br.json
+++ b/js/locales/pt-br.json
@ -103,8 +103,12 @@
    "user_modal_block_user": "Bloquear usuário",
    "user_modal_unblock_user": "Desbloquear usuário",
    "user_modal_delete_chat": "Apagar conversa",
+    "user_modal_add_to_group": "Add to group",
    "user_modal_info": "Informação",
    "user_modal_phone": "Telefone",
+    "user_modal_about": "About",
+    "user_modal_bot_settings": "Settings",
+    "user_modal_bot_help": "Help",
    "user_modal_username": "Nome de usuário",
    "user_modal_settings": "Configurações",
    "user_modal_notifications": "Notificações",
@ -128,6 +132,9 @@
    "user_status_last_week": "visto na última semana",
    "user_status_last_month": "visto no último mês",
    "user_status_long_ago": "visto há muito tempo",
+    "user_status_bot": "bot",
+    "user_status_bot_noprivacy": "has access to messages",
+    "user_status_bot_privacy": "has no access to messages",
    "chat_title_deleted": "APAGADO",
    "format_size_progress_mulitple": "{done} de {total} {parts}",
    "format_size_progress": "{done} de {total}",
@ -244,7 +251,8 @@
    "message_service_kicked_user": "{user} removido",
    "message_service_left_group": "saiu do grupo",
    "message_service_joined_by_link": "entrou para o grupo via link de convite",
-    "message_service_unsupported_action": "Ação não suportada {action}",
+    "message_service_unsupported_action": "unsupported action {action}",
+    "message_service_bot_intro_header": "What can this bot do?",
    "error_modal_warning_title": "Advertência",
    "error_modal_bad_request_title": "Erro",
    "error_modal_unauthorized_title": "Não autorizado",
@ -352,6 +360,7 @@
    "im_delete": "Apagar {count}",
    "im_forward": "Encaminhar {count}",
    "im_reply": "Responder",
+    "im_start": "Start",
    "im_reply_loading": "Carregando{dots}",
    "im_photos_drop_text": "Solte as fotos aqui para enviar",
    "im_message_field_placeholder": "Escreva uma mensagem...",
--- a/js/locales/ru-ru.json
+++ b/js/locales/ru-ru.json
@ -79,9 +79,9 @@
    "sessions_modal_terminate_one": "Завершение",
    "sessions_modal_terminate_all": "Завершить все другие сеансы",
    "sessions_modal_active_sessions": "Активные сеансы",
-    "stickerset_modal_title_loading": "набор стикеров",
+    "stickerset_modal_title_loading": "Набор стикеров",
    "stickerset_modal_install": "Добавить стикеры",
-    "stickerset_modal_uninstall": "Удалить наклейки",
+    "stickerset_modal_uninstall": "Удалить стикеры",
    "stickerset_modal_loading": "Загрузка{dots}",
    "page_title_pluralize_notifications": "{'0': 'Нет уведомлений', 'one': 'Одно уведомление', 'other': 'Уведомлений: {}'}",
    "profile_edit_modal_title": "Редактировать профиль",
@ -103,8 +103,12 @@
    "user_modal_block_user": "Заблокировать пользователя",
    "user_modal_unblock_user": "Разблокировать пользователя",
    "user_modal_delete_chat": "Удалить чат",
+    "user_modal_add_to_group": "Добавить в группу",
    "user_modal_info": "Информация",
    "user_modal_phone": "Телефон",
+    "user_modal_about": "О пользователе",
+    "user_modal_bot_settings": "Настройки",
+    "user_modal_bot_help": "Помощь",
    "user_modal_username": "Имя пользователя",
    "user_modal_settings": "Настройки",
    "user_modal_notifications": "Уведомления",
@ -128,6 +132,9 @@
    "user_status_last_week": "был(а) в сети в течение недели",
    "user_status_last_month": "был(а) в сети в течение месяца",
    "user_status_long_ago": "был(а) в сети очень давно",
+    "user_status_bot": "бот",
+    "user_status_bot_noprivacy": "имеет доступ к сообщениям",
+    "user_status_bot_privacy": "не имеет доступа к сообщениям",
    "chat_title_deleted": "УДАЛЕНО",
    "format_size_progress_mulitple": "{done} из {total} {parts}",
    "format_size_progress": "{done} из {total}",
@ -244,7 +251,8 @@
    "message_service_kicked_user": "исключённый {user}",
    "message_service_left_group": "покинул(а) группу",
    "message_service_joined_by_link": "присоединился к группе по пригласительной ссылке",
-    "message_service_unsupported_action": "Неподдерживаемое действие: {action}",
+    "message_service_unsupported_action": "неподдерживаемое действие {action}",
+    "message_service_bot_intro_header": "Что этот бот может делать?",
    "error_modal_warning_title": "Внимание",
    "error_modal_bad_request_title": "Ошибка",
    "error_modal_unauthorized_title": "Необходима авторизация",
@ -352,6 +360,7 @@
    "im_delete": "Удалить {count}",
    "im_forward": "Переслать {count}",
    "im_reply": "Ответить",
+    "im_start": "Старт",
    "im_reply_loading": "Загрузка{dots}",
    "im_photos_drop_text": "Перетащите сюда фотографии, чтобы отправить их",
    "im_message_field_placeholder": "Напишите сообщение...",
--- a/webogram.appcache
+++ b/webogram.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Fri Jul 10 2015 19:42:39 GMT+0300 (MSK)
+# Time: Fri Jul 10 2015 21:03:45 GMT+0300 (MSK)


 CACHE: