merged with master

5 years ago · d36b530408
13 changed files with 157 additions and 247 deletions
--- a/css/app.css
+++ b/css/app.css
@ -2048,3 +2048,4 @@ body .nano-pane{display:none}
 body .nano>.nano-content{position:static}
 body .tg_head_peer_info{text-align:center}
 body .im_history_col_wrap,body .tg_head_main_wrap{width:auto;max-width:700px;float:none;margin:0 auto}}
+.visually-hidden{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px)}
--- a/css/badbrowser.css
+++ b/css/badbrowser.css
@ -2001,3 +2001,4 @@ body .nano-pane{display:none}
 body .nano>.nano-content{position:static}
 body .tg_head_peer_info{text-align:center}
 body .im_history_col_wrap,body .tg_head_main_wrap{width:auto;max-width:700px;float:none;margin:0 auto}}
+.visually-hidden{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px)}
--- a/css/desktop.css
+++ b/css/desktop.css
@ -433,11 +433,11 @@
  bottom: 0;
  visibility: hidden\9;
  /* Target only IE7 and IE8 with this hack */
-  opacity: .01;
-  -webkit-transition: .2s;
-  -moz-transition: .2s;
-  -o-transition: .2s;
-  transition: .2s;
+  opacity: 0.01;
+  -webkit-transition: 0.2s;
+  -moz-transition: 0.2s;
+  -o-transition: 0.2s;
+  transition: 0.2s;
  -webkit-border-radius: 5px;
  -moz-border-radius: 5px;
  border-radius: 5px;
@ -493,10 +493,10 @@
  width: 3px;
  right: 6px;
  top: 0;
-  -webkit-transition: .2s;
-  -moz-transition: .2s;
-  -o-transition: .2s;
-  transition: .2s;
+  -webkit-transition: 0.2s;
+  -moz-transition: 0.2s;
+  -o-transition: 0.2s;
+  transition: 0.2s;
  -webkit-border-radius: 0;
  -moz-border-radius: 0;
  border-radius: 0;
@ -909,7 +909,7 @@ a.footer_link.active:active {
  opacity: 0;
 }
 .im_message_unread .icon-message-status {
-  opacity: 1.0;
+  opacity: 1;
 }
 .im_message_pending .icon-message-status {
  opacity: 0.5;
@ -1477,7 +1477,7 @@ a.im_panel_peer_photo .peer_initials {
  padding: 5px 14px;
  clear: both;
  font-weight: normal;
-  line-height: 1.428571429;
+  line-height: 1.42857143;
  color: #333333;
  white-space: nowrap;
  font-size: 13px;
@ -1787,10 +1787,10 @@ div.im_dialog_photo .peer_initials {
  margin: 43px 40px 0 0;
  opacity: 0.5;
  pointer-events: none;
-  -webkit-transition: .2s;
-  -moz-transition: .2s;
-  -o-transition: .2s;
-  transition: .2s;
+  -webkit-transition: 0.2s;
+  -moz-transition: 0.2s;
+  -o-transition: 0.2s;
+  transition: 0.2s;
  background-image: url(../img/icons/PhotoIcons.png);
  background-repeat: no-repeat;
  background-position: -10px -10px;
@ -1837,10 +1837,10 @@ div.im_dialog_photo .peer_initials {
  top: 50%;
  pointer-events: none;
  margin: 0 0 0 38px;
-  -webkit-transition: .2s;
-  -moz-transition: .2s;
-  -o-transition: .2s;
-  transition: .2s;
+  -webkit-transition: 0.2s;
+  -moz-transition: 0.2s;
+  -o-transition: 0.2s;
+  transition: 0.2s;
  background-image: url(../img/icons/PhotoIcons.png);
  background-repeat: no-repeat;
  background-position: -12px -41px;
--- a/js/app.js
+++ b/js/app.js
--- a/js/locales/de-de.json
+++ b/js/locales/de-de.json
@ -407,6 +407,7 @@
    "error_modal_gelocation_na": "App kann deinen aktuellen Standort nicht bestimmen",
    "error_modal_2fa_recent_confirm": "Deine vorherigen Versuche das Konto zurückzusetzen wurden durch den aktiven Nutzer abgebrochen. Bitte in 7 Tagen erneut probieren.",
    "error_modal_2fa_delayed_time_md": "Du kannst dein Konto zurücksetzen in: **{time}**",
+    "head_mainmenu": "Hauptmenü",
    "head_telegram": "Telegram",
    "head_new_group": "Neue Gruppe",
    "head_new_contact": "Neuer Kontakt",
--- a/js/locales/en-us.json
+++ b/js/locales/en-us.json
@ -86,6 +86,7 @@
 	"settings_modal_password_email_pending": "Click the link in {email} to complete Two-Step Verification setup.",
 	"settings_modal_password_email_pending_cancel": "Abort",
 	"settings_modal_password_email_pending_cancel_mobile": "Abort password",
+  "settings_modal_show_sensitive_content": "Show Sensitive Content",

 	"password_delete_title": "Turn password off",
 	"password_change_title": "Two-Step Verification",
@ -278,6 +279,8 @@
 	"confirm_modal_bot_access_phone": "The bot will know your phone number. This can be useful for integration with other services.",
 	"confirm_modal_bot_access_geo": "This will send your current location to the bot.",
  "confirm_modal_bot_access_geo_inline": "This bot would like to know your location each time you send it a request. This can be used to provide location-specific results.",
+	"confirm_modal_content_settings_sensitive_md": "**Disable filtering**\nIf you disable filtering, Telegram will display sensitive media in public channels on all your connected devices.",
+  "confirm_modal_content_settings_sensitive_submit": "Disable",

 	"confirm_modal_are_u_sure": "Are you sure?",

@ -452,7 +455,7 @@
 	"error_modal_recovery_na_description": "Since you haven't provided a recovery e-mail when setting up your password, your remaining options are either to remember your password or to reset your account.",
 	"error_modal_password_success_descripion": "Your password for Two-Step Verification is now active.",
 	"error_modal_password_disabled_descripion": "You have disabled Two-Step Verification.",
-	"error_modal_user_not_mutual_contact": "The user can be invited by his contact only",
+	"error_modal_user_not_mutual_contact": "The user can be invited by their contact only",
 	"error_modal_invite_link_invalid": "The invite link is invalid",
 	"error_modal_channel_not_accessible": "Sorry, this channel is not accessible.",
 	"error_modal_not_contact_flood": "Sorry, you can only send messages to mutual contacts at the moment. {more-info-link: More info »}",
@ -460,7 +463,7 @@
 	"error_modal_2fa_recent_confirm": "Your recent attempts to reset this account have been cancelled by its active user. Please try again in 7 days.",
 	"error_modal_2fa_delayed_time_md": "You'll be able to reset your account in: **{time}**",

-
+	"head_mainmenu": "Main menu",
 	"head_telegram": "Telegram",
 	"head_new_group": "New group",
 	"head_new_contact": "New contact",
@ -549,6 +552,7 @@
 	"im_emoji_tab": "Emoji",
 	"im_stickers_tab": "Stickers",
 	"im_stickers_tab_recent": "Frequently used",
+	"im_voice_record_title": "Record a message",
 	"im_media_attach_title": "Send media",
 	"im_attach_file_title": "Send file",
 	"im_emoji_btn_title": "Insert emoticon",
--- a/service_worker.js
+++ b/service_worker.js
--- a/vendor/angular/i18n/angular-locale_es-es.js
+++ b/vendor/angular/i18n/angular-locale_es-es.js
@ -63,18 +63,18 @@ $provide.value("$locale", {
      "dic."
    ],
    "STANDALONEMONTH": [
-      "Enero",
-      "Febrero",
-      "Marzo",
-      "Abril",
-      "Mayo",
-      "Junio",
-      "Julio",
-      "Agosto",
-      "Septiembre",
-      "Octubre",
-      "Noviembre",
-      "Diciembre"
+      "enero",
+      "febrero",
+      "marzo",
+      "abril",
+      "mayo",
+      "junio",
+      "julio",
+      "agosto",
+      "septiembre",
+      "octubre",
+      "noviembre",
+      "diciembre"
    ],
    "WEEKENDRANGE": [
      5,
--- a/vendor/angular/i18n/angular-locale_it-it.js
+++ b/vendor/angular/i18n/angular-locale_it-it.js
@ -35,12 +35,12 @@ $provide.value("$locale", {
      "sabato"
    ],
    "ERANAMES": [
-      "a.C.",
-      "d.C."
+      "avanti Cristo",
+      "dopo Cristo"
    ],
    "ERAS": [
-      "aC",
-      "dC"
+      "a.C.",
+      "d.C."
    ],
    "FIRSTDAYOFWEEK": 0,
    "MONTH": [
@ -81,18 +81,18 @@ $provide.value("$locale", {
      "dic"
    ],
    "STANDALONEMONTH": [
-      "Gennaio",
-      "Febbraio",
-      "Marzo",
-      "Aprile",
-      "Maggio",
-      "Giugno",
-      "Luglio",
-      "Agosto",
-      "Settembre",
-      "Ottobre",
-      "Novembre",
-      "Dicembre"
+      "gennaio",
+      "febbraio",
+      "marzo",
+      "aprile",
+      "maggio",
+      "giugno",
+      "luglio",
+      "agosto",
+      "settembre",
+      "ottobre",
+      "novembre",
+      "dicembre"
    ],
    "WEEKENDRANGE": [
      5,
--- a/vendor/angular/i18n/angular-locale_nl-nl.js
+++ b/vendor/angular/i18n/angular-locale_nl-nl.js
@ -81,18 +81,18 @@ $provide.value("$locale", {
      "dec."
    ],
    "STANDALONEMONTH": [
-      "Januari",
-      "Februari",
-      "Maart",
-      "April",
-      "Mei",
-      "Juni",
-      "Juli",
-      "Augustus",
-      "September",
-      "Oktober",
-      "November",
-      "December"
+      "januari",
+      "februari",
+      "maart",
+      "april",
+      "mei",
+      "juni",
+      "juli",
+      "augustus",
+      "september",
+      "oktober",
+      "november",
+      "december"
    ],
    "WEEKENDRANGE": [
      5,
--- a/vendor/angular/i18n/angular-locale_pt-br.js
+++ b/vendor/angular/i18n/angular-locale_pt-br.js
@ -17,8 +17,8 @@ $provide.value("$locale", {
      "s\u00e1bado"
    ],
    "ERANAMES": [
-      "Antes de Cristo",
-      "Ano do Senhor"
+      "antes de Cristo",
+      "depois de Cristo"
    ],
    "ERAS": [
      "a.C.",
@ -85,8 +85,8 @@ $provide.value("$locale", {
    "medium": "d 'de' MMM 'de' y HH:mm:ss",
    "mediumDate": "d 'de' MMM 'de' y",
    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/yy HH:mm",
-    "shortDate": "dd/MM/yy",
+    "short": "dd/MM/y HH:mm",
+    "shortDate": "dd/MM/y",
    "shortTime": "HH:mm"
  },
  "NUMBER_FORMATS": {
@ -120,6 +120,6 @@ $provide.value("$locale", {
  },
  "id": "pt-br",
  "localeID": "pt_BR",
-  "pluralCat": function(n, opt_precision) {  if (n >= 0 && n <= 2 && n != 2) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+  "pluralCat": function(n, opt_precision) {  var i = n | 0;  if (i >= 0 && i <= 1) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
 });
 }]);
--- a/vendor/angular/i18n/angular-locale_ru-ru.js
+++ b/vendor/angular/i18n/angular-locale_ru-ru.js
@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
  "DATETIME_FORMATS": {
    "AMPMS": [
-      "AM",
-      "PM"
+      "\u0414\u041f",
+      "\u041f\u041f"
    ],
    "DAY": [
      "\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435",
@ -35,8 +35,8 @@ $provide.value("$locale", {
      "\u0441\u0443\u0431\u0431\u043e\u0442\u0430"
    ],
    "ERANAMES": [
-      "\u0434\u043e \u043d. \u044d.",
-      "\u043d. \u044d."
+      "\u0434\u043e \u0420\u043e\u0436\u0434\u0435\u0441\u0442\u0432\u0430 \u0425\u0440\u0438\u0441\u0442\u043e\u0432\u0430",
+      "\u043e\u0442 \u0420\u043e\u0436\u0434\u0435\u0441\u0442\u0432\u0430 \u0425\u0440\u0438\u0441\u0442\u043e\u0432\u0430"
    ],
    "ERAS": [
      "\u0434\u043e \u043d. \u044d.",
@ -69,11 +69,11 @@ $provide.value("$locale", {
    "SHORTMONTH": [
      "\u044f\u043d\u0432.",
      "\u0444\u0435\u0432\u0440.",
-      "\u043c\u0430\u0440\u0442\u0430",
+      "\u043c\u0430\u0440.",
      "\u0430\u043f\u0440.",
      "\u043c\u0430\u044f",
-      "\u0438\u044e\u043d\u044f",
-      "\u0438\u044e\u043b\u044f",
+      "\u0438\u044e\u043d.",
+      "\u0438\u044e\u043b.",
      "\u0430\u0432\u0433.",
      "\u0441\u0435\u043d\u0442.",
      "\u043e\u043a\u0442.",
@ -103,12 +103,12 @@ $provide.value("$locale", {
    "medium": "d MMM y '\u0433'. H:mm:ss",
    "mediumDate": "d MMM y '\u0433'.",
    "mediumTime": "H:mm:ss",
-    "short": "dd.MM.yy H:mm",
-    "shortDate": "dd.MM.yy",
+    "short": "dd.MM.y H:mm",
+    "shortDate": "dd.MM.y",
    "shortTime": "H:mm"
  },
  "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u0440\u0443\u0431.",
+    "CURRENCY_SYM": "\u20bd",
    "DECIMAL_SEP": ",",
    "GROUP_SEP": "\u00a0",
    "PATTERNS": [
--- a/webogram.appcache
+++ b/webogram.appcache
@ -1,96 +0,0 @@
-CACHE MANIFEST
-
-CACHE:
-favicon.ico
-favicon_unread.ico
-service_worker.js
-css/app.css
-css/desktop.css
-css/mobile.css
-img/Manytabs.png
-img/Manytabs_2x.png
-img/Telegram.png
-img/Telegram.svg
-img/Telegram72.png
-img/Telegram72_2x.png
-img/Telegram_2x.png
-img/blank.gif
-img/emojisprite_0.png
-img/emojisprite_1.png
-img/emojisprite_2.png
-img/emojisprite_3.png
-img/emojisprite_4.png
-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
-img/changelog/card_wecandoit.png
-img/icons/AboutLogos.png
-img/icons/AboutLogos_2x.png
-img/icons/General.png
-img/icons/General_2x.png
-img/icons/IconsetSmiles.png
-img/icons/IconsetSmiles_2x.png
-img/icons/IconsetW.png
-img/icons/IconsetW_2x.png
-img/icons/Major.png
-img/icons/Major_2x.png
-img/icons/MobileIcons.png
-img/icons/MobileIcons_2x.png
-img/icons/PhotoIcons.png
-img/icons/PhotoIcons_2x.png
-img/icons/ProfileIcons.png
-img/icons/ProfileIcons_2x.png
-img/icons/icon.svg
-img/placeholders/DialogListAvatarSystem@2x.png
-img/placeholders/Fave.png
-img/placeholders/GroupAvatar1@2x.png
-img/placeholders/GroupAvatar2@2x.png
-img/placeholders/GroupAvatar3@2x.png
-img/placeholders/GroupAvatar4@2x.png
-img/placeholders/PhotoThumbConversation.gif
-img/placeholders/PhotoThumbModal.gif
-img/placeholders/UserAvatar1@2x.png
-img/placeholders/UserAvatar2@2x.png
-img/placeholders/UserAvatar3@2x.png
-img/placeholders/UserAvatar4@2x.png
-img/placeholders/UserAvatar5@2x.png
-img/placeholders/UserAvatar6@2x.png
-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/lib/push_worker.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
-vendor/leemon_bigint/bigint.js
-vendor/recorderjs/encoder_worker.js
-vendor/rusha/rusha.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
-vendor/angular/i18n/angular-locale_it-it.js
-vendor/angular/i18n/angular-locale_nl-nl.js
-vendor/angular/i18n/angular-locale_pt-br.js
-vendor/angular/i18n/angular-locale_ru-ru.js
-
-NETWORK:
-http://*
-https://*
-*
-
-# hash: d567d2eb2ca50cbdc0a9f7380a9d040148db7c0d50c5b3adb88a1f18c51cd088