merged with master

app.manifest

@@ -1,11 +1,13 @@
 CACHE MANIFEST
-# Time: Wed Feb 10 2016 22:30:40 GMT+0300 (MSK)
+# Time: Thu Feb 11 2016 19:10:56 GMT+0000 (GMT)
 
 
 CACHE:
 favicon.ico
 favicon_unread.ico
-js/app.js
+css/app.css
+css/desktop.css
+css/mobile.css
 img/Manytabs.png
 img/Manytabs_2x.png
 img/Telegram.png
@@ -23,21 +25,9 @@ img/iphone_home120.png
 img/iphone_startup.png
 img/logo_share.png
 img/sound_a.mp3
-css/app.css
+js/app.js
-css/desktop.css
-css/mobile.css
 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
@@ -72,6 +62,16 @@ img/placeholders/[email protected]
 img/placeholders/[email protected]
 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

@@ -1496,8 +1496,8 @@ div.im_message_author,div.im_message_body{display:block;overflow:hidden}
 .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%}
+.im_message_text{word-wrap:break-word;line-height:150%;white-space:pre-wrap}
-.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_document_caption,.im_message_photo_caption,.im_message_video_caption{margin-top:3px;clear:both;word-wrap:break-word;line-height:150%;white-space:pre-wrap}
 .im_message_mymention{background:#fff8cc}
 .reply_markup_wrap{margin:15px -2px 0}
 .reply_markup_row{padding:4px 0;line-height:0}
@@ -1572,8 +1572,8 @@ img.img_fullsize{margin:0 auto}
 .media_modal_author{color:inherit;font-weight:700}
 .media_modal_author:hover{color:inherit}
 .non_osx .media_modal_author{font-size:12px}
-.composer_progress_icon{display:block;opacity:0;position:absolute;right:3px;top:2px;cursor:pointer;padding:0;width:22px;height:22px;margin-top:1px;transition:opacity cubic-bezier(.25,.46,.45,.94) .2s;pointer-events:none}
+.composer_progress_icon_wrap{opacity:0;position:absolute;right:3px;top:2px;width:22px;height:22px;overflow:hidden;margin-top:1px;pointer-events:none;padding:0;transition:opacity cubic-bezier(.25,.46,.45,.94) .2s}
-.composer_progress_enabled .composer_progress_icon{opacity:1}
+.composer_progress_enabled .composer_progress_icon_wrap{opacity:1}
 .composer_emoji_insert_btn{opacity:1;display:block;position:absolute;right:3px;top:2px;cursor:pointer;padding:0;width:22px;height:22px;margin-top:1px;transition:opacity cubic-bezier(.25,.46,.45,.94) .2s}
 .composer_progress_enabled .composer_emoji_insert_btn{opacity:0}
 .icon-emoji{display:inline-block;width:22px;height:22px;vertical-align:top;opacity:.8;background-image:url(../img/icons/General.png);background-repeat:no-repeat;background-position:-9px -335px}
@@ -1707,7 +1707,7 @@ li.inline_result_gif.composer_autocomplete_option_active a .inline_result_ind,li
 .confirm_modal_description{text-align:center;padding:20px 0;font-size:14px;line-height:160%}
 .confirm_phone_number{font-weight:700;padding:15px 10px 0;text-align:center}
 .confirm_modal_extlink_jump{word-break:break-all}
-.confirm_modal_paste_image{max-width:274px;height:274px;background-position:50% 50%;background-size:cover;background-repeat:no-repeat;margin:10px auto -10px}
+.confirm_modal_paste_image{max-width:274px;height:274px;background-position:50% 50%;background-size:contain;background-repeat:no-repeat;margin:10px auto -10px}
 .document_modal_window,.photo_modal_window,.video_modal_window{display:block}
 .photo_modal_error{color:#999;position:absolute;width:100%;top:50%;margin-top:-20px;padding:0 20px;text-align:center;font-size:1.4em;line-height:160%}
 .video_full_error{border-radius:10px;overflow:hidden;background:rgba(0,0,0,.6);color:#fff;position:absolute;top:50%;margin:-40px 10px 0;padding:10px;text-align:center;font-size:1.4em;line-height:160%}

css/desktop.css

@@ -1079,6 +1079,11 @@ a.im_panel_peer_photo .peer_initials {
     min-height: 25px;
     padding-right: 25px;
   }
+  .composer_progress_icon_wrap {
+    top: 0;
+    right: 0;
+    margin-top: 0;
+  }
   .composer_emoji_insert_btn {
     top: 0;
     right: 0px;

js/locales/es-es.json

@@ -418,7 +418,7 @@
     "im_X_forwarded_messages": "{'one': '{} mensaje reenviado', 'other': '{} mensajes reenviados'}",
     "im_photos_drop_text": "Suelta las fotos aquí para enviarlas",
     "im_message_field_placeholder": "Escribe un mensaje...",
-    "im_broadcast_field_placeholder": "Difundir un mensaje...",
+    "im_broadcast_field_placeholder": "Difunde un mensaje...",
     "im_emoji_tab": "Emoji",
     "im_stickers_tab": "Stickers",
     "im_stickers_tab_recent": "Uso frecuente",
@@ -474,8 +474,8 @@
     "login_controller_unknown_country": "Desconocido",
     "message_forwarded_message": "Mensaje reenviado",
     "message_via_bot": "vía {bot}",
-    "message_forwarded_message_mobile": "Forwarded from {from}",
+    "message_forwarded_message_mobile": "Reenviado de {from}",
-    "message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}",
+    "message_forwarded_via_message_mobile": "Reenviado de {from} vía {bot}",
     "message_attach_audio_message": "Mensaje de voz",
     "message_attach_audio_play": "Reproducir",
     "message_attach_document_open": "Abrir",

js/locales/nl-nl.json

@@ -474,8 +474,8 @@
     "login_controller_unknown_country": "Onbekend",
     "message_forwarded_message": "Doorgestuurd bericht",
     "message_via_bot": "via {bot}",
-    "message_forwarded_message_mobile": "Forwarded from {from}",
+    "message_forwarded_message_mobile": "Doorgestuurd van {from}",
-    "message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}",
+    "message_forwarded_via_message_mobile": "Doorgestuurd van {from} via {bot}",
     "message_attach_audio_message": "Spraakbericht",
     "message_attach_audio_play": "Afspelen",
     "message_attach_document_open": "Openen",

webogram.appcache

@@ -1,11 +1,13 @@
 CACHE MANIFEST
-# Time: Wed Feb 10 2016 22:30:40 GMT+0300 (MSK)
+# Time: Thu Feb 11 2016 19:10:56 GMT+0000 (GMT)
 
 
 CACHE:
 favicon.ico
 favicon_unread.ico
-js/app.js
+css/app.css
+css/desktop.css
+css/mobile.css
 img/Manytabs.png
 img/Manytabs_2x.png
 img/Telegram.png
@@ -23,21 +25,9 @@ img/iphone_home120.png
 img/iphone_startup.png
 img/logo_share.png
 img/sound_a.mp3
-css/app.css
+js/app.js
-css/desktop.css
-css/mobile.css
 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
@@ -72,6 +62,16 @@ img/placeholders/[email protected]
 img/placeholders/[email protected]
 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