merged with master

10 years ago · 6df1424f87
20 changed files with 197 additions and 63 deletions
--- a/.swp
+++ b/.swp
--- a/app.manifest
+++ b/app.manifest
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Tue Feb 24 2015 21:11:13 GMT+0300 (MSK)
+# Time: Thu Mar 19 2015 02:56:13 GMT+0300 (MSK)


 CACHE:
@ -72,10 +72,10 @@ 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
-vendor/leemon_bigint/bigint.js
+vendor/cryptoJS/crypto.js
 vendor/rusha/rusha.js
+vendor/leemon_bigint/bigint.js
 vendor/angular/i18n/angular-locale_de-de.js
 vendor/angular/i18n/angular-locale_en-us.js
 vendor/angular/i18n/angular-locale_es-es.js
--- a/css/app.css
+++ b/css/app.css
@ -1419,6 +1419,19 @@ img.im_message_document_thumb{max-width:100px;max-height:100px;vertical-align:mi
 .im_message_date,.im_message_fwd_date{color:#adadad;font-size:.85em;padding:0 0 20px 10px}
 div.im_message_author,div.im_message_body{display:block;overflow:hidden}
 .im_message_body,.im_message_meta{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}
+.im_message_reply_wrap{display:block;color:inherit;text-decoration:none;margin-bottom:5px;margin-top:2px;overflow:hidden}
+.im_message_reply_wrap:hover{text-decoration:none;color:inherit}
+.im_message_reply_border{background:#7eaad1;height:33px;width:2px;position:absolute;margin-left:-12px}
+.im_message_reply{padding-left:12px}
+.im_message_reply_thumb_wrap{display:block;float:left;width:42px;height:42px;text-align:center;position:absolute}
+.im_message_reply_author{font-weight:700;color:#3a6d99;line-height:16px;margin-bottom:3px}
+.im_message_reply_loading{padding:7px 0 8px}
+.im_reply_message_media,.im_reply_message_service{color:#999}
+.im_message_reply_body{line-height:16px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;margin-bottom:1px}
+.im_message_reply_thumbed .im_message_reply_border,.im_message_reply_thumbed .im_message_reply_wrap{height:42px}
+.im_message_reply_thumbed .im_message_reply_author{margin-top:4px}
+.im_message_reply_thumbed .im_message_reply_author,.im_message_reply_thumbed .im_message_reply_body{margin-left:52px}
+.im_message_reply_wrap .im_message_reply_thumbed{margin-bottom:4px}
 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%}
@ -1448,12 +1461,12 @@ img.img_fullsize{margin:0 auto}
 .non_osx .media_modal_author{font-size:12px}
 .composer_emoji_insert_btn{display:block;position:absolute;right:3px;top:2px;cursor:pointer;padding:0;width:22px;height:22px;margin-top:1px}
 .icon-emoji{display:inline-block;width:22px;height:22px;vertical-align:top;background:url(../img/icons/General.png) -9px -335px no-repeat;background-size:40px 778px;opacity:.8}
-.composer_emoji_tooltip{display:none;position:absolute;z-index:999;width:220px;margin-left:-100px;margin-top:-248px;border:1px solid #dfdfdf;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.1);-moz-box-shadow:0 1px 1px rgba(0,0,0,.1);box-shadow:0 1px 1px rgba(0,0,0,.1);background:#FFF;padding:5px 2px 5px 5px}
+.composer_emoji_tooltip{display:none;position:absolute;z-index:999;width:254px;margin-left:-116px;margin-top:-245px;border:1px solid #dfdfdf;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.1);-moz-box-shadow:0 1px 1px rgba(0,0,0,.1);box-shadow:0 1px 1px rgba(0,0,0,.1);background:#FFF;padding:5px 2px 5px 8px}
 .composer_emoji_tooltip_shown{display:block}
 .composer_emoji_tooltip_tail{position:absolute;bottom:-14px;left:50%;margin-left:-13px;overflow:hidden;width:26px;height:14px}
 .icon-tooltip-tail{background:#FFF;width:18px;height:18px;-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg);display:inline-block;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.1);-moz-box-shadow:1px 1px 1px rgba(0,0,0,.1);box-shadow:1px 1px 1px rgba(0,0,0,.1);border:1px solid #dfdfdf;border-width:0 1px 1px 0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;position:relative;top:-8px;left:4px}
-.composer_emoji_tooltip_tabs{width:100%;margin-bottom:8px;margin-top:3px}
-.composer_emoji_tooltip_tab{line-height:0;color:#fff;display:inline-block;width:24px;height:29px;background:url(../img/icons/IconsetSmiles.png) no-repeat;background-size:42px 470px;cursor:pointer;opacity:.7;margin:0 3px}
+.composer_emoji_tooltip_tabs{width:100%;margin:5px 0 2px}
+.composer_emoji_tooltip_tab{line-height:0;color:#fff;display:inline-block;width:24px;height:29px;background:url(../img/icons/IconsetSmiles.png) no-repeat;background-size:42px 470px;cursor:pointer;opacity:.7;margin:0 5px 0 4px}
 .is_1x .composer_emoji_tooltip_tab{background-image:url(../img/icons/IconsetSmiles_1x.png)}
 .composer_emoji_tooltip_tab.active{opacity:1}
 .composer_emoji_tooltip_tab_recent{background-position:-9px -306px}
@ -1472,7 +1485,7 @@ img.img_fullsize{margin:0 auto}
 .composer_emoji_tooltip_tab_stickers.active{background-position:-9px -333px}
 .nano.composer_emoji_tooltip_content_wrap{height:174px;position:relative}
 .composer_emoji_tooltip_content{padding-right:8px;outline:0!important}
-a.composer_emoji_btn{margin:-1px 0 0 -1px;padding:5px;display:block;float:left;border-radius:2px}
+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}
 .emoji{-moz-box-orient:vertical;display:inline-block;vertical-align:baseline;height:18px;width:18px;background-repeat:no-repeat;text-indent:-9999px;border:0}
 .emoji-spritesheet-0{background-size:486px 126px;background-image:url(../img/emojisprite_0.png)}
@ -1492,13 +1505,20 @@ a.composer_emoji_btn:hover{background-color:#edf2f5}
 .emoji-w26.emoji-spritesheet-2{background-size:858px 182px}
 .emoji-w26.emoji-spritesheet-3{background-size:884px 78px}
 .emoji-w26.emoji-spritesheet-4{background-size:884px 182px}
-.composer_dropdown{display:none;border-radius:2px;padding:6px 0;border:1px solid rgba(15,60,96,.2);-webkit-box-shadow:0 1px 3px 0 rgba(60,75,87,.27);-moz-box-shadow:0 1px 3px 0 rgba(60,75,87,.27);box-shadow:0 1px 3px 0 rgba(60,75,87,.27)}
+.composer_dropdown{display:none;padding:6px 0;border:0;-webkit-box-shadow:0 1px 1px 0 rgba(60,75,87,.27);-moz-box-shadow:0 1px 1px 0 rgba(60,75,87,.27);box-shadow:0 1px 1px 0 rgba(60,75,87,.27);border-radius:0;margin-top:-5px}
 .composer_dropdown>li>a{display:block;font-size:13px;line-height:15px;padding:4px 10px;color:#52719a}
-.composer_dropdown li a.composer_emoji_option_active,.composer_dropdown li a:hover{color:#52719a;background:#f2f6fa}
+.composer_dropdown li a.composer_autocomplete_option_active,.composer_dropdown li a:hover{color:#52719a;background:#f2f6fa}
 .composer_emoji_shortcut{display:inline-block;vertical-align:top;margin-left:15px;line-height:20px}
-.composer_sticker_btn{width:67px;height:67px;display:block;display:inline-block;text-align:center;padding:3px}
+.composer_mention_option{line-height:20px}
+.composer_user_mention{color:grey;margin-left:7px}
+.composer_dropdown li a.composer_autocomplete_option_active .composer_user_mention,.composer_dropdown li a:hover .composer_user_mention{color:#698192}
+span.composer_user_photo{display:inline-block;width:32px;height:32px;border-radius:50%;overflow:hidden;margin-right:10px;vertical-align:top}
+img.composer_user_photo{width:32px;height:32px}
+span.composer_user_photo .peer_initials{line-height:32px;font-size:14px}
+.composer_user_mention,.composer_user_name{display:inline-block;line-height:32px;vertical-align:top}
+.composer_sticker_btn{width:78px;height:78px;display:block;display:inline-block;text-align:center;padding:3px}
 .composer_sticker_btn:hover{background:#f2f6fa}
-.composer_sticker_image{max-width:64px;max-height:64px}
+.composer_sticker_image{max-width:72px;max-height:72px}
 .composer_rich_textarea{box-sizing:content-box;-moz-box-sizing:content-box;font-size:12px;margin-bottom:10px;padding:6px;min-height:38px;height:auto;width:auto;max-height:284px;overflow:auto;line-height:17px;border:1px solid #d2dbe3;border-radius:2px;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;word-wrap:break-word;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}
 .composer_rich_textarea:empty:before{content:attr(placeholder);color:#9aa2ab}
 .composer_rich_textarea:active:before,.composer_rich_textarea:focus:before{content:none}
@ -1552,8 +1572,6 @@ img.chat_modal_participant_photo{width:40px;height:40px}
 .contacts_modal_members_list .disabled{pointer-events:none}
 .contacts_modal_members_list .disabled .icon-contact-tick{display:none}
 .confirm_modal_window .modal-dialog,.error_modal_window .modal-dialog,.md_simple_modal_window .modal-dialog{max-width:348px}
-.im_edit_selected_actions{text-align:center}
-.im_edit_delete_btn,.im_edit_forward_btn{border-radius:2px;padding:7px 17px;font-weight:400;font-size:12px;line-height:18px;margin:6px}
 .im_edit_panel_title{text-align:center;margin:0;font-size:14px;line-height:34px}
 .im_message_focus .audio_player_duration,.im_message_focus .audio_player_size,.im_message_focus .im_message_date,.im_message_focus .im_message_document_size,.im_message_focus .im_message_fwd_date{color:#899daf}
 .user_color_1,.user_color_1:hover{color:#8365ab}
--- a/css/desktop.css
+++ b/css/desktop.css
@ -96,10 +96,13 @@
  -ms-transform: translateY(-1px);
  -o-transform: translateY(-1px);
  transform: translateY(-1px);
-
 }
 .tg_head_logo_dropdown:not(.open) .dropdown-toggle:hover .icon-bar:nth-child(3) {
  -webkit-transform: translateY(1px);
+  -moz-transform: translateY(1px);
+  -ms-transform: translateY(1px);
+  -o-transform: translateY(1px);
+  transform: translateY(1px);
 }

 .tg_head_logo_dropdown.open .icon-bar:nth-child(1) {
@ -407,7 +410,9 @@
  visibility : visible\9; /* Target only IE7 and IE8 with this hack */
  opacity    : 0.99;
 }
-
+.composer_emoji_tooltip {
+  z-index: 1001;
+}
 .composer_emoji_tooltip .nano > .nano-pane {
  background : rgba(255,255,255,0.0);
  right: -2px;
@ -677,6 +682,17 @@ a.footer_link.active:active {
  opacity: 1;
 }

+/* Messages edit panel */
+.im_edit_delete_btn,
+.im_edit_forward_btn,
+.im_edit_reply_btn {
+  border-radius: 2px;
+  padding: 7px 17px;
+  font-weight: normal;
+  font-size: 12px;
+  line-height: 18px;
+  margin: 6px 0 6px 14px;
+}
 .im_edit_panel_wrap {
  padding: 0px 0 38px;
  margin: 0 24px 0 12px;
@ -686,7 +702,6 @@ a.footer_link.active:active {
  margin: 0 0 47px 3px;
  border-bottom: 1px solid #EEE;
 }
-.im_edit_flush_link,
 .im_edit_cancel_link {
  display: block;
  padding: 7px 17px;
@ -695,14 +710,15 @@ a.footer_link.active:active {
  margin: 6px 6px;
 }
 .im_edit_cancel_link {
-  float: left;
-}
-.im_edit_flush_link {
  float: right;
 }
 .im_edit_selected_actions {
+  text-align: left;
  text-transform: uppercase;
 }
+.im_selected_count {
+  color: #b9cfe3;
+}

 .im_submit {
  color: #499dd9;
@ -729,11 +745,12 @@ a.footer_link.active:active {
  overflow: hidden;
  max-width: 210px;
 }
-.composer_emoji_panel a {
+.composer_emoji_panel a.composer_emoji_btn {
  display: inline-block;
  padding: 5px;
  outline: 0;
  border-radius: 2px;
+  margin: -1px 0 2px -1px;
 }
 /*.composer_emoji_panel a:hover {
  background-color: #edf2f5;
@ -875,6 +892,7 @@ a.footer_link.active:active {
  }
 }

+
 .im_message_fwd_author_wrap {
  margin: 1px 0 4px;
  display: inline-block;
@ -986,6 +1004,7 @@ a.im_panel_peer_photo .peer_initials {

 .im_send_field_wrap {
  margin-bottom: 15px;
+  position: relative;
 }
 .composer_rich_textarea,
 .composer_textarea {
@ -1076,6 +1095,49 @@ a.im_panel_peer_photo .peer_initials {
  opacity: 1;
 }

+.im_send_reply_wrap {
+  margin-bottom: 5px;
+}
+.im_send_reply_form_wrap a.im_panel_own_photo,
+.im_send_reply_form_wrap a.im_panel_peer_photo {
+  margin-top: 47px;
+}
+.im_send_reply_cancel {
+  float: right;
+  display: block;
+  width: 18px;
+  height: 18px;
+  margin-right: 6px;
+  margin-top: 5px;
+  -webkit-transform: translate3d(0,0,0);
+  padding-top: 7px;
+}
+.im_send_reply_cancel .icon-reply-bar {
+  display: block;
+  background: #999;
+  width: 18px;
+  height: 2px;
+  transform-origin: 50% 50%;
+}
+.im_send_reply_cancel:hover .icon-reply-bar {
+  background: #44a1e8;
+}
+.icon-reply-bar:first-child {
+  -webkit-transform: rotate(-45deg);
+  -moz-transform: rotate(-45deg);
+  -ms-transform: rotate(-45deg);
+  -o-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+  transform-origin: 50% 50%;
+}
+.icon-reply-bar:last-child {
+  -webkit-transform: translate3d(0,-2px,0) rotate(45deg);
+  -moz-transform: translate3d(0,-2px,0) rotate(45deg);
+  -ms-transform: translate3d(0,-2px,0) rotate(45deg);
+  -o-transform: translate3d(0,-2px,0) rotate(45deg);
+  transform: translate3d(0,-2px,0) rotate(45deg);
+}
+
 /* Peer modals */
 .user_modal_window .modal-dialog {
  max-width: 480px;
@ -1496,7 +1558,6 @@ a.im_panel_peer_photo .peer_initials {
 .im_dialog_photo {
  width: 48px;
  height: 48px;
-  line-height: 48px;
  border-radius: 50%;
  overflow: hidden;
 }
--- a/css/mobile.css
+++ b/css/mobile.css
@ -412,6 +412,9 @@ html {
 .im_message_selected {
  background: #e1e9f0;
 }
+.im_message_focus .im_message_outer_wrap {
+  background: rgba(225, 233, 240, 0.35);
+}


 .im_message_body {
@ -608,6 +611,14 @@ img.im_message_video_thumb,
  margin-top: 0;
 }

+
+.im_message_reply_wrap {
+  margin-top: 2px;
+}
+.im_message_reply_author {
+  font-weight: normal;
+  font-size: 13px;
+}
 .im_message_fwd_header {
  font-size: 12px;
 }
@ -624,7 +635,6 @@ img.im_message_video_thumb,
 }
 .im_message_date {
  font-size: 10px;
-  /*font-size: 12px;*/
  padding: 0;
 }
 .im_message_out .im_message_meta {
@ -736,8 +746,14 @@ a.im_message_from_photo {
 .contacts_modal_search_field {
  font-size: 1.2em;
 }
+.im_edit_selected_actions {
+  text-align: center;
+}
 .im_edit_delete_btn,
 .im_edit_forward_btn {
+  border-radius: 2px;
+  font-weight: normal;
+  line-height: 18px;
  background: none !important;
  border: 0 !important;
  width: 50%;
@ -1169,6 +1185,7 @@ a.mobile_modal_action .tg_checkbox_label {
  margin-top: -170px;
  width: 262px;
  z-index: 10000;
+  padding: 5px 2px 5px 5px;
 }
 .composer_emoji_tooltip .composer_emoji_tooltip_content_wrap {
  height: 106px;
@ -1178,6 +1195,7 @@ a.mobile_modal_action .tg_checkbox_label {
 }
 .composer_emoji_tooltip .composer_emoji_tooltip_content .composer_emoji_btn {
  padding: 5px;
+  margin: -1px 0 0 -1px;
 }
 .icon-tooltip-tail {
  display: none;
--- a/js/app.js
+++ b/js/app.js
--- a/js/background.js
+++ b/js/background.js
@ -1,5 +1,5 @@
 /*!
- * Webogram v0.4.0 - messaging web application for MTProto
+ * Webogram v0.4.1 - messaging web application for MTProto
 * https://github.com/zhukov/webogram
 * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
 * https://github.com/zhukov/webogram/blob/master/LICENSE
--- a/js/lib/bin_utils.js
+++ b/js/lib/bin_utils.js
@ -1,5 +1,5 @@
 /*!
- * Webogram v0.4.0 - messaging web application for MTProto
+ * Webogram v0.4.1 - messaging web application for MTProto
 * https://github.com/zhukov/webogram
 * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
 * https://github.com/zhukov/webogram/blob/master/LICENSE
--- a/js/lib/crypto_worker.js
+++ b/js/lib/crypto_worker.js
@ -1,5 +1,5 @@
 /*!
- * Webogram v0.4.0 - messaging web application for MTProto
+ * Webogram v0.4.1 - messaging web application for MTProto
 * https://github.com/zhukov/webogram
 * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
 * https://github.com/zhukov/webogram/blob/master/LICENSE
--- a/js/lib/polyfill.js
+++ b/js/lib/polyfill.js
@ -1,19 +1,23 @@
 // Console-polyfill. MIT license.
 // https://github.com/paulmillr/console-polyfill
 // Make it safe to do console.log() always.
-(function (con) {
+(function(global) {
  'use strict';
+  global.console = global.console || {};
+  var con = global.console;
  var prop, method;
  var empty = {};
  var dummy = function() {};
  var properties = 'memory'.split(',');
-  var methods = ('assert,count,debug,dir,dirxml,error,exception,group,' +
-     'groupCollapsed,groupEnd,info,log,markTimeline,profile,profileEnd,' +
-     'time,timeEnd,trace,warn').split(',');
-  while (prop = properties.pop()) con[prop] = con[prop] || empty;
-  while (method = methods.pop()) con[method] = con[method] || dummy;
-})(this.console = this.console || {});
-
+  var methods = ('assert,clear,count,debug,dir,dirxml,error,exception,group,' +
+     'groupCollapsed,groupEnd,info,log,markTimeline,profile,profiles,profileEnd,' +
+     'show,table,time,timeEnd,timeline,timelineEnd,timeStamp,trace,warn').split(',');
+  while (prop = properties.pop()) if (!con[prop]) con[prop] = empty;
+  while (method = methods.pop()) if (!con[method]) con[method] = dummy;
+})(typeof window === 'undefined' ? this : window);
+// Using `this` for web workers while maintaining compatibility with browser
+// targeted script loaders such as Browserify or Webpack where the only way to
+// get to the global object is via `window`.

 /* Array.indexOf polyfill */
 if (!Array.prototype.indexOf) {
@ -77,11 +81,11 @@ if (typeof Object.create != 'function') {
 if (!Function.prototype.bind) {
  Function.prototype.bind = function (oThis) {
    if (typeof this !== "function") {
-      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); 
+      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
    }

-    var aArgs = Array.prototype.slice.call(arguments, 1), 
-        fToBind = this, 
+    var aArgs = Array.prototype.slice.call(arguments, 1),
+        fToBind = this,
        fNOP = function () {},
        fBound = function () {
          return fToBind.apply(this instanceof fNOP && oThis
--- a/js/locales/de-de.json
+++ b/js/locales/de-de.json
@ -40,10 +40,12 @@
    "settings_modal_sounds": "Töne",
    "settings_modal_language": "Sprache",
    "settings_modal_notifications": "Desktopbenachrichtigungen",
+    "settings_modal_message_preview": "Nachrichtenvorschau",
    "settings_modal_sound": "Ton",
    "settings_modal_enter_send_description_md": "**Enter** - Nachricht senden, **Shift + Enter** - Zeilenumbruch",
    "settings_modal_ctrl_enter_send_description_md": "**Strg + Enter** - Nachricht senden, **Enter** - Zeilenumbruch",
    "settings_modal_send_on_enter": "Senden mit Enter",
+    "settings_switch_back_to_desktop": "Zurück zum Desktop-Layout",
    "settings_modal_about": "Info",
    "settings_modal_source_code_github": "Quelltext bei GitHub",
    "settings_modal_follow_us_twitter": "Folge uns auf Twitter!",
@ -183,6 +185,7 @@
    "conversation_kicked_user": "hat {user} entfernt",
    "conversation_invited_user_message": "hat Benutzer eingeladen",
    "conversation_kicked_user_message": "hat Benutzer entfernt",
+    "conversation_message_sent": "hat dir eine Nachricht gesendet",
    "conversation_unknown_user": "Jemand",
    "conversation_unknown_chat": "Unbekannte Unterhaltung",
    "message_service_created_group": "hat die Gruppe {group-name} erstellt",
@ -290,6 +293,8 @@
    "im_clear_history": "Verlauf löschen",
    "im_delete": "Lösche {count}",
    "im_forward": "{count} weiterleiten",
+    "im_reply": "Antworten",
+    "im_reply_loading": "Lade{dots}",
    "im_photos_drop_text": "Bilder hier reinschieben um sie zu verschicken",
    "im_message_field_placeholder": "Schreibe eine Nachricht...",
    "im_media_attach_title": "Medien senden",
--- a/js/locales/en-us.json
+++ b/js/locales/en-us.json
@ -48,6 +48,7 @@
 	"settings_modal_enter_send_description_md": "**Enter** - send message, **Shift + Enter** - new line",
 	"settings_modal_ctrl_enter_send_description_md": "**Ctrl + Enter** - send message, **Enter** - new line",
 	"settings_modal_send_on_enter": "Send on Enter",
+	"settings_switch_back_to_desktop": "Switch back to Desktop layout",
 	"settings_modal_about": "About",
 	"settings_modal_source_code_github": "Source code on GitHub",
 	"settings_modal_follow_us_twitter": "Follow us on Twitter!",
@ -325,6 +326,8 @@
 	"im_clear_history": "Clear History",
 	"im_delete": "Delete {count}",
 	"im_forward": "Forward {count}",
+	"im_reply": "Reply",
+	"im_reply_loading": "Loading{dots}",
 	"im_photos_drop_text": "Drop photos here to send",
 	"im_message_field_placeholder": "Write a message...",
 	"im_media_attach_title": "Send media",
--- a/js/locales/es-es.json
+++ b/js/locales/es-es.json
@ -40,10 +40,12 @@
    "settings_modal_sounds": "Sonidos",
    "settings_modal_language": "Idioma",
    "settings_modal_notifications": "Notificaciones de escritorio",
+    "settings_modal_message_preview": "Vista previa del mensaje",
    "settings_modal_sound": "Sonido",
    "settings_modal_enter_send_description_md": "**Intro** - enviar mensaje, **Shift + Intro** - nueva línea",
    "settings_modal_ctrl_enter_send_description_md": "**Ctrl + Intro** - enviar mensaje, **Intro** - nueva línea",
    "settings_modal_send_on_enter": "Enviar con Intro",
+    "settings_switch_back_to_desktop": "Volver a la vista de escritorio",
    "settings_modal_about": "Acerca de",
    "settings_modal_source_code_github": "Código fuente en GitHub",
    "settings_modal_follow_us_twitter": "¡Síguenos en Twitter!",
@ -183,6 +185,7 @@
    "conversation_kicked_user": "expulsó a {user}",
    "conversation_invited_user_message": "invitó a un usuario",
    "conversation_kicked_user_message": "expulsó a un usuario",
+    "conversation_message_sent": "te envió un mensaje",
    "conversation_unknown_user": "Alguien",
    "conversation_unknown_chat": "Chat desconocido",
    "message_service_created_group": "creó el grupo {group-name}",
@ -290,6 +293,8 @@
    "im_clear_history": "Borrar historial",
    "im_delete": "Eliminar {count}",
    "im_forward": "Reenviar {count}",
+    "im_reply": "Responder",
+    "im_reply_loading": "Cargando{dots}",
    "im_photos_drop_text": "Suelta las fotos aquí para enviarlas",
    "im_message_field_placeholder": "Escribe un mensaje...",
    "im_media_attach_title": "Enviar multimedia",
--- a/js/locales/it-it.json
+++ b/js/locales/it-it.json
@ -40,10 +40,12 @@
    "settings_modal_sounds": "Suoni",
    "settings_modal_language": "Lingua",
    "settings_modal_notifications": "Notifiche desktop",
+    "settings_modal_message_preview": "Anteprima messaggio",
    "settings_modal_sound": "Suono",
    "settings_modal_enter_send_description_md": "**Invio** - invia messaggio, **Shift + Invio** - a capo",
    "settings_modal_ctrl_enter_send_description_md": "**Ctrl + Invio** - invia messaggio, **Invio** - a capo",
    "settings_modal_send_on_enter": "Spedisci con Invio",
+    "settings_switch_back_to_desktop": "Torna al layout desktop",
    "settings_modal_about": "Info",
    "settings_modal_source_code_github": "Codice sorgente su GitHub",
    "settings_modal_follow_us_twitter": "Seguici su Twitter!",
@ -183,6 +185,7 @@
    "conversation_kicked_user": "ha espulso {user}",
    "conversation_invited_user_message": "ha aggiunto un membro",
    "conversation_kicked_user_message": "ha espulso un membro",
+    "conversation_message_sent": "ti ha inviato un messaggio",
    "conversation_unknown_user": "Qualcuno",
    "conversation_unknown_chat": "Chat sconosciuta",
    "message_service_created_group": "ha creato il gruppo {group-name}",
@ -290,6 +293,8 @@
    "im_clear_history": "Elimina cronologia",
    "im_delete": "Elimina {count}",
    "im_forward": "Inoltra {count}",
+    "im_reply": "Rispondi",
+    "im_reply_loading": "Caricamento{dots}",
    "im_photos_drop_text": "Rilascia le foto qui per inviarle",
    "im_message_field_placeholder": "Scrivi un messaggio..",
    "im_media_attach_title": "Invia media",
--- a/js/locales/nl-nl.json
+++ b/js/locales/nl-nl.json
@ -40,10 +40,12 @@
    "settings_modal_sounds": "Geluiden",
    "settings_modal_language": "Taal",
    "settings_modal_notifications": "Desktopmeldingen",
+    "settings_modal_message_preview": "Voorvertoning",
    "settings_modal_sound": "Geluid",
    "settings_modal_enter_send_description_md": "**Enter** - bericht versturen, **Shift + Enter** - nieuwe regel",
    "settings_modal_ctrl_enter_send_description_md": "**Ctrl + Enter** - bericht versturen. **Enter** - nieuwe regel",
    "settings_modal_send_on_enter": "Versturen met Enter",
+    "settings_switch_back_to_desktop": "Terugschakelen naar desktopversie",
    "settings_modal_about": "Over",
    "settings_modal_source_code_github": "Broncode op GitHub",
    "settings_modal_follow_us_twitter": "Volg ons op Twitter!",
@ -183,6 +185,7 @@
    "conversation_kicked_user": "{user} verwijderd",
    "conversation_invited_user_message": "gebruiker uitgenodigd",
    "conversation_kicked_user_message": "gebruiker verwijderd",
+    "conversation_message_sent": "heeft je een bericht gestuurd",
    "conversation_unknown_user": "Iemand",
    "conversation_unknown_chat": "Onbekende chat",
    "message_service_created_group": "de groep: {group-name} is aangemaakt",
@ -290,6 +293,8 @@
    "im_clear_history": "Geschiedenis wissen",
    "im_delete": "Verwijder {count}",
    "im_forward": "Doorsturen {count}",
+    "im_reply": "Antwoord",
+    "im_reply_loading": "Laden{dots}",
    "im_photos_drop_text": "Sleep foto's hierheen om te versturen.",
    "im_message_field_placeholder": "Bericht schrijven",
    "im_media_attach_title": "Media versturen",
--- a/js/locales/pt-br.json
+++ b/js/locales/pt-br.json
@ -40,10 +40,12 @@
    "settings_modal_sounds": "Sons",
    "settings_modal_language": "Idioma",
    "settings_modal_notifications": "Notificações na área de trabalho",
+    "settings_modal_message_preview": "Visualização de Mensagem",
    "settings_modal_sound": "Som",
    "settings_modal_enter_send_description_md": "**Enter** - enviar mensagem, **Shift + Enter** - nova linha",
    "settings_modal_ctrl_enter_send_description_md": "**Ctrl + Enter** - enviar mensagem, **Enter** - nova linha",
    "settings_modal_send_on_enter": "Enviar com Enter",
+    "settings_switch_back_to_desktop": "Voltar para o layout Desktop",
    "settings_modal_about": "Sobre",
    "settings_modal_source_code_github": "Código-fonte no GitHub",
    "settings_modal_follow_us_twitter": "Siga-nos no Twitter!",
@ -183,6 +185,7 @@
    "conversation_kicked_user": "{user} removido",
    "conversation_invited_user_message": "usuário convidado",
    "conversation_kicked_user_message": "usuário removido",
+    "conversation_message_sent": "te enviou uma mensagem",
    "conversation_unknown_user": "Alguém",
    "conversation_unknown_chat": "Chat desconhecido",
    "message_service_created_group": "criou o grupo {group-name}",
@ -290,6 +293,8 @@
    "im_clear_history": "Limpar Histórico",
    "im_delete": "Apagar {count}",
    "im_forward": "Encaminhar {count}",
+    "im_reply": "Responder",
+    "im_reply_loading": "Carregando{dots}",
    "im_photos_drop_text": "Solte as fotos aqui para enviar",
    "im_message_field_placeholder": "Escreva uma mensagem...",
    "im_media_attach_title": "Enviar mídia",
--- a/js/locales/ru-ru.json
+++ b/js/locales/ru-ru.json
@ -40,10 +40,12 @@
    "settings_modal_sounds": "Звук",
    "settings_modal_language": "Язык",
    "settings_modal_notifications": "Всплывающие уведомления",
+    "settings_modal_message_preview": "Message Preview",
    "settings_modal_sound": "Звуковые оповещения",
    "settings_modal_enter_send_description_md": "**Enter** — отправка, **Shift + Enter** — новая строка",
    "settings_modal_ctrl_enter_send_description_md": "**Ctrl + Enter** — отправка, **Enter** — новая строка",
    "settings_modal_send_on_enter": "Отправлять по нажатию Enter",
+    "settings_switch_back_to_desktop": "Switch back to Desktop layout",
    "settings_modal_about": "О программе",
    "settings_modal_source_code_github": "Исходный код на GitHub",
    "settings_modal_follow_us_twitter": "Читайте нас в Твиттере!",
@ -183,6 +185,7 @@
    "conversation_kicked_user": "исключённый {user}",
    "conversation_invited_user_message": "приглашённый пользователь",
    "conversation_kicked_user_message": "исключённый пользователь",
+    "conversation_message_sent": "sent you a message",
    "conversation_unknown_user": "Кто-то",
    "conversation_unknown_chat": "Неизвестный чат",
    "message_service_created_group": "создал(а) группу {group-name}",
@ -290,6 +293,8 @@
    "im_clear_history": "Очистить историю",
    "im_delete": "Удалить {count}",
    "im_forward": "Переслать {count}",
+    "im_reply": "Reply",
+    "im_reply_loading": "Loading{dots}",
    "im_photos_drop_text": "Перетащите сюда фотографии, чтобы отправить их",
    "im_message_field_placeholder": "Напишите сообщение...",
    "im_media_attach_title": "Отправить медиа",
--- a/manifest.json
+++ b/manifest.json
@ -1,7 +1,7 @@
 {
  "name": "Telegram",
  "description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
-  "version": "0.4.0",
+  "version": "0.4.1",
  "short_name": "Telegram",
  "manifest_version": 2,
  "app": {
--- a/manifest.webapp
+++ b/manifest.webapp
@ -1,7 +1,7 @@
 {
  "name": "Telegram",
  "description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
-  "version": "0.4.0",
+  "version": "0.4.1",
  "type": "privileged",
  "launch_path": "/index.html",
  "developer": {
--- a/webogram.appcache
+++ b/webogram.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Tue Feb 24 2015 21:11:13 GMT+0300 (MSK)
+# Time: Thu Mar 19 2015 02:56:13 GMT+0300 (MSK)


 CACHE:
@ -72,10 +72,10 @@ 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
-vendor/leemon_bigint/bigint.js
+vendor/cryptoJS/crypto.js
 vendor/rusha/rusha.js
+vendor/leemon_bigint/bigint.js
 vendor/angular/i18n/angular-locale_de-de.js
 vendor/angular/i18n/angular-locale_en-us.js
 vendor/angular/i18n/angular-locale_es-es.js