merged with master

app.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Mon Dec 07 2015 22:27:07 GMT+0300 (MSK)
+# Time: Mon Jan 04 2016 23:04:09 GMT+0100 (CET)
 
 
 CACHE:
@@ -8,7 +8,6 @@ favicon_unread.ico
 css/app.css
 css/desktop.css
 css/mobile.css
-js/app.js
 img/Manytabs.png
 img/Manytabs_2x.png
 img/Telegram.png
@@ -25,18 +24,9 @@ img/iphone_home120.png
 img/iphone_startup.png
 img/logo_share.png
 img/sound_a.mp3
+js/app.js
 nacl/mtproto_crypto.nmf
 nacl/mtproto_crypto.pexe
-js/lib/bin_utils.js
-js/lib/crypto_worker.js
-js/lib/polyfill.js
-js/locales/de-de.json
-js/locales/en-us.json
-js/locales/es-es.json
-js/locales/it-it.json
-js/locales/nl-nl.json
-js/locales/pt-br.json
-js/locales/ru-ru.json
 img/changelog/card_wecandoit.png
 img/icons/AboutLogos.png
 img/icons/AboutLogos_2x.png
@@ -71,6 +61,16 @@ img/placeholders/UserAvatar7@2x.png
 img/placeholders/UserAvatar8@2x.png
 img/placeholders/VideoThumbConversation.gif
 img/placeholders/VideoThumbModal.gif
+js/lib/bin_utils.js
+js/lib/crypto_worker.js
+js/lib/polyfill.js
+js/locales/de-de.json
+js/locales/en-us.json
+js/locales/es-es.json
+js/locales/it-it.json
+js/locales/nl-nl.json
+js/locales/pt-br.json
+js/locales/ru-ru.json
 vendor/closure/long.js
 vendor/cryptoJS/crypto.js
 vendor/jsbn/jsbn_combined.js

css/app.css

@@ -1347,6 +1347,8 @@ a.im_dialog:hover .im_dialog_date,a.im_dialog_selected .im_dialog_date{color:#91
 .im_message_unread_split{background:#f0f4f7;color:#8096a8;text-align:center;padding:4px 10px;margin:10px 0}
 .im_message_author,.im_message_fwd_author{color:#3a6d99;font-weight:700}
 .non_osx .im_message_author,.non_osx .im_message_fwd_author{font-size:12px}
+.im_message_author_via{margin-left:5px}
+.im_message_fwd_via{margin-left:0}
 .im_message_contact_photo,.im_message_from_photo,.im_message_fwd_photo{width:42px;height:42px;border-radius:50%;overflow:hidden}
 .im_message_contact_photo .peer_initials,.im_message_from_photo .peer_initials,.im_message_fwd_photo .peer_initials{line-height:42px}
 a.im_message_contact_photo,a.im_message_from_photo{margin:0 15px 0 0}
@@ -1469,7 +1471,7 @@ div.im_message_author,div.im_message_body{display:block;overflow:hidden}
 a.im_message_fwd_photo{position:absolute;margin-top:1px}
 .im_message_fwd_date{padding:0}
 .im_message_text{word-wrap:break-word;line-height:150%}
-.im_message_photo_caption,.im_message_video_caption{clear:both;word-wrap:break-word;line-height:150%;margin-top:3px}
+.im_message_document_caption,.im_message_photo_caption,.im_message_video_caption{clear:both;word-wrap:break-word;line-height:150%;margin-top:3px}
 .im_message_mymention{background:#fff8cc}
 .reply_markup_wrap{margin:15px -2px 0}
 .reply_markup_row{padding:4px 0;line-height:0}
@@ -1565,7 +1567,7 @@ img.img_fullsize{margin:0 auto}
 .composer_emoji_tooltip_category_grid{background-position:-3px -297px}
 .active .composer_emoji_tooltip_category_grid{background-position:-3px -324px}
 .composer_emoji_tooltip_tabs_wrap{height:275px;position:relative;overflow:hidden}
-.composer_emoji_tooltip_tabs_contents{position:absolute;width:200%;-webkit-transform:translate3d(0,0,0);-moz-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);transition:transform ease-in-out .2s}
+.composer_emoji_tooltip_tabs_contents{position:absolute;width:568px;-webkit-transform:translate3d(0,0,0);-moz-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);transition:transform ease-in-out .2s}
 .composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tabs_contents{-webkit-transform:translate3d(-284px,0,0);-moz-transform:translate3d(-284px,0,0);-o-transform:translate3d(-284px,0,0);-ms-transform:translate3d(-284px,0,0);transform:translate3d(-284px,0,0)}
 .composer_emoji_tooltip_tab_emoji_content,.composer_emoji_tooltip_tab_stickers_content{width:284px;height:275px;float:left}
 .composer_emoji_tooltip_content_stickers{position:relative}

css/desktop.css

@@ -1520,14 +1520,18 @@ a.im_panel_peer_photo .peer_initials {
   margin-top: 4px;
   margin-bottom: 4px;
 }
+.im_grouped_short .im_message_author_via,
 .im_grouped_short .im_message_from_photo,
 .im_grouped_short .im_message_author,
+.im_grouped .im_message_author_via,
 .im_grouped .im_message_from_photo,
 .im_grouped .im_message_author,
-.im_grouped_fwd .im_message_author,
+.im_grouped_fwd .im_message_author_via,
 .im_grouped_fwd .im_message_from_photo,
-.im_grouped_fwd_short .im_message_author,
+.im_grouped_fwd .im_message_author,
-.im_grouped_fwd_short .im_message_from_photo {
+.im_grouped_fwd_short .im_message_author_via,
+.im_grouped_fwd_short .im_message_from_photo,
+.im_grouped_fwd_short .im_message_author {
   display: none;
 }
 .im_grouped_short .im_message_body,

css/mobile.css

@@ -683,24 +683,31 @@ a.im_message_from_photo {
   position: absolute;
   margin-left: -45px;
 }
-.im_message_author {
+.im_message_author,
+.im_message_author_via {
   display: none;
 }
-.im_history_messages_group a.im_message_author {
+.im_history_messages_group a.im_message_author,
+.im_history_messages_group .im_message_author_via {
   display: inline;
   font-size: 13px;
   font-weight: normal;
 }
 .im_grouped_short a.im_message_from_photo,
 .im_grouped_short a.im_message_author,
+.im_grouped_short a.im_message_author_via,
 .im_grouped a.im_message_from_photo,
 .im_grouped a.im_message_author,
-.im_grouped_fwd a.im_message_author,
+.im_grouped a.im_message_author_via,
 .im_grouped_fwd a.im_message_from_photo,
-.im_grouped_fwd_short a.im_message_author,
+.im_grouped_fwd a.im_message_author,
+.im_grouped_fwd a.im_message_author_via,
 .im_grouped_fwd_short a.im_message_from_photo,
-.im_message_out a.im_message_author,
+.im_grouped_fwd_short a.im_message_author,
+.im_grouped_fwd_short a.im_message_author_via,
 .im_message_out a.im_message_from_photo,
+.im_message_out a.im_message_author,
+.im_message_out a.im_message_author_via,
 .im_message_body_media a.im_message_author {
   display: none;
 }

index.html

@@ -1 +1 @@
-<!doctype html><html lang=en manifest=webogram.appcache ng-csp="" xmlns:ng=http://angularjs.org id=ng-app><head><meta charset=utf-8><meta name=viewport content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"><title>Telegram Web</title><link rel=stylesheet href=css/app.css><link rel=icon href=favicon.ico type=image/x-icon><link rel=apple-touch-icon href=img/iphone_home120.png><link rel=apple-touch-icon sizes=120x120 href=img/iphone_home120.png><link rel=apple-touch-startup-image media="(device-width: 320px)" href=img/iphone_startup.png><meta name=apple-mobile-web-app-title content="Telegram Web"><meta name=mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black-translucent><meta name=theme-color content=#497495><meta name=google content=notranslate><meta property=og:title content="Telegram Web"><meta property=og:url content="https://web.telegram.org/"><meta property=og:image content=https://web.telegram.org/img/logo_share.png><meta property=og:site_name content="Telegram Web"><meta property=og:description content="Welcome to the Web application of Telegram messenger. See https://github.com/zhukov/webogram for more info."></head><body><div class=page_wrap ng-view=""></div><div id=notify_sound></div><script src=js/app.js></script></body></html>
+<!doctype html><html lang=en manifest=webogram.appcache ng-csp xmlns:ng=http://angularjs.org id=ng-app><head><meta charset=utf-8><meta name=viewport content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"><title>Telegram Web</title><link rel=stylesheet href=css/app.css><link rel=icon href=favicon.ico type=image/x-icon><link rel=apple-touch-icon href=img/iphone_home120.png><link rel=apple-touch-icon sizes=120x120 href=img/iphone_home120.png><link rel=apple-touch-startup-image media="(device-width: 320px)" href=img/iphone_startup.png><meta name=apple-mobile-web-app-title content="Telegram Web"><meta name=mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black-translucent><meta name=theme-color content=#497495><meta name=google content=notranslate><meta property=og:title content="Telegram Web"><meta property=og:url content="https://web.telegram.org/"><meta property=og:image content=https://web.telegram.org/img/logo_share.png><meta property=og:site_name content="Telegram Web"><meta property=og:description content="Welcome to the Web application of Telegram messenger. See https://github.com/zhukov/webogram for more info."></head><body><div class=page_wrap ng-view></div><div id=notify_sound></div><script src=js/app.js></script></body></html>

js/locales/en-us.json

@@ -284,6 +284,7 @@
 	"conversation_media_video": "Video",
 	"conversation_media_document": "File",
 	"conversation_media_sticker": "Sticker",
+	"conversation_media_gif": "GIF",
 	"conversation_media_audio": "Audio",
 	"conversation_media_location": "Location",
 	"conversation_media_contact": "Contact",
@@ -521,7 +522,9 @@
 	"login_controller_unknown_country": "Unknown",
 
 	"message_forwarded_message": "Forwarded message",
+	"message_via_bot": "via {bot}",
 	"message_forwarded_message_mobile": "Forwarded from {from}, {date}",
+	"message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}, {date}",
 
 	"message_attach_audio_message": "Voice message",
 	"message_attach_audio_play": "Play",

js/locales/es-es.json

@@ -386,7 +386,7 @@
     "im_get_started": "Comienza",
     "im_welcome_text": "Te damos la bienvenida a Telegram Web. Puedes establecer tu foto de perfil y cambiar tu nombre en Ajustes.",
     "im_open_settings": "Abrir ajustes",
-    "im_select_a_chat": "Por favor, selecciona un chat para comenzar.",
+    "im_select_a_chat": "Selecciona un chat para comenzar.",
     "im_loading_history": "Cargando historial",
     "im_info": "Información",
     "im_edit": "Editar",

js/locales/it-it.json

@@ -3,7 +3,7 @@
     "modal_close": "Chiudi",
     "modal_edit": "Modifica",
     "modal_cancel": "Annulla",
-    "modal_more": "Più...",
+    "modal_more": "Altro...",
     "modal_next": "Avanti",
     "modal_ok": "OK",
     "modal_done": "Fatto",
@@ -15,14 +15,14 @@
     "group_modal_return": "Ritorna nel gruppo",
     "group_modal_update_photo": "Aggiorna foto",
     "group_modal_update_active": "Aggiorno",
-    "group_modal_menu_more": "Più",
+    "group_modal_menu_more": "Altro",
     "group_modal_menu_delete_photo": "Elimina foto",
     "group_modal_menu_edit_group": "Modifica gruppo",
     "group_modal_menu_leave": "Lascia",
     "group_modal_menu_delete_chat": "Elimina chat",
     "group_modal_settings": "Impostazioni",
     "group_modal_notifications": "Notifiche",
-    "group_modal_menu_share_link": "Invita nel gruppo tramite link",
+    "group_modal_menu_share_link": "Invita nel gruppo via link",
     "group_modal_migrate_to_supergroup": "Aggiorna a supergruppo",
     "group_modal_members": "Membri",
     "group_modal_members_kick": "Rimuovi",
@@ -43,7 +43,7 @@
     "channel_modal_delete_channel": "Elimina canale",
     "country_select_modal_title": "Nazione",
     "settings_modal_title": "Impostazioni",
-    "settings_modal_menu_more": "Più",
+    "settings_modal_menu_more": "Altro",
     "settings_modal_delete_photo": "Elimina foto profilo",
     "settings_modal_set_photo": "Imposta foto profilo",
     "settings_modal_photo_updating": "Caricamento",
@@ -95,7 +95,7 @@
     "sessions_modal_terminate_one": "Termina",
     "sessions_modal_terminate_all": "Termina tutte le altre sessioni",
     "sessions_modal_active_sessions": "Sessioni attive",
-    "stickerset_modal_title_loading": "Pacchetto di sticker",
+    "stickerset_modal_title_loading": "Set di sticker",
     "stickerset_modal_install": "Aggiungi sticker",
     "stickerset_modal_uninstall": "Rimuovi sticker",
     "stickerset_modal_share": "Condividi",
@@ -111,7 +111,7 @@
     "username_edit_description_md": "Puoi scegliere un username  su **Telegram**. Se lo fai, le altre persone potranno trovarti tramite questo username e contattarti senza conoscere il tuo numero di telefono.\n\nPuoi usare i caratteri a-z, 0-9 e l'underscore. La lunghezza minima è 5 caratteri.",
     "username_edit_submit": "Salva",
     "username_edit_submit_active": "Salvataggio...",
-    "user_modal_menu_more": "Più",
+    "user_modal_menu_more": "Altro",
     "user_modal_send_message": "Invia messaggio",
     "user_modal_edit_contact": "Modifica contatto",
     "user_modal_delete_contact": "Elimina contatto",
@@ -134,7 +134,7 @@
     "media_modal_photo_index": "Foto {pos} di {count}",
     "media_modal_video": "Video",
     "media_modal_forward": "Inoltra",
-    "media_modal_download": "Download",
+    "media_modal_download": "Scarica",
     "media_modal_delete": "Elimina",
     "error_browser_no_local_file_system_image_md": "Il tuo browser non supporta la funzionalità {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem} che è necessaria per visualizzare questa immagine.\nPer favore, installa {chrome-link: http://google.com/chrome | Google Chrome} o usa piuttosto {telegram-link: https://telegram.org/ | l'app mobile}.",
     "error_image_download_failed": "Download fallito",
@@ -287,7 +287,7 @@
     "message_service_returned_to_group": "è tornato nel gruppo",
     "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_joined_by_link": "si è unito al gruppo via link di invito",
     "message_service_unsupported_action": "azione non supportata {action}",
     "message_service_bot_intro_header": "Cosa può fare questo bot?",
     "message_service_converted_to_supergroup": "ha aggiornato il gruppo a supergruppo",
@@ -344,7 +344,7 @@
     "error_modal_user_not_mutual_contact": "L'utente può essere invitato solo da un suo contatto",
     "error_modal_invite_link_invalid": "Il link di invito non è valido",
     "error_modal_channel_not_accessible": "Spiacenti, questo canale non è accessibile.",
-    "error_modal_not_contact_flood": "Spiacenti, ma al momento puoi scrivere solo ai contatti in comune. {more-info-link: Più informazioni »}",
+    "error_modal_not_contact_flood": "Spiacenti, ma al momento puoi scrivere solo ai contatti in comune. {more-info-link: Maggiori informazioni »}",
     "head_telegram": "Telegram",
     "head_new_group": "Nuovo gruppo",
     "head_new_contact": "Nuovo contatto",
@@ -434,8 +434,8 @@
     "login_generating_key": "Generazione chiavi",
     "login_generating_keys_info": "Le chiavi vengono generate una volta soltanto. Questa operazione potrebbe impiegare alcuni minuti su dispositivi lenti, si prega di attendere.",
     "login_edit_number": "Modifica numero di telefono",
-    "login_enter_code_label_md": "Ti abbiamo inviato un codice tramite **Telegram** (non SMS).\nPer favore controlla i messaggi di Telegram e inserisci il codice qui sotto.",
+    "login_enter_code_label_md": "Ti abbiamo inviato un codice via **Telegram** (non SMS).\nPer favore controlla i messaggi di Telegram e inserisci il codice qui sotto.",
-    "login_code_not_received": "Invia codice tramite SMS",
+    "login_code_not_received": "Invia codice via SMS",
     "login_enter_sms_code_label_md": "Ti abbiamo inviato un codice via SMS.\nInseriscilo qui sotto.",
     "login_call_remaining": "Telegram ti chiamerà tra {remaining}",
     "login_calling": "Telegram ti sta chiamando",
@@ -476,10 +476,10 @@
     "message_attach_audio_message": "Nota vocale",
     "message_attach_audio_play": "Riproduci",
     "message_attach_document_open": "Apri",
-    "message_attach_document_download": "Download",
+    "message_attach_document_download": "Scarica",
     "message_attach_document_save": "Salva file",
     "message_attach_video_video": "Video",
-    "message_attach_video_download": "Download",
+    "message_attach_video_download": "Scarica",
     "message_attach_video_save": "Salva file",
     "message_attach_video_play": "Riproduci video",
     "conversation_select_modal_title": "Seleziona conversazioni",

js/locales/nl-nl.json

@@ -300,6 +300,7 @@
     "message_action_forward": "Doorsturen",
     "message_action_select": "Selecteren",
     "message_action_cancel": "Annuleren",
+    "message_action_retry": "Opnieuw proberen",
     "error_modal_warning_title": "Waarschuwing",
     "error_modal_bad_request_title": "Fout",
     "error_modal_unauthorized_title": "Geen bevoegdheid",

js/locales/pt-br.json

@@ -30,7 +30,7 @@
     "group_modal_migrate_desc": "Para ir além do limite e ter funcionalidades adicionais, atualize para um supergrupo:",
     "group_modal_migrate_item1": "Supergrupos podem ter até 1000 membros",
     "group_modal_migrate_item2": "• Novos membros veêm todo o histórico do chat",
-    "group_modal_migrate_item3": "Administradores deletam mensagens para todos",
+    "group_modal_migrate_item3": "Administradores apagam mensagens de todos",
     "group_modal_migrate_item4": "Notificações são silenciadas por padrão",
     "group_modal_delete_group": "Apagar grupo",
     "channel_modal_info": "Info do canal",

js/locales/ru-ru.json

@@ -172,9 +172,9 @@
     "group_edit_submit": "Сохранить",
     "group_edit_submit_active": "Сохранение...",
     "channel_edit_modal_title": "Edit channel",
-    "channel_edit_name": "Channel name",
+    "channel_edit_name": "Название канала",
     "channel_edit_about": "Channel description",
-    "channel_edit_submit": "Save",
+    "channel_edit_submit": "Сохранить",
     "channel_edit_submit_active": "Saving...",
     "group_invite_link_modal_title": "Пригласительная ссылка",
     "group_invite_link_link_label": "Скопировать ссылку",
@@ -300,6 +300,7 @@
     "message_action_forward": "Переслать",
     "message_action_select": "Выбрать",
     "message_action_cancel": "Отмена",
+    "message_action_retry": "Try again",
     "error_modal_warning_title": "Внимание",
     "error_modal_bad_request_title": "Ошибка",
     "error_modal_unauthorized_title": "Необходима авторизация",

webogram.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Mon Dec 07 2015 22:27:07 GMT+0300 (MSK)
+# Time: Mon Jan 04 2016 23:04:09 GMT+0100 (CET)
 
 
 CACHE:
@@ -8,7 +8,6 @@ favicon_unread.ico
 css/app.css
 css/desktop.css
 css/mobile.css
-js/app.js
 img/Manytabs.png
 img/Manytabs_2x.png
 img/Telegram.png
@@ -25,18 +24,9 @@ img/iphone_home120.png
 img/iphone_startup.png
 img/logo_share.png
 img/sound_a.mp3
+js/app.js
 nacl/mtproto_crypto.nmf
 nacl/mtproto_crypto.pexe
-js/lib/bin_utils.js
-js/lib/crypto_worker.js
-js/lib/polyfill.js
-js/locales/de-de.json
-js/locales/en-us.json
-js/locales/es-es.json
-js/locales/it-it.json
-js/locales/nl-nl.json
-js/locales/pt-br.json
-js/locales/ru-ru.json
 img/changelog/card_wecandoit.png
 img/icons/AboutLogos.png
 img/icons/AboutLogos_2x.png
@@ -71,6 +61,16 @@ img/placeholders/UserAvatar7@2x.png
 img/placeholders/UserAvatar8@2x.png
 img/placeholders/VideoThumbConversation.gif
 img/placeholders/VideoThumbModal.gif
+js/lib/bin_utils.js
+js/lib/crypto_worker.js
+js/lib/polyfill.js
+js/locales/de-de.json
+js/locales/en-us.json
+js/locales/es-es.json
+js/locales/it-it.json
+js/locales/nl-nl.json
+js/locales/pt-br.json
+js/locales/ru-ru.json
 vendor/closure/long.js
 vendor/cryptoJS/crypto.js
 vendor/jsbn/jsbn_combined.js