merged with master

10 years ago · 0666320c43
11 changed files with 41 additions and 34 deletions
--- a/app.manifest
+++ b/app.manifest
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Sun Nov 29 2015 21:38:45 GMT+0300 (MSK)
+# Time: Mon Nov 30 2015 20:44:57 GMT+0300 (MSK)


 CACHE:
@ -8,6 +8,7 @@ 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
@ -24,9 +25,18 @@ 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
@ -61,16 +71,6 @@ 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
--- a/css/app.css
+++ b/css/app.css
@ -1326,7 +1326,7 @@ a.im_dialog:hover .im_dialog_message_text,a.im_dialog_selected .im_dialog_messag
 .im_dialog_badge{background:#64c270;font-size:11px;padding:5px;border-radius:11px;min-width:21px;text-align:center;margin-top:4px}
 .active .im_dialog_badge{color:#428bca;background-color:#fff}
 .im_dialogs_modal_col .im_dialog_badge{display:none}
-.im_dialog_badge_muted{background:#ccc}
+.im_dialog_badge_muted{background:#bfbfbf}
 .im_dialog_unread{background:#c1d6e5;display:inline-block;float:right;width:8px;height:8px;border-radius:5px;overflow:hidden;margin:12px 0 0}
 a.im_dialog:hover .im_dialog_unread,a.im_dialog_selected .im_dialog_unread{background:#a3c0d4}
 .active .im_dialog_unread{background-color:#a4c4dd}
--- a/js/app.js
+++ b/js/app.js
--- a/js/locales/de-de.json
+++ b/js/locales/de-de.json
@ -300,6 +300,7 @@
    "message_action_forward": "Weiterleiten",
    "message_action_select": "Auswählen",
    "message_action_cancel": "Abbrechen",
+    "message_action_retry": "Try again",
    "error_modal_warning_title": "Warnung",
    "error_modal_bad_request_title": "Fehler",
    "error_modal_unauthorized_title": "Nicht autorisiert",
--- a/js/locales/en-us.json
+++ b/js/locales/en-us.json
@ -336,6 +336,7 @@
 	"message_action_forward": "Forward",
 	"message_action_select": "Select",
 	"message_action_cancel": "Cancel",
+	"message_action_retry": "Try again",

 	"error_modal_warning_title": "Warning",
 	"error_modal_bad_request_title": "Error",
--- a/js/locales/es-es.json
+++ b/js/locales/es-es.json
@ -300,6 +300,7 @@
    "message_action_forward": "Reenviar",
    "message_action_select": "Elegir",
    "message_action_cancel": "Cancelar",
+    "message_action_retry": "Reintentar",
    "error_modal_warning_title": "Advertencia",
    "error_modal_bad_request_title": "Error",
    "error_modal_unauthorized_title": "No autorizado",
@ -385,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 a conversar.",
+    "im_select_a_chat": "Por favor, selecciona un chat para comenzar.",
    "im_loading_history": "Cargando historial",
    "im_info": "Información",
    "im_edit": "Editar",
--- a/js/locales/it-it.json
+++ b/js/locales/it-it.json
@ -300,6 +300,7 @@
    "message_action_forward": "Inoltra",
    "message_action_select": "Seleziona",
    "message_action_cancel": "Annulla",
+    "message_action_retry": "Riprova",
    "error_modal_warning_title": "Attenzione",
    "error_modal_bad_request_title": "Errore",
    "error_modal_unauthorized_title": "Non autorizzato",
--- a/js/locales/nl-nl.json
+++ b/js/locales/nl-nl.json
@ -300,6 +300,7 @@
    "message_action_forward": "Doorsturen",
    "message_action_select": "Selecteren",
    "message_action_cancel": "Annuleren",
+    "message_action_retry": "Try again",
    "error_modal_warning_title": "Waarschuwing",
    "error_modal_bad_request_title": "Fout",
    "error_modal_unauthorized_title": "Geen bevoegdheid",
--- a/js/locales/pt-br.json
+++ b/js/locales/pt-br.json
@ -300,6 +300,7 @@
    "message_action_forward": "Encaminhar",
    "message_action_select": "Selecionar",
    "message_action_cancel": "Cancelar",
+    "message_action_retry": "Try again",
    "error_modal_warning_title": "Advertência",
    "error_modal_bad_request_title": "Erro",
    "error_modal_unauthorized_title": "Não autorizado",
--- a/js/locales/ru-ru.json
+++ b/js/locales/ru-ru.json
@ -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": "Необходима авторизация",
--- a/webogram.appcache
+++ b/webogram.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Sun Nov 29 2015 21:38:45 GMT+0300 (MSK)
+# Time: Mon Nov 30 2015 20:44:57 GMT+0300 (MSK)


 CACHE:
@ -8,6 +8,7 @@ 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
@ -24,9 +25,18 @@ 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
@ -61,16 +71,6 @@ 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