Merge remote-tracking branch 'upstream/develop' into async_follow

* upstream/develop: (45 commits)
  fix chrome
  Prevent html-minifier to remove placeholder comment in index.html template
  Add placeholder to insert server generated metatags. Related to #430
  added condition to check for logined user
  fix gradients and minor artifacts
  keep track of new instance options
  fix old MR
  oof
  get rid of slots
  fix timeago font
  added hide_network option, fixed properties naming
  Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
  improve notification subscription
  Refactor arrays to individual options
  Reset enableFollowsExport to true after 2 sec when an export file is available to download
  Write a unit test for fileSizeFormatService
  add checkbox to disable web push
  I am dumb
  Handle errors from server
  Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
  ...

2 files changed, 22 insertions, 1 deletions

diff --git a/src/i18n/en.json b/src/i18n/en.json
index a5c02953..f445bfc2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -29,6 +29,7 @@
     "username": "Username"
   },
   "nav": {
+    "back": "Back",
     "chat": "Local Chat",
     "friend_requests": "Follow Requests",
     "mentions": "Mentions",
@@ -133,7 +134,7 @@
     "inputRadius": "Input fields",
     "checkboxRadius": "Checkboxes",
     "instance_default": "(default: {value})",
-    "instance_default_simple" : "(default)",
+    "instance_default_simple": "(default)",
     "interface": "Interface",
     "interfaceLanguage": "Interface language",
     "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
@@ -151,6 +152,7 @@
     "notification_visibility_mentions": "Mentions",
     "notification_visibility_repeats": "Repeats",
     "no_rich_text_description": "Strip rich text formatting from all posts",
+    "hide_network_description": "Don't show who I'm following and who's following me",
     "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
     "panelRadius": "Panels",
     "pause_on_unfocused": "Pause streaming when tab is not focused",
@@ -190,6 +192,8 @@
       "false": "no",
       "true": "yes"
     },
+    "notifications": "Notifications",
+    "enable_web_push_notifications": "Enable web push notifications",
     "style": {
       "switcher": {
         "keep_color": "Keep colors",
@@ -324,6 +328,7 @@
     "followers": "Followers",
     "following": "Following!",
     "follows_you": "Follows you!",
+    "its_you": "It's you!",
     "mute": "Mute",
     "muted": "Muted",
     "per_day": "per day",
@@ -343,5 +348,19 @@
     "reply": "Reply",
     "favorite": "Favorite",
     "user_settings": "User Settings"
+  },
+  "upload":{
+    "error": {
+    "base": "Upload failed.",
+    "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+    "default": "Try again later"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
   }
 }
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index d710662f..249eab69 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -19,6 +19,7 @@
     "username": "Имя пользователя"
   },
   "nav": {
+    "back": "Назад",
     "chat": "Локальный чат",
     "mentions": "Упоминания",
     "public_tl": "Публичная лента",
@@ -126,6 +127,7 @@
     "notification_visibility_mentions": "Упоминания",
     "notification_visibility_repeats": "Повторы",
     "no_rich_text_description": "Убрать форматирование из всех постов",
+    "hide_network_description": "Не показывать кого я читаю и кто меня читает",
     "nsfw_clickthrough": "Включить скрытие NSFW вложений",
     "panelRadius": "Панели",
     "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",