merge develop, add mobile nav component

src/App.js

@@ -8,7 +8,8 @@ import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_pan
 import ChatPanel from './components/chat_panel/chat_panel.vue'
 import MediaModal from './components/media_modal/media_modal.vue'
 import SideDrawer from './components/side_drawer/side_drawer.vue'
-import { unseenNotificationsFromStore } from './services/notification_utils/notification_utils'
+import MobilePostStatusModal from './components/mobile_post_status_modal/mobile_post_status_modal.vue'
+import MobileNav from './components/mobile_nav/mobile_nav.vue'
 
 export default {
   name: 'app',
@@ -22,11 +23,12 @@ export default {
     WhoToFollowPanel,
     ChatPanel,
     MediaModal,
-    SideDrawer
+    SideDrawer,
+    MobilePostStatusModal,
+    MobileNav
   },
   data: () => ({
     mobileActivePanel: 'timeline',
-    notificationsOpen: false,
     finderHidden: true,
     supportsMask: window.CSS && window.CSS.supports && (
       window.CSS.supports('mask-size', 'contain') ||
@@ -85,12 +87,6 @@ export default {
     chat () { return this.$store.state.chat.channel.state === 'joined' },
     suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
     showInstanceSpecificPanel () { return this.$store.state.instance.showInstanceSpecificPanel },
-    unseenNotifications () {
-      return unseenNotificationsFromStore(this.$store)
-    },
-    unseenNotificationsCount () {
-      return this.unseenNotifications.length
-    },
     showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
     isMobileLayout () { return this.$store.state.interface.mobileLayout }
   },
@@ -105,12 +101,6 @@ export default {
     onFinderToggled (hidden) {
       this.finderHidden = hidden
     },
-    toggleMobileSidebar () {
-      this.$refs.sideDrawer.toggleDrawer()
-    },
-    toggleMobileNotifications () {
-      this.notificationsOpen = !this.notificationsOpen
-    },
     updateMobileState () {
       const width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
       const changed = width <= 800 !== this.isMobileLayout

src/App.scss

@@ -628,6 +628,16 @@ nav {
   color: $fallback--faint;
   color: var(--faint, $fallback--faint);
 }
+
+.faint-link {
+  color: $fallback--faint;
+  color: var(--faint, $fallback--faint);
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
 @media all and (min-width: 800px) {
   .logo {
     opacity: 1 !important;
@@ -665,17 +675,35 @@ nav {
   position: fixed;
   width: 100vw;
   height: 100vh;
-  top: 50px;
+  top: calc(50px - 28px - 1.2em);
   left: 0;
-  z-index: 9;
+  z-index: 999;
   overflow-x: hidden;
   overflow-y: scroll;
   transition-property: transform;
-  transition-duration: 0.35s;
+  transition-duration: 0.25s;
   transform: translate(0);
 
+  background-color: $fallback--bg;
+  background-color: var(--bg, $fallback--bg);
+
   .notifications {
+    margin: 0;
     padding: 0;
+    border-radius: 0;
+    box-shadow: none;
+    .panel {
+      border-radius: 0;
+      margin: 0;
+      box-shadow: none;
+    }
+    .panel:after {
+      border-radius: 0;
+    }
+    .panel .panel-heading {
+      border-radius: 0;
+      box-shadow: none;
+    }
   }
 
   &.closed {
@@ -683,6 +711,35 @@ nav {
   }
 }
 
+@keyframes modal-background-fadein {
+  from {
+    background-color: rgba(0, 0, 0, 0);
+  }
+  to {
+    background-color: rgba(0, 0, 0, 0.5);
+  }
+}
+
+.modal-view {
+  z-index: 1000;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: auto;
+  animation-duration: 0.2s;
+  background-color: rgba(0, 0, 0, 0.5);
+  animation-name: modal-background-fadein;
+}
+
+.button-icon {
+  font-size: 1.2em;
+}
+
 @keyframes shakeError {
   0% {
     transform: translateX(0);
@@ -727,16 +784,6 @@ nav {
     margin: 0.5em 0 0.5em 0;
   }
 
-  .button-icon {
-    font-size: 1.2em;
-  }
-
-  .status .status-actions {
-    div {
-      max-width: 4em;
-    }
-  }
-
   .menu-button {
     display: block;
     margin-right: 0.8em;

src/App.vue

@@ -1,36 +1,24 @@
 <template>
   <div id="app" v-bind:style="bgAppStyle">
     <div class="app-bg-wrapper" v-bind:style="bgStyle"></div>
-    <nav class='nav-bar container' @click="scrollToTop()" id="nav">
+    <MobileNav v-if="isMobileLayout" />
+    <nav v-else class='nav-bar container' @click="scrollToTop()" id="nav">
       <div class='logo' :style='logoBgStyle'>
         <div class='mask' :style='logoMaskStyle'></div>
         <img :src='logo' :style='logoStyle'>
       </div>
       <div class='inner-nav'>
         <div class='item'>
-          <a href="#" class="menu-button" @click.stop.prevent="toggleMobileSidebar()">
-            <i class="button-icon icon-menu"></i>
-          </a>
           <router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link>
         </div>
         <div class='item right'>
           <user-finder class="button-icon nav-icon mobile-hidden" @toggled="onFinderToggled"></user-finder>
           <router-link class="mobile-hidden" :to="{ name: 'settings'}"><i class="button-icon icon-cog nav-icon" :title="$t('nav.preferences')"></i></router-link>
           <a href="#" class="mobile-hidden" v-if="currentUser" @click.prevent="logout"><i class="button-icon icon-logout nav-icon" :title="$t('login.logout')"></i></a>
-          <a href="#" class="menu-button" @click.stop.prevent="toggleMobileNotifications()">
-            <i class="button-icon icon-bell-alt"></i>
-            <div class="alert-dot" v-if="unseenNotificationsCount"></div>
-          </a>
         </div>
       </div>
     </nav>
     <div v-if="" class="container" id="content">
-      <div v-if="isMobileLayout">
-        <side-drawer ref="sideDrawer" :logout="logout"></side-drawer>
-        <div class="mobile-notifications" :class="{ 'closed': !notificationsOpen }">
-          <notifications/>
-        </div>
-      </div>
       <div class="sidebar-flexer mobile-hidden" v-if="!isMobileLayout">
         <div class="sidebar-bounds">
           <div class="sidebar-scroller">
@@ -58,6 +46,13 @@
       <media-modal></media-modal>
     </div>
     <chat-panel :floating="true" v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel>
+    <div v-if="isMobileLayout">
+      <side-drawer ref="sideDrawer" :logout="logout"></side-drawer>
+      <div class="mobile-notifications" :class="{ 'closed': !notificationsOpen }">
+        <notifications/>
+      </div>
+    </div>
+    <MobilePostStatusModal />
   </div>
 </template>
 

src/boot/after_store.js

@@ -92,10 +92,8 @@ const afterStoreSetup = ({ store, i18n }) => {
           copyInstanceOption('noAttachmentLinks')
           copyInstanceOption('showFeaturesPanel')
 
-          if ((config.chatDisabled)) {
+          if (config.chatDisabled) {
             store.dispatch('disableChat')
-          } else {
-            store.dispatch('initializeSocket')
           }
 
           return store.dispatch('setTheme', config['theme'])
@@ -172,6 +170,8 @@ const afterStoreSetup = ({ store, i18n }) => {
       store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') })
       store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
 
+      store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })
+
       store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
 
       const suggestions = metadata.suggestions

src/boot/routes.js

@@ -13,7 +13,6 @@ import FollowRequests from 'components/follow_requests/follow_requests.vue'
 import OAuthCallback from 'components/oauth_callback/oauth_callback.vue'
 import UserSearch from 'components/user_search/user_search.vue'
 import Notifications from 'components/notifications/notifications.vue'
-import UserPanel from 'components/user_panel/user_panel.vue'
 import LoginForm from 'components/login_form/login_form.vue'
 import ChatPanel from 'components/chat_panel/chat_panel.vue'
 import WhoToFollow from 'components/who_to_follow/who_to_follow.vue'
@@ -43,7 +42,6 @@ export default (store) => {
     { name: 'friend-requests', path: '/friend-requests', component: FollowRequests },
     { name: 'user-settings', path: '/user-settings', component: UserSettings },
     { name: 'notifications', path: '/:username/notifications', component: Notifications },
-    { name: 'new-status', path: '/:username/new-status', component: UserPanel },
     { name: 'login', path: '/login', component: LoginForm },
     { name: 'chat', path: '/chat', component: ChatPanel, props: () => ({ floating: false }) },
     { name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) },

src/components/attachment/attachment.vue

@@ -88,7 +88,7 @@
 
   .attachment {
     position: relative;
-    margin: 0.5em 0.5em 0em 0em;
+    margin-top: 0.5em;
     align-self: flex-start;
     line-height: 0;
 
@@ -160,6 +160,7 @@
 
   .hider {
     position: absolute;
+    right: 0;
     white-space: nowrap;
     margin: 10px;
     padding: 5px;

src/components/basic_user_card/basic_user_card.js

@@ -1,4 +1,4 @@
-import UserCardContent from '../user_card_content/user_card_content.vue'
+import UserCard from '../user_card/user_card.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
@@ -12,7 +12,7 @@ const BasicUserCard = {
     }
   },
   components: {
-    UserCardContent,
+    UserCard,
     UserAvatar
   },
   methods: {

src/components/basic_user_card/basic_user_card.vue

@@ -1,18 +1,18 @@
 <template>
-  <div class="user-card">
+  <div class="basic-user-card">
     <router-link :to="userProfileLink(user)">
       <UserAvatar class="avatar" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
     </router-link>
-    <div class="user-card-expanded-content" v-if="userExpanded">
+    <div class="basic-user-card-expanded-content" v-if="userExpanded">
-      <user-card-content :user="user" :switcher="false"></user-card-content>
+      <UserCard :user="user" :rounded="true" :bordered="true"/>
     </div>
-    <div class="user-card-collapsed-content" v-else>
+    <div class="basic-user-card-collapsed-content" v-else>
-      <div :title="user.name" class="user-card-user-name">
+      <div :title="user.name" class="basic-user-card-user-name">
         <span v-if="user.name_html" v-html="user.name_html"></span>
         <span v-else>{{ user.name }}</span>
       </div>
       <div>
-        <router-link class="user-card-screen-name" :to="userProfileLink(user)">
+        <router-link class="basic-user-card-screen-name" :to="userProfileLink(user)">
           @{{user.screen_name}}
         </router-link>
       </div>
@@ -26,15 +26,15 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.user-card {
+.basic-user-card {
   display: flex;
   flex: 1 0;
+  margin: 0;
   padding-top: 0.6em;
   padding-right: 1em;
   padding-bottom: 0.6em;
   padding-left: 1em;
   border-bottom: 1px solid;
-  margin: 0;
   border-bottom-color: $fallback--border;
   border-bottom-color: var(--border, $fallback--border);
 
@@ -57,23 +57,6 @@
   &-expanded-content {
     flex: 1;
     margin-left: 0.7em;
-    border-radius: $fallback--panelRadius;
-    border-radius: var(--panelRadius, $fallback--panelRadius);
-    border-style: solid;
-    border-color: $fallback--border;
-    border-color: var(--border, $fallback--border);
-    border-width: 1px;
-    overflow: hidden;
-
-    .panel-heading {
-      background: transparent;
-      flex-direction: column;
-      align-items: stretch;
-    }
-
-    p {
-      margin-bottom: 0;
-    }
   }
 }
 </style>

src/components/gallery/gallery.vue

@@ -27,7 +27,6 @@
   align-content: stretch;
   flex-grow: 1;
   margin-top: 0.5em;
-  margin-bottom: 0.25em;
 
   .attachments, .attachment {
     margin: 0 0.5em 0 0;
@@ -36,6 +35,9 @@
     box-sizing: border-box;
     // to make failed images a bit more noticeable on chromium
     min-width: 2em;
+    &:last-child {
+      margin: 0;
+    }
   }
 
   .image-attachment {

src/components/image_cropper/image_cropper.js

@@ -67,7 +67,7 @@ const ImageCropper = {
     submit () {
       this.submitting = true
       this.avatarUploadError = null
-      this.submitHandler(this.cropper, this.filename)
+      this.submitHandler(this.cropper, this.file)
         .then(() => this.destroy())
         .catch((err) => {
           this.submitError = err
@@ -88,14 +88,14 @@ const ImageCropper = {
     readFile () {
       const fileInput = this.$refs.input
       if (fileInput.files != null && fileInput.files[0] != null) {
+        this.file = fileInput.files[0]
         let reader = new window.FileReader()
         reader.onload = (e) => {
           this.dataUrl = e.target.result
           this.$emit('open')
         }
-        reader.readAsDataURL(fileInput.files[0])
+        reader.readAsDataURL(this.file)
-        this.filename = fileInput.files[0].name || 'unknown'
+        this.$emit('changed', this.file, reader)
-        this.$emit('changed', fileInput.files[0], reader)
       }
     },
     clearError () {

src/components/link-preview/link-preview.vue

@@ -23,10 +23,7 @@
   flex-direction: row;
   cursor: pointer;
   overflow: hidden;
-
+  margin-top: 0.5em;
-  // TODO: clean up the random margins in attachments, this makes preview line
-  // up with attachments...
-  margin-right: 0.5em;
 
   .card-image {
     flex-shrink: 0;

src/components/media_modal/media_modal.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="modal-view" v-if="showing" @click.prevent="hide">
+  <div class="modal-view media-modal-view" v-if="showing" @click.prevent="hide">
     <img class="modal-image" v-if="type === 'image'" :src="currentMedia.url"></img>
     <VideoAttachment
       class="modal-image"
@@ -32,18 +32,7 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.modal-view {
+.media-modal-view {
-  z-index: 1000;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: rgba(0, 0, 0, 0.5);
-
   &:hover {
     .modal-view-button-arrow {
       opacity: 0.75;

src/components/mobile_nav/mobile_nav.js

@@ -0,0 +1,35 @@
+import SideDrawer from '../side_drawer/side_drawer.vue'
+import Notifications from '../notifications/notifications.vue'
+import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
+
+const MobileNav = {
+  components: {
+    SideDrawer,
+    Notifications
+  },
+  data: () => ({
+    notificationsOpen: false
+  }),
+  computed: {
+    unseenNotifications () {
+      return unseenNotificationsFromStore(this.$store)
+    },
+    unseenNotificationsCount () {
+      return this.unseenNotifications.length
+    },
+    sitename () { return this.$store.state.instance.name }
+  },
+  methods: {
+    toggleMobileSidebar () {
+      this.$refs.sideDrawer.toggleDrawer()
+    },
+    toggleMobileNotifications () {
+      this.notificationsOpen = !this.notificationsOpen
+    },
+    scrollToTop () {
+      window.scrollTo(0, 0)
+    }
+  }
+}
+
+export default MobileNav

src/components/mobile_nav/mobile_nav.vue

@@ -0,0 +1,29 @@
+<template>
+  <nav class='nav-bar container' @click="scrollToTop()" id="nav">
+    <div class='inner-nav'>
+      <div class='item'>
+        <a href="#" class="menu-button" @click.stop.prevent="toggleMobileSidebar()">
+          <i class="button-icon icon-menu"></i>
+        </a>
+        <router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link>
+      </div>
+      <div class='item right'>
+        <a href="#" class="menu-button" @click.stop.prevent="toggleMobileNotifications()">
+          <i class="button-icon icon-bell-alt"></i>
+          <div class="alert-dot" v-if="unseenNotificationsCount"></div>
+        </a>
+      </div>
+    </div>
+    <SideDrawer ref="sideDrawer" :logout="logout"/>
+    <div class="mobile-notifications" :class="{ 'closed': !notificationsOpen }">
+      <Notifications/>
+    </div>
+  </nav>
+</template>
+
+<script src="./mobile_nav.js"></script>
+
+<style lang="scss">
+
+
+</style>

src/components/mobile_post_status_modal/mobile_post_status_modal.js

@@ -0,0 +1,91 @@
+import PostStatusForm from '../post_status_form/post_status_form.vue'
+import { throttle } from 'lodash'
+
+const MobilePostStatusModal = {
+  components: {
+    PostStatusForm
+  },
+  data () {
+    return {
+      hidden: false,
+      postFormOpen: false,
+      scrollingDown: false,
+      inputActive: false,
+      oldScrollPos: 0,
+      amountScrolled: 0
+    }
+  },
+  created () {
+    window.addEventListener('scroll', this.handleScroll)
+    window.addEventListener('resize', this.handleOSK)
+  },
+  destroyed () {
+    window.removeEventListener('scroll', this.handleScroll)
+    window.removeEventListener('resize', this.handleOSK)
+  },
+  computed: {
+    currentUser () {
+      return this.$store.state.users.currentUser
+    },
+    isHidden () {
+      return this.hidden || this.inputActive
+    }
+  },
+  methods: {
+    openPostForm () {
+      this.postFormOpen = true
+      this.hidden = true
+
+      const el = this.$el.querySelector('textarea')
+      this.$nextTick(function () {
+        el.focus()
+      })
+    },
+    closePostForm () {
+      this.postFormOpen = false
+      this.hidden = false
+    },
+    handleOSK () {
+      // This is a big hack: we're guessing from changed window sizes if the
+      // on-screen keyboard is active or not. This is only really important
+      // for phones in portrait mode and it's more important to show the button
+      // in normal scenarios on all phones, than it is to hide it when the
+      // keyboard is active.
+      // Guesswork based on https://www.mydevice.io/#compare-devices
+
+      // for example, iphone 4 and android phones from the same time period
+      const smallPhone = window.innerWidth < 350
+      const smallPhoneKbOpen = smallPhone && window.innerHeight < 345
+
+      const biggerPhone = !smallPhone && window.innerWidth < 450
+      const biggerPhoneKbOpen = biggerPhone && window.innerHeight < 560
+      if (smallPhoneKbOpen || biggerPhoneKbOpen) {
+        this.inputActive = true
+      } else {
+        this.inputActive = false
+      }
+    },
+    handleScroll: throttle(function () {
+      const scrollAmount = window.scrollY - this.oldScrollPos
+      const scrollingDown = scrollAmount > 0
+
+      if (scrollingDown !== this.scrollingDown) {
+        this.amountScrolled = 0
+        this.scrollingDown = scrollingDown
+        if (!scrollingDown) {
+          this.hidden = false
+        }
+      } else if (scrollingDown) {
+        this.amountScrolled += scrollAmount
+        if (this.amountScrolled > 100 && !this.hidden) {
+          this.hidden = true
+        }
+      }
+
+      this.oldScrollPos = window.scrollY
+      this.scrollingDown = scrollingDown
+    }, 100)
+  }
+}
+
+export default MobilePostStatusModal

src/components/mobile_post_status_modal/mobile_post_status_modal.vue

@@ -0,0 +1,76 @@
+<template>
+<div v-if="currentUser">
+  <div
+    class="post-form-modal-view modal-view"
+    v-show="postFormOpen"
+    @click="closePostForm"
+  >
+    <div class="post-form-modal-panel panel" @click.stop="">
+      <div class="panel-heading">{{$t('post_status.new_status')}}</div>
+      <PostStatusForm class="panel-body" @posted="closePostForm"/>
+    </div>
+  </div>
+  <button
+    class="new-status-button"
+    :class="{ 'hidden': isHidden }"
+    @click="openPostForm"
+  >
+    <i class="icon-edit" />
+  </button>
+</div>
+</template>
+
+<script src="./mobile_post_status_modal.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.post-form-modal-view {
+  max-height: 100%;
+  display: block;
+}
+
+.post-form-modal-panel {
+  flex-shrink: 0;
+  margin: 25% 0 4em 0;
+  width: 100%;
+}
+
+.new-status-button {
+  width: 5em;
+  height: 5em;
+  border-radius: 100%;
+  position: fixed;
+  bottom: 1.5em;
+  right: 1.5em;
+  // TODO: this needs its own color, it has to stand out enough and link color
+  // is not very optimal for this particular use.
+  background-color: $fallback--fg;
+  background-color: var(--btn, $fallback--fg);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3), 0px 4px 6px rgba(0, 0, 0, 0.3);
+  z-index: 10;
+
+  transition: 0.35s transform;
+  transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
+
+  &.hidden {
+    transform: translateY(150%);
+  }
+
+  i {
+    font-size: 1.5em;
+    color: $fallback--text;
+    color: var(--text, $fallback--text);
+  }
+}
+
+@media all and (min-width: 801px) {
+  .new-status-button {
+    display: none;
+  }
+}
+
+</style>

src/components/notification/notification.js

@@ -1,6 +1,6 @@
 import Status from '../status/status.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
-import UserCardContent from '../user_card_content/user_card_content.vue'
+import UserCard from '../user_card/user_card.vue'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
@@ -13,7 +13,7 @@ const Notification = {
   },
   props: [ 'notification' ],
   components: {
-    Status, UserAvatar, UserCardContent
+    Status, UserAvatar, UserCard
   },
   methods: {
     toggleUserExpanded () {

src/components/notification/notification.vue

@@ -5,9 +5,7 @@
       <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/>
     </a>
     <div class='notification-right'>
-      <div class="usercard notification-usercard" v-if="userExpanded">
+      <UserCard :user="notification.action.user" :rounded="true" :bordered="true" v-if="userExpanded"/>
-        <user-card-content :user="notification.action.user" :switcher="false"></user-card-content>
-      </div>
       <span class="notification-details">
         <div class="name-and-action">
           <span class="username" v-if="!!notification.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span>
@@ -25,7 +23,11 @@
             <small>{{$t('notifications.followed_you')}}</small>
           </span>
         </div>
-        <small class="timeago"><router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small>
+        <div class="timeago">
+          <router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }" class="faint-link">
+            <timeago :since="notification.action.created_at" :auto-update="240"></timeago>
+          </router-link>
+        </div>
       </span>
       <div class="follow-text" v-if="notification.type === 'follow'">
         <router-link :to="userProfileLink(notification.action.user)">

src/components/notifications/notifications.js

@@ -11,7 +11,8 @@ const Notifications = {
     const store = this.$store
     const credentials = store.state.users.currentUser.credentials
 
-    notificationsFetcher.startFetching({ store, credentials })
+    const fetcherId = notificationsFetcher.startFetching({ store, credentials })
+    this.$store.commit('setNotificationFetcher', { fetcherId })
   },
   data () {
     return {

src/components/notifications/notifications.scss

@@ -45,10 +45,6 @@
     }
   }
 
-  .notification-usercard {
-    margin: 0;
-  }
-
   .non-mention {
     display: flex;
     flex: 1;
@@ -126,7 +122,7 @@
     }
 
     .timeago {
-      font-size: 12px;
+      margin-right: .2em;
     }
 
     .icon-retweet.lit {

src/components/post_status_form/post_status_form.js

@@ -171,6 +171,9 @@ const PostStatusForm = {
     },
     formattingOptionsEnabled () {
       return this.$store.state.instance.formattingOptionsEnabled
+    },
+    postFormats () {
+      return this.$store.state.instance.postFormats || []
     }
   },
   methods: {
@@ -219,6 +222,9 @@ const PostStatusForm = {
         this.highlighted = 0
       }
     },
+    onKeydown (e) {
+      e.stopPropagation()
+    },
     setCaret ({target: {selectionStart}}) {
       this.caret = selectionStart
     },

src/components/post_status_form/post_status_form.vue

@@ -20,6 +20,7 @@
         ref="textarea"
         @click="setCaret"
         @keyup="setCaret" v-model="newStatus.status" :placeholder="$t('post_status.default')" rows="1" class="form-control"
+        @keydown="onKeydown"
         @keydown.down="cycleForward"
         @keydown.up="cycleBackward"
         @keydown.shift.tab="cycleBackward"
@@ -30,15 +31,17 @@
         @drop="fileDrop"
         @dragover.prevent="fileDrag"
         @input="resize"
-        @paste="paste">
+        @paste="paste"
+        :disabled="posting"
+      >
       </textarea>
       <div class="visibility-tray">
         <span class="text-format" v-if="formattingOptionsEnabled">
           <label for="post-content-type" class="select">
             <select id="post-content-type" v-model="newStatus.contentType" class="form-control">
-              <option value="text/plain">{{$t('post_status.content_type.plain_text')}}</option>
+              <option v-for="postFormat in postFormats" :key="postFormat" :value="postFormat">
-              <option value="text/html">HTML</option>
+                {{$t(`post_status.content_type["${postFormat}"]`)}}
-              <option value="text/markdown">Markdown</option>
+              </option>
             </select>
             <i class="icon-down-open"></i>
           </label>

src/components/settings/settings.js

@@ -93,6 +93,9 @@ const settings = {
     currentSaveStateNotice () {
       return this.$store.state.interface.settings.currentSaveStateNotice
     },
+    postFormats () {
+      return this.$store.state.instance.postFormats || []
+    },
     instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel }
   },
   watch: {

src/components/settings/settings.vue

@@ -105,17 +105,9 @@
                 {{$t('settings.post_status_content_type')}}
                 <label for="postContentType" class="select">
                   <select id="postContentType" v-model="postContentTypeLocal">
-                    <option value="text/plain">
+                    <option v-for="postFormat in postFormats" :key="postFormat" :value="postFormat">
-                      {{$t('settings.status_content_type_plain')}}
+                      {{$t(`post_status.content_type["${postFormat}"]`)}}
-                      {{postContentTypeDefault == 'text/plain' ? $t('settings.instance_default_simple') : ''}}
+                      {{postContentTypeDefault === postFormat ? $t('settings.instance_default_simple') : ''}}
-                    </option>
-                    <option value="text/html">
-                      HTML
-                      {{postContentTypeDefault == 'text/html' ? $t('settings.instance_default_simple') : ''}}
-                    </option>
-                    <option value="text/markdown">
-                      Markdown
-                      {{postContentTypeDefault == 'text/markdown' ? $t('settings.instance_default_simple') : ''}}
                     </option>
                   </select>
                   <i class="icon-down-open"/>

src/components/side_drawer/side_drawer.js

@@ -1,4 +1,4 @@
-import UserCardContent from '../user_card_content/user_card_content.vue'
+import UserCard from '../user_card/user_card.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 
 // TODO: separate touch gesture stuff into their own utils if more components want them
@@ -12,7 +12,7 @@ const SideDrawer = {
     closed: true,
     touchCoord: [0, 0]
   }),
-  components: { UserCardContent },
+  components: { UserCard },
   computed: {
     currentUser () {
       return this.$store.state.users.currentUser

src/components/side_drawer/side_drawer.vue

@@ -8,19 +8,14 @@
       @touchmove="touchMove"
     >
       <div class="side-drawer-heading" @click="toggleDrawer">
-        <user-card-content :user="currentUser" :switcher="false" :hideBio="true" v-if="currentUser"/>
+        <UserCard :user="currentUser" :hideBio="true" v-if="currentUser"/>
         <div class="side-drawer-logo-wrapper" v-else>
           <img :src="logo"/>
           <span>{{sitename}}</span>
         </div>
       </div>
       <ul>
-        <li v-if="currentUser" @click="toggleDrawer">
+        <li v-if="!currentUser" @click="toggleDrawer">
-          <router-link :to="{ name: 'new-status', params: { username: currentUser.screen_name } }">
-            {{ $t("post_status.new_status") }}
-          </router-link>
-        </li>
-        <li v-else @click="toggleDrawer">
           <router-link :to="{ name: 'login' }">
             {{ $t("login.login") }}
           </router-link>
@@ -119,14 +114,14 @@
 }
 
 .side-drawer-container-open {
-  transition-delay: 0.0s;
+  transition: 0.35s;
-  transition-property: left;
+  transition-property: background-color;
+  background-color: rgba(0, 0, 0, 0.5);
 }
 
 .side-drawer-container-closed {
   left: -100%;
-  transition-delay: 0.5s;
+  background-color: rgba(0, 0, 0, 0);
-  transition-property: left;
 }
 
 .side-drawer-click-outside {
@@ -181,15 +176,6 @@
   display: flex;
   padding: 0;
   margin: 0;
-
-  .profile-panel-background {
-    border-radius: 0;
-    .panel-heading {
-      background: transparent;
-      flex-direction: column;
-      align-items: stretch;
-    }
-  }
 }
 
 .side-drawer ul {

src/components/status/status.js

@@ -3,7 +3,7 @@ import FavoriteButton from '../favorite_button/favorite_button.vue'
 import RetweetButton from '../retweet_button/retweet_button.vue'
 import DeleteButton from '../delete_button/delete_button.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
-import UserCardContent from '../user_card_content/user_card_content.vue'
+import UserCard from '../user_card/user_card.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import Gallery from '../gallery/gallery.vue'
 import LinkPreview from '../link-preview/link-preview.vue'
@@ -23,7 +23,7 @@ const Status = {
     'highlight',
     'compact',
     'replies',
-    'noReplyLinks',
+    'isPreview',
     'noHeading',
     'inlineExpanded'
   ],
@@ -259,7 +259,7 @@ const Status = {
     RetweetButton,
     DeleteButton,
     PostStatusForm,
-    UserCardContent,
+    UserCard,
     UserAvatar,
     Gallery,
     LinkPreview

src/components/status/status.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="status-el" v-if="!hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
-    <template v-if="muted && !noReplyLinks">
+    <template v-if="muted && !isPreview">
       <div class="media status container muted">
         <small>
           <router-link :to="userProfileLink">
@@ -13,7 +13,7 @@
     </template>
     <template v-else>
       <div v-if="retweet && !noHeading" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info">
-        <UserAvatar v-if="retweet" :betterShadow="betterShadow" :src="statusoid.user.profile_image_url_original"/>
+        <UserAvatar class="media-left" v-if="retweet" :betterShadow="betterShadow" :src="statusoid.user.profile_image_url_original"/>
         <div class="media-body faint">
           <span class="user-name">
             <router-link v-if="retweeterHtml" :to="retweeterProfileLink" v-html="retweeterHtml"/>
@@ -31,57 +31,67 @@
           </router-link>
         </div>
         <div class="status-body">
-          <div class="usercard media-body" v-if="userExpanded">
+          <UserCard :user="status.user" :rounded="true" :bordered="true" class="status-usercard" v-if="userExpanded"/>
-            <user-card-content :user="status.user" :switcher="false"></user-card-content>
+          <div v-if="!noHeading" class="media-heading">
-          </div>
+            <div class="heading-name-row">
-          <div v-if="!noHeading" class="media-body container media-heading">
+              <div class="name-and-account-name">
-            <div class="media-heading-left">
-              <div class="name-and-links">
                 <h4 class="user-name" v-if="status.user.name_html" v-html="status.user.name_html"></h4>
                 <h4 class="user-name" v-else>{{status.user.name}}</h4>
-                <span class="links">
+                <router-link class="account-name" :to="userProfileLink">
-                  <router-link :to="userProfileLink">
                   {{status.user.screen_name}}
                 </router-link>
-                  <span v-if="isReply" class="faint reply-info">
-                    <i class="icon-right-open"></i>
-                    <router-link :to="replyProfileLink">
-                      {{replyToName}}
-                    </router-link>
-                  </span>
-                  <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :aria-label="$t('tool_tip.reply')">
-                    <i class="button-icon icon-reply" @mouseenter="replyEnter(status.in_reply_to_status_id, $event)" @mouseout="replyLeave()"></i>
-                  </a>
-                </span>
               </div>
-              <h4 class="replies" v-if="inConversation && !noReplyLinks">
+
-                <small v-if="replies.length">Replies:</small>
+              <span class="heading-right">
-                <small class="reply-link" v-bind:key="reply.id" v-for="reply in replies">
+                <router-link class="timeago faint-link" :to="{ name: 'conversation', params: { id: status.id } }">
-                  <a href="#" @click.prevent="gotoOriginal(reply.id)" @mouseenter="replyEnter(reply.id, $event)" @mouseout="replyLeave()">{{reply.name}}&nbsp;</a>
-                </small>
-              </h4>
-            </div>
-            <div class="media-heading-right">
-              <router-link class="timeago" :to="{ name: 'conversation', params: { id: status.id } }">
                   <timeago :since="status.created_at" :auto-update="60"></timeago>
                 </router-link>
                 <div class="button-icon visibility-icon" v-if="status.visibility">
                   <i :class="visibilityIcon(status.visibility)" :title="status.visibility | capitalize"></i>
                 </div>
-              <a :href="status.external_url" target="_blank" v-if="!status.is_local" class="source_url" title="Source">
+                <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
                   <i class="button-icon icon-link-ext-alt"></i>
                 </a>
-              <template v-if="expandable">
+                <template v-if="expandable && !isPreview">
                   <a href="#" @click.prevent="toggleExpanded" title="Expand">
                     <i class="button-icon icon-plus-squared"></i>
                   </a>
                 </template>
                 <a href="#" @click.prevent="toggleMute" v-if="unmuted"><i class="button-icon icon-eye-off"></i></a>
+              </span>
+            </div>
+
+            <div class="heading-reply-row">
+              <div v-if="isReply" class="reply-to-and-accountname">
+                <a class="reply-to"
+                  href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)"
+                  :aria-label="$t('tool_tip.reply')"
+                  @mouseenter.prevent.stop="replyEnter(status.in_reply_to_status_id, $event)"
+                  @mouseleave.prevent.stop="replyLeave()"
+                >
+                  <i class="button-icon icon-reply" v-if="!isPreview"></i>
+                  <span class="faint-link reply-to-text">{{$t('status.reply_to')}}</span>
+                </a>
+                <router-link :to="replyProfileLink">
+                  {{replyToName}}
+                </router-link>
+                <span class="faint replies-separator" v-if="replies && replies.length">
+                  -
+                </span>
+              </div>
+              <div class="replies" v-if="inConversation && !isPreview">
+                <span class="faint" v-if="replies && replies.length">{{$t('status.replies_list')}}</span>
+                <span class="reply-link faint" v-if="replies" v-for="reply in replies">
+                  <a href="#" @click.prevent="gotoOriginal(reply.id)" @mouseenter="replyEnter(reply.id, $event)" @mouseout="replyLeave()">{{reply.name}}</a>
+                </span>
               </div>
             </div>
 
+
+          </div>
+
           <div v-if="showPreview" class="status-preview-container">
-            <status class="status-preview" v-if="preview" :noReplyLinks="true" :statusoid="preview" :compact=true></status>
+            <status class="status-preview" v-if="preview" :isPreview="true" :statusoid="preview" :compact=true></status>
             <div class="status-preview status-preview-loading" v-else>
               <i class="icon-spin4 animate-spin"></i>
             </div>
@@ -123,7 +133,7 @@
             <link-preview :card="status.card" :size="attachmentSize" :nsfw="nsfwClickthrough" />
           </div>
 
-          <div v-if="!noHeading && !noReplyLinks" class='status-actions media-body'>
+          <div v-if="!noHeading && !isPreview" class='status-actions media-body'>
             <div v-if="loggedIn">
               <a href="#" v-on:click.prevent="toggleReplying" :title="$t('tool_tip.reply')">
                 <i class="button-icon icon-reply" :class="{'icon-reply-active': replying}"></i>
@@ -147,6 +157,8 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
+$status-margin: 0.75em;
+
 .status-body {
   flex: 1;
   min-width: 0;
@@ -202,13 +214,16 @@
   }
 }
 
+.media-left {
+  margin-right: $status-margin;
+}
+
 .status-el {
   hyphens: auto;
   overflow-wrap: break-word;
   word-wrap: break-word;
   word-break: break-word;
   border-left-width: 0px;
-  line-height: 18px;
   min-width: 0;
   border-color: $fallback--border;
   border-color: var(--border, $fallback--border);
@@ -229,22 +244,33 @@
   .media-body {
     flex: 1;
     padding: 0;
-    margin: 0 0 0.25em 0.8em;
   }
 
-  .usercard {
+  .status-usercard {
-    margin-bottom: .7em
+    margin-bottom: $status-margin;
+  }
+
+  .user-name {
+    white-space: nowrap;
+    font-size: 14px;
+    overflow: hidden;
+    flex-shrink: 0;
+    max-width: 85%;
+    font-weight: bold;
+
+    img {
+      width: 14px;
+      height: 14px;
+      vertical-align: middle;
+      object-fit: contain
+    }
   }
 
   .media-heading {
-    flex-wrap: nowrap;
-    line-height: 18px;
-  }
-
-  .media-heading-left {
     padding: 0;
     vertical-align: bottom;
     flex-basis: 100%;
+    margin-bottom: 0.5em;
 
     a {
       display: inline-block;
@@ -254,83 +280,102 @@
     small {
       font-weight: lighter;
     }
-    h4 {
+
-      white-space: nowrap;
+    .heading-name-row {
-      font-size: 14px;
+      padding: 0;
-      margin-right: 0.25em;
+      display: flex;
+      justify-content: space-between;
+      line-height: 18px;
+
+      .name-and-account-name {
+        display: flex;
+        min-width: 0;
+      }
+
+      .user-name {
+        flex-shrink: 1;
+        margin-right: 0.4em;
         overflow: hidden;
         text-overflow: ellipsis;
       }
-    .name-and-links {
+
-      padding: 0;
+      .account-name {
-      flex: 1 0;
+        min-width: 1.6em;
+        margin-right: 0.4em;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        flex: 1 1 0;
+      }
+    }
+
+    .heading-right {
+      display: flex;
+      flex-shrink: 0;
+    }
+
+    .timeago {
+      margin-right: 0.2em;
+    }
+
+    .heading-reply-row {
+      align-content: baseline;
+      font-size: 12px;
+      line-height: 18px;
+      max-width: 100%;
       display: flex;
       flex-wrap: wrap;
-      align-items: baseline;
+      align-items: stretch;
 
-      .user-name {
-        margin-right: .45em;
-
-        img {
-          width: 14px;
-          height: 14px;
-          vertical-align: middle;
-          object-fit: contain
-        }
-      }
-    }
-
-    .links {
-      display: flex;
-      font-size: 12px;
-      color: $fallback--link;
-      color: var(--link, $fallback--link);
-      max-width: 100%;
       a {
         max-width: 100%;
         text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
       }
-      & > span {
+    }
-        text-overflow: ellipsis;
+
+    .reply-to-and-accountname {
+      display: flex;
+      height: 18px;
+      margin-right: 0.5em;
       overflow: hidden;
-        white-space: nowrap;
+      max-width: 100%;
-      }
+      .icon-reply {
-      & > a:last-child {
+        transform: scaleX(-1);
-        flex-shrink: 0;
       }
     }
+
     .reply-info {
       display: flex;
     }
+
+    .reply-to {
+      display: flex;
+    }
+
+    .reply-to-text {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin: 0 0.4em 0 0.2em;
+    }
+
+    .replies-separator {
+      margin-left: 0.4em;
+    }
+
     .replies {
-      line-height: 16px;
+      line-height: 18px;
-    }
-    .reply-link {
-      margin-right: 0.2em;
-    }
-  }
-
-  .media-heading-right {
-    display: inline-flex;
-    flex-shrink: 0;
-    flex-wrap: nowrap;
-    margin-left: .25em;
-    align-self: baseline;
-
-    .timeago {
-      margin-right: 0.2em;
       font-size: 12px;
-      align-self: last baseline;
+      display: flex;
+      flex-wrap: wrap;
+      & > * {
+        margin-right: 0.4em;
+      }
     }
 
-    > * {
+    .reply-link {
-      margin-left: 0.2em;
+      height: 17px;
-    }
-    a:hover i {
-      color: $fallback--text;
-      color: var(--text, $fallback--text);
     }
   }
 
@@ -366,14 +411,19 @@
   }
 
   .status-content {
-    margin-right: 0.5em;
     font-family: var(--postFont, sans-serif);
+    line-height: 1.4em;
 
     img, video {
       max-width: 100%;
       max-height: 400px;
       vertical-align: middle;
       object-fit: contain;
+
+      &.emoji {
+        width: 32px;
+        height: 32px;
+      }
     }
 
     blockquote {
@@ -390,9 +440,11 @@
     }
 
     p {
-      margin: 0;
+      margin: 0 0 1em 0;
-      margin-top: 0.2em;
+    }
-      margin-bottom: 0.5em;
+
+    p:last-child {
+      margin: 0 0 0 0;
     }
 
     h1 {
@@ -417,7 +469,7 @@
   }
 
   .retweet-info {
-    padding: 0.4em 0.6em 0 0.6em;
+    padding: 0.4em $status-margin;
     margin: 0;
 
     .avatar.still-image {
@@ -488,10 +540,10 @@
 .status-actions {
   width: 100%;
   display: flex;
+  margin-top: $status-margin;
 
   div, favorite-button {
-    padding-top: 0.25em;
+    max-width: 4em;
-    max-width: 6em;
     flex: 1;
   }
 }
@@ -517,9 +569,9 @@
 
 .status {
   display: flex;
-  padding: 0.6em;
+  padding: $status-margin;
   &.is-retweet {
-    padding-top: 0.1em;
+    padding-top: 0;
   }
 }
 

src/components/timeline/timeline.js

@@ -132,7 +132,9 @@ const Timeline = {
       }
       if (count > 0) {
         // only 'stream' them when you're scrolled to the top
-        if (window.pageYOffset < 15 &&
+        const doc = document.documentElement
+        const top = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0)
+        if (top < 15 &&
             !this.paused &&
             !(this.unfocused && this.$store.state.config.pauseOnUnfocused)
            ) {

src/components/user_card/user_card.js

@@ -4,7 +4,7 @@ import { requestFollow, requestUnfollow } from '../../services/follow_manipulate
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 export default {
-  props: [ 'user', 'switcher', 'selected', 'hideBio' ],
+  props: [ 'user', 'switcher', 'selected', 'hideBio', 'rounded', 'bordered' ],
   data () {
     return {
       followRequestInProgress: false,
@@ -16,7 +16,14 @@ export default {
     }
   },
   computed: {
-    headingStyle () {
+    classes () {
+      return [{
+        'user-card-rounded-t': this.rounded === 'top',  // set border-top-left-radius and border-top-right-radius
+        'user-card-rounded': this.rounded === true,     // set border-radius for all sides
+        'user-card-bordered': this.bordered === true    // set border for all sides
+      }]
+    },
+    style () {
       const color = this.$store.state.config.customTheme.colors
             ? this.$store.state.config.customTheme.colors.bg  // v2
             : this.$store.state.config.colors.bg // v1
@@ -93,22 +100,30 @@ export default {
   },
   methods: {
     followUser () {
+      const store = this.$store
       this.followRequestInProgress = true
-      requestFollow(this.user, this.$store).then(({sent}) => {
+      requestFollow(this.user, store).then(({sent}) => {
         this.followRequestInProgress = false
         this.followRequestSent = sent
       })
     },
     unfollowUser () {
+      const store = this.$store
       this.followRequestInProgress = true
-      requestUnfollow(this.user, this.$store).then(() => {
+      requestUnfollow(this.user, store).then(() => {
         this.followRequestInProgress = false
+        store.commit('removeStatus', { timeline: 'friends', userId: this.user.id })
       })
     },
     blockUser () {
       const store = this.$store
       store.state.api.backendInteractor.blockUser(this.user.id)
-        .then((blockedUser) => store.commit('addNewUsers', [blockedUser]))
+        .then((blockedUser) => {
+          store.commit('addNewUsers', [blockedUser])
+          store.commit('removeStatus', { timeline: 'friends', userId: this.user.id })
+          store.commit('removeStatus', { timeline: 'public', userId: this.user.id })
+          store.commit('removeStatus', { timeline: 'publicAndExternal', userId: this.user.id })
+        })
     },
     unblockUser () {
       const store = this.$store

src/components/user_card/user_card.vue

@@ -1,6 +1,6 @@
 <template>
-<div id="heading" class="profile-panel-background" :style="headingStyle">
+<div class="user-card" :class="classes" :style="style">
-  <div class="panel-heading text-center">
+  <div class="panel-heading">
     <div class='user-info'>
       <div class='container'>
         <router-link :to="userProfileLink(user)">
@@ -11,7 +11,7 @@
             <div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div>
             <div :title="user.name" class='user-name' v-else>{{user.name}}</div>
             <router-link :to="{ name: 'user-settings' }" v-if="!isOtherUser">
-              <i class="button-icon icon-cog usersettings" :title="$t('tool_tip.user_settings')"></i>
+              <i class="button-icon icon-pencil usersettings" :title="$t('tool_tip.user_settings')"></i>
             </router-link>
             <a :href="user.statusnet_profile_url" target="_blank" v-if="isOtherUser && !user.is_local">
               <i class="icon-link-ext usersettings"></i>
@@ -108,7 +108,7 @@
       </div>
     </div>
   </div>
-  <div class="panel-body profile-panel-body" v-if="!hideBio">
+  <div class="panel-body" v-if="!hideBio">
     <div v-if="!hideUserStatsLocal && switcher" class="user-counts">
       <div class="user-count" v-on:click.prevent="setProfileView('statuses')">
         <h5>{{ $t('user_card.statuses') }}</h5>
@@ -123,40 +123,75 @@
         <span>{{user.followers_count}}</span>
       </div>
     </div>
-    <p @click.prevent="linkClicked" v-if="!hideBio && user.description_html" class="profile-bio" v-html="user.description_html"></p>
+    <p @click.prevent="linkClicked" v-if="!hideBio && user.description_html" class="user-card-bio" v-html="user.description_html"></p>
-    <p v-else-if="!hideBio" class="profile-bio">{{ user.description }}</p>
+    <p v-else-if="!hideBio" class="user-card-bio">{{ user.description }}</p>
   </div>
 </div>
 </template>
 
-<script src="./user_card_content.js"></script>
+<script src="./user_card.js"></script>
 
 <style lang="scss">
 @import '../../_variables.scss';
 
-.profile-panel-background {
+.user-card {
   background-size: cover;
-  border-radius: $fallback--panelRadius;
-  border-radius: var(--panelRadius, $fallback--panelRadius);
   overflow: hidden;
 
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-
   .panel-heading {
     padding: .5em 0;
     text-align: center;
     box-shadow: none;
-  }
+    background: transparent;
+    flex-direction: column;
+    align-items: stretch;
   }
 
-.profile-panel-body {
+  .panel-body {
     word-wrap: break-word;
     background: linear-gradient(to bottom, rgba(0, 0, 0, 0), $fallback--bg 80%);
     background: linear-gradient(to bottom, rgba(0, 0, 0, 0), var(--bg, $fallback--bg) 80%);
+  }
 
-  .profile-bio {
+  p {
+    margin-bottom: 0;
+  }
+
+  &-bio {
     text-align: center;
+
+    img {
+      object-fit: contain;
+      vertical-align: middle;
+      max-width: 100%;
+      max-height: 400px;
+
+      .emoji {
+        width: 32px;
+        height: 32px;
+      }
+    }
+  }
+
+  // Modifiers
+
+  &-rounded-t {
+    border-top-left-radius: $fallback--panelRadius;
+    border-top-left-radius: var(--panelRadius, $fallback--panelRadius);
+    border-top-right-radius: $fallback--panelRadius;
+    border-top-right-radius: var(--panelRadius, $fallback--panelRadius);
+  }
+
+  &-rounded {
+    border-radius: $fallback--panelRadius;
+    border-radius: var(--panelRadius, $fallback--panelRadius);
+  }
+
+  &-bordered {
+    border-width: 1px;
+    border-style: solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
   }
 }
 
@@ -222,6 +257,7 @@
     overflow: hidden;
     flex: 1 1 auto;
     margin-right: 1em;
+    font-size: 15px;
 
     img {
       object-fit: contain;
@@ -392,25 +428,4 @@
     text-decoration: none;
   }
 }
-
-.usercard {
-  width: fill-available;
-  border-radius: $fallback--panelRadius;
-  border-radius: var(--panelRadius, $fallback--panelRadius);
-  border-style: solid;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
-  border-width: 1px;
-  overflow: hidden;
-
-  .panel-heading {
-    background: transparent;
-    flex-direction: column;
-    align-items: stretch;
-  }
-
-  p {
-    margin-bottom: 0;
-  }
-}
 </style>

src/components/user_panel/user_panel.js

@@ -1,6 +1,6 @@
 import LoginForm from '../login_form/login_form.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
-import UserCardContent from '../user_card_content/user_card_content.vue'
+import UserCard from '../user_card/user_card.vue'
 
 const UserPanel = {
   computed: {
@@ -9,7 +9,7 @@ const UserPanel = {
   components: {
     LoginForm,
     PostStatusForm,
-    UserCardContent
+    UserCard
   }
 }
 

src/components/user_panel/user_panel.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="user-panel">
     <div v-if='user' class="panel panel-default" style="overflow: visible;">
-      <user-card-content :user="user" :switcher="false" :hideBio="true"></user-card-content>
+      <UserCard :user="user" :hideBio="true" rounded="top"/>
       <div class="panel-footer">
         <post-status-form v-if='user'></post-status-form>
       </div>
@@ -11,13 +11,3 @@
 </template>
 
 <script src="./user_panel.js"></script>
-
-<style lang="scss">
-.user-panel {
-  .profile-panel-background .panel-heading {
-    background: transparent;
-    flex-direction: column;
-    align-items: stretch;
-  }
-}
-</style>

src/components/user_profile/user_profile.js

@@ -1,6 +1,6 @@
 import { compose } from 'vue-compose'
 import get from 'lodash/get'
-import UserCardContent from '../user_card_content/user_card_content.vue'
+import UserCard from '../user_card/user_card.vue'
 import FollowCard from '../follow_card/follow_card.vue'
 import Timeline from '../timeline/timeline.vue'
 import withLoadMore from '../../hocs/with_load_more/with_load_more'
@@ -141,10 +141,13 @@ const UserProfile = {
       }
       this.cleanUp()
       this.startUp()
+    },
+    $route () {
+      this.$refs.tabSwitcher.activateTab(0)()
     }
   },
   components: {
-    UserCardContent,
+    UserCard,
     Timeline,
     FollowerList,
     FriendList

src/components/user_profile/user_profile.vue

@@ -1,12 +1,8 @@
 <template>
 <div>
   <div v-if="user.id" class="user-profile panel panel-default">
-    <user-card-content
+    <UserCard :user="user" :switcher="true" :selected="timeline.viewing" rounded="top"/>
-      :user="user"
+    <tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
-      :switcher="true"
-      :selected="timeline.viewing"
-    />
-    <tab-switcher :renderOnlyFocused="true">
       <Timeline
         :label="$t('user_card.statuses')"
         :disabled="!user.statuses_count"
@@ -64,11 +60,6 @@
   flex: 2;
   flex-basis: 500px;
 
-  .profile-panel-background .panel-heading {
-    background: transparent;
-    flex-direction: column;
-    align-items: stretch;
-  }
   .userlist-placeholder {
     display: flex;
     justify-content: center;

src/components/user_settings/user_settings.js

@@ -157,8 +157,8 @@ const UserSettings = {
       }
       reader.readAsDataURL(file)
     },
-    submitAvatar (cropper) {
+    submitAvatar (cropper, file) {
-      const img = cropper.getCroppedCanvas().toDataURL('image/jpeg')
+      const img = cropper.getCroppedCanvas().toDataURL(file.type)
       return this.$store.state.api.backendInteractor.updateAvatar({ params: { img } }).then((user) => {
         if (!user.error) {
           this.$store.commit('addNewUsers', [user])

src/i18n/cs.json

@@ -0,0 +1,428 @@
+{
+  "chat": {
+    "title": "Chat"
+  },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Mediální proxy",
+    "scope_options": "Možnosti rozsahů",
+    "text_limit": "Textový limit",
+    "title": "Vlastnosti",
+    "who_to_follow": "Koho sledovat"
+  },
+  "finder": {
+    "error_fetching_user": "Chyba při načítání uživatele",
+    "find_user": "Najít uživatele"
+  },
+  "general": {
+    "apply": "Použít",
+    "submit": "Odeslat",
+    "more": "Více",
+    "generic_error": "Vyskytla se chyba",
+    "optional": "volitelné"
+  },
+  "image_cropper": {
+    "crop_picture": "Oříznout obrázek",
+    "save": "Uložit",
+    "cancel": "Zrušit"
+  },
+  "login": {
+    "login": "Přihlásit",
+    "description": "Přihlásit pomocí OAuth",
+    "logout": "Odhlásit",
+    "password": "Heslo",
+    "placeholder": "např. lain",
+    "register": "Registrovat",
+    "username": "Uživatelské jméno",
+    "hint": "Chcete-li se přidat do diskuze, přihlaste se"
+  },
+  "media_modal": {
+    "previous": "Předchozí",
+    "next": "Další"
+  },
+  "nav": {
+    "about": "O instanci",
+    "back": "Zpět",
+    "chat": "Místní chat",
+    "friend_requests": "Požadavky o sledování",
+    "mentions": "Zmínky",
+    "dms": "Přímé zprávy",
+    "public_tl": "Veřejná časová osa",
+    "timeline": "Časová osa",
+    "twkn": "Celá známá síť",
+    "user_search": "Hledání uživatelů",
+    "who_to_follow": "Koho sledovat",
+    "preferences": "Předvolby"
+  },
+  "notifications": {
+    "broken_favorite": "Neznámý příspěvek, hledám jej…",
+    "favorited_you": "si oblíbil/a váš příspěvek",
+    "followed_you": "vás nyní sleduje",
+    "load_older": "Načíst starší oznámení",
+    "notifications": "Oznámení",
+    "read": "Číst!",
+    "repeated_you": "zopakoval/a váš příspěvek",
+    "no_more_notifications": "Žádná další oznámení"
+  },
+  "post_status": {
+    "new_status": "Napsat nový příspěvek",
+    "account_not_locked_warning": "Váš účet není {0}. Kdokoliv vás může sledovat a vidět vaše příspěvky pouze pro sledující.",
+    "account_not_locked_warning_link": "uzamčen",
+    "attachments_sensitive": "Označovat přílohy jako citlivé",
+    "content_type": {
+      "plain_text": "Prostý text",
+      "text/html": "HTML",
+      "text/markdown": "Markdown"
+    },
+    "content_warning": "Předmět (volitelný)",
+    "default": "Právě jsem přistál v L.A.",
+    "direct_warning": "Tento příspěvek uvidí pouze všichni zmínění uživatelé.",
+    "posting": "Přispívání",
+    "scope": {
+      "direct": "Přímý - Poslat pouze zmíněným uživatelům",
+      "private": "Pouze pro sledující - Poslat pouze sledujícím",
+      "public": "Veřejný - Poslat na veřejné časové osy",
+      "unlisted": "Neuvedený - Neposlat na veřejné časové osy"
+    }
+  },
+  "registration": {
+    "bio": "O vás",
+    "email": "E-mail",
+    "fullname": "Zobrazované jméno",
+    "password_confirm": "Potvrzení hesla",
+    "registration": "Registrace",
+    "token": "Token pozvánky",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Kliknutím na obrázek získáte novou CAPTCHA",
+    "username_placeholder": "např. lain",
+    "fullname_placeholder": "např. Lain Iwakura",
+    "bio_placeholder": "např.\nNazdar, jsem Lain\nJsem anime dívka žijící v příměstském Japonsku. Možná mě znáte z Wired.",
+    "validations": {
+      "username_required": "nemůže být prázdné",
+      "fullname_required": "nemůže být prázdné",
+      "email_required": "nemůže být prázdný",
+      "password_required": "nemůže být prázdné",
+      "password_confirmation_required": "nemůže být prázdné",
+      "password_confirmation_match": "musí být stejné jako heslo"
+    }
+  },
+  "settings": {
+    "app_name": "Název aplikace",
+    "attachmentRadius": "Přílohy",
+    "attachments": "Přílohy",
+    "autoload": "Povolit automatické načítání při rolování dolů",
+    "avatar": "Avatar",
+    "avatarAltRadius": "Avatary (oznámení)",
+    "avatarRadius": "Avatary",
+    "background": "Pozadí",
+    "bio": "O vás",
+    "blocks_tab": "Blokování",
+    "btnRadius": "Tlačítka",
+    "cBlue": "Modrá (Odpovědět, sledovat)",
+    "cGreen": "Zelená (Zopakovat)",
+    "cOrange": "Oranžová (Oblíbit)",
+    "cRed": "Červená (Zrušit)",
+    "change_password": "Změnit heslo",
+    "change_password_error": "Při změně vašeho hesla se vyskytla chyba.",
+    "changed_password": "Heslo bylo úspěšně změněno!",
+    "collapse_subject": "Zabalit příspěvky s předměty",
+    "composing": "Komponování",
+    "confirm_new_password": "Potvrďte nové heslo",
+    "current_avatar": "Váš současný avatar",
+    "current_password": "Současné heslo",
+    "current_profile_banner": "Váš současný profilový banner",
+    "data_import_export_tab": "Import/export dat",
+    "default_vis": "Výchozí rozsah viditelnosti",
+    "delete_account": "Smazat účet",
+    "delete_account_description": "Trvale smaže váš účet a všechny vaše příspěvky.",
+    "delete_account_error": "Při mazání vašeho účtu nastala chyba. Pokud tato chyba bude trvat, kontaktujte prosím admministrátora vaší instance.",
+    "delete_account_instructions": "Pro potvrzení smazání účtu napište své heslo do pole níže.",
+    "avatar_size_instruction": "Doporučená minimální velikost pro avatarové obrázky je 150x150 pixelů.",
+    "export_theme": "Uložit přednastavení",
+    "filtering": "Filtrování",
+    "filtering_explanation": "Všechny příspěvky obsahující tato slova budou skryty. Napište jedno slovo na každý řádek",
+    "follow_export": "Export sledovaných",
+    "follow_export_button": "Exportovat vaše sledované do souboru CSV",
+    "follow_export_processing": "Zpracovávám, brzy si budete moci stáhnout váš soubor",
+    "follow_import": "Import sledovaných",
+    "follow_import_error": "Chyba při importování sledovaných",
+    "follows_imported": "Sledovaní importováni! Jejich zpracování bude chvilku trvat.",
+    "foreground": "Popředí",
+    "general": "Obecné",
+    "hide_attachments_in_convo": "Skrývat přílohy v konverzacích",
+    "hide_attachments_in_tl": "Skrývat přílohy v časové ose",
+    "max_thumbnails": "Maximální počet miniatur na příspěvek",
+    "hide_isp": "Skrýt panel specifický pro instanci",
+    "preload_images": "Přednačítat obrázky",
+    "use_one_click_nsfw": "Otevírat citlivé přílohy pouze jedním kliknutím",
+    "hide_post_stats": "Skrývat statistiky příspěvků (např. počet oblíbení)",
+    "hide_user_stats": "Skrývat statistiky uživatelů (např. počet sledujících)",
+    "hide_filtered_statuses": "Skrývat filtrované příspěvky",
+    "import_followers_from_a_csv_file": "Importovat sledované ze souboru CSV",
+    "import_theme": "Načíst přednastavení",
+    "inputRadius": "Vstupní pole",
+    "checkboxRadius": "Zaškrtávací pole",
+    "instance_default": "(výchozí: {value})",
+    "instance_default_simple": "(výchozí)",
+    "interface": "Rozhraní",
+    "interfaceLanguage": "Jazyk rozhraní",
+    "invalid_theme_imported": "Zvolený soubor není podporovaný motiv Pleroma. Nebyly provedeny žádné změny s vaším motivem.",
+    "limited_availability": "Nedostupné ve vašem prohlížeči",
+    "links": "Odkazy",
+    "lock_account_description": "Omezit váš účet pouze na schválené sledující",
+    "loop_video": "Opakovat videa",
+    "loop_video_silent_only": "Opakovat pouze videa beze zvuku (t.j. „GIFy“ na Mastodonu)",
+    "mutes_tab": "Ignorování",
+    "play_videos_in_modal": "Přehrávat videa přímo v prohlížeči médií",
+    "use_contain_fit": "Neořezávat přílohu v miniaturách",
+    "name": "Jméno",
+    "name_bio": "Jméno a popis",
+    "new_password": "Nové heslo",
+    "notification_visibility": "Typy oznámení k zobrazení",
+    "notification_visibility_follows": "Sledující",
+    "notification_visibility_likes": "Oblíbení",
+    "notification_visibility_mentions": "Zmínky",
+    "notification_visibility_repeats": "Zopakování",
+    "no_rich_text_description": "Odstranit ze všech příspěvků formátování textu",
+    "no_blocks": "Žádná blokování",
+    "no_mutes": "Žádná ignorování",
+    "hide_follows_description": "Nezobrazovat, koho sleduji",
+    "hide_followers_description": "Nezobrazovat, kdo mě sleduje",
+    "show_admin_badge": "Zobrazovat v mém profilu odznak administrátora",
+    "show_moderator_badge": "Zobrazovat v mém profilu odznak moderátora",
+    "nsfw_clickthrough": "Povolit prokliknutelné skrývání citlivých příloh",
+    "oauth_tokens": "Tokeny OAuth",
+    "token": "Token",
+    "refresh_token": "Obnovit token",
+    "valid_until": "Platný do",
+    "revoke_token": "Odvolat",
+    "panelRadius": "Panely",
+    "pause_on_unfocused": "Pozastavit streamování, pokud není záložka prohlížeče v soustředění",
+    "presets": "Přednastavení",
+    "profile_background": "Profilové pozadí",
+    "profile_banner": "Profilový banner",
+    "profile_tab": "Profil",
+    "radii_help": "Nastavit zakulacení rohů rozhraní (v pixelech)",
+    "replies_in_timeline": "Odpovědi v časové ose",
+    "reply_link_preview": "Povolit náhledy odkazu pro odpověď při přejetí myši",
+    "reply_visibility_all": "Zobrazit všechny odpovědi",
+    "reply_visibility_following": "Zobrazit pouze odpovědi směřované na mě nebo uživatele, které sleduji",
+    "reply_visibility_self": "Zobrazit pouze odpovědi směřované na mě",
+    "saving_err": "Chyba při ukládání nastavení",
+    "saving_ok": "Nastavení uložena",
+    "security_tab": "Bezpečnost",
+    "scope_copy": "Kopírovat rozsah při odpovídání (přímé zprávy jsou vždy kopírovány)",
+    "set_new_avatar": "Nastavit nový avatar",
+    "set_new_profile_background": "Nastavit nové profilové pozadí",
+    "set_new_profile_banner": "Nastavit nový profilový banner",
+    "settings": "Nastavení",
+    "subject_input_always_show": "Vždy zobrazit pole pro předmět",
+    "subject_line_behavior": "Kopírovat předmět při odpovídání",
+    "subject_line_email": "Jako u e-mailu: „re: předmět“",
+    "subject_line_mastodon": "Jako u Mastodonu: zkopírovat tak, jak je",
+    "subject_line_noop": "Nekopírovat",
+    "post_status_content_type": "Publikovat typ obsahu příspěvku",
+    "stop_gifs": "Přehrávat GIFy při přejetí myši",
+    "streaming": "Povolit automatické streamování nových příspěvků při rolování nahoru",
+    "text": "Text",
+    "theme": "Motiv",
+    "theme_help": "Použijte hexadecimální barevné kódy (#rrggbb) pro přizpůsobení vašeho barevného motivu.",
+    "theme_help_v2_1": "Zaškrtnutím pole můžete také přepsat barvy a průhlednost některých komponentů, pro smazání všech přednastavení použijte tlačítko „Smazat vše“.",
+    "theme_help_v2_2": "Ikony pod některými položkami jsou indikátory kontrastu pozadí/textu, pro detailní informace nad nimi přejeďte myší. Prosím berte na vědomí, že při používání kontrastu průhlednosti ukazují indikátory nejhorší možný případ.",
+    "tooltipRadius": "Popisky/upozornění",
+    "upload_a_photo": "Nahrát fotku",
+    "user_settings": "Uživatelská nastavení",
+    "values": {
+      "false": "ne",
+      "true": "ano"
+    },
+    "notifications": "Oznámení",
+    "enable_web_push_notifications": "Povolit webová push oznámení",
+    "style": {
+      "switcher": {
+        "keep_color": "Ponechat barvy",
+        "keep_shadows": "Ponechat stíny",
+        "keep_opacity": "Ponechat průhlednost",
+        "keep_roundness": "Ponechat kulatost",
+        "keep_fonts": "Keep fonts",
+        "save_load_hint": "Možnosti „Ponechat“ dočasně ponechávají aktuálně nastavené možností při volení či nahrávání motivů, také tyto možnosti ukládají při exportování motivu. Pokud není žádné pole zaškrtnuto, uloží export motivu všechno.",
+        "reset": "Resetovat",
+        "clear_all": "Vymazat vše",
+        "clear_opacity": "Vymazat průhlednost"
+      },
+      "common": {
+        "color": "Barva",
+        "opacity": "Průhlednost",
+        "contrast": {
+          "hint": "Poměr kontrastu je {ratio}, {level} {context}",
+          "level": {
+            "aa": "splňuje směrnici úrovně AA  (minimální)",
+            "aaa": "splňuje směrnici úrovně AAA (doporučováno)",
+            "bad": "nesplňuje žádné směrnice přístupnosti"
+          },
+          "context": {
+            "18pt": "pro velký (18+ bodů) text",
+            "text": "pro text"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Obvyklé",
+        "main": "Obvyklé barvy",
+        "foreground_hint": "Pro detailnější kontrolu viz záložka „Pokročilé“",
+        "rgbo": "Ikony, odstíny, odznaky"
+      },
+      "advanced_colors": {
+        "_tab_label": "Pokročilé",
+        "alert": "Pozadí upozornění",
+        "alert_error": "Chyba",
+        "badge": "Pozadí odznaků",
+        "badge_notification": "Oznámení",
+        "panel_header": "Záhlaví panelu",
+        "top_bar": "Vrchní pruh",
+        "borders": "Okraje",
+        "buttons": "Tlačítka",
+        "inputs": "Vstupní pole",
+        "faint_text": "Vybledlý text"
+      },
+      "radii": {
+        "_tab_label": "Kulatost"
+      },
+      "shadows": {
+        "_tab_label": "Stín a osvětlení",
+        "component": "Komponent",
+        "override": "Přepsat",
+        "shadow_id": "Stín #{value}",
+        "blur": "Rozmazání",
+        "spread": "Rozsah",
+        "inset": "Vsazení",
+        "hint": "Pro stíny můžete také použít --variable jako hodnotu barvy pro použití proměnných CSS3. Prosím berte na vědomí, že nastavení průhlednosti v tomto případě nebude fungovat.",
+        "filter_hint": {
+          "always_drop_shadow": "Varování, tento stín vždy používá {0}, když to prohlížeč podporuje.",
+          "drop_shadow_syntax": "{0} nepodporuje parametr {1} a klíčové slovo {2}.",
+          "avatar_inset": "Prosím berte na vědomí, že kombinování vsazených i nevsazených stínů u avatarů může u průhledných avatarů dát neočekávané výsledky.",
+          "spread_zero": "Stíny s rozsahem > 0 se zobrazí, jako kdyby byl rozsah nastaven na nulu",
+          "inset_classic": "Vsazené stíny budou používat {0}"
+        },
+        "components": {
+          "panel": "Panel",
+          "panelHeader": "Záhlaví panelu",
+          "topBar": "Vrchní pruh",
+          "avatar": "Avatar uživatele (v zobrazení profilu)",
+          "avatarStatus": "Avatar uživatele (v zobrazení příspěvku)",
+          "popup": "Vyskakovací okna a popisky",
+          "button": "Tlačítko",
+          "buttonHover": "Tlačítko (přejetí myši)",
+          "buttonPressed": "Tlačítko (stisknuto)",
+          "buttonPressedHover": "Button (stisknuto+přejetí myši)",
+          "input": "Vstupní pole"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Písma",
+        "help": "Zvolte písmo, které bude použito pro prvky rozhraní. U možnosti „vlastní“ musíte zadat přesný název písma tak, jak se zobrazuje v systému.",
+        "components": {
+          "interface": "Rozhraní",
+          "input": "Vstupní pole",
+          "post": "Text příspěvků",
+          "postCode": "Neproporcionální text v příspěvku (formátovaný text)"
+        },
+        "family": "Název písma",
+        "size": "Velikost (v pixelech)",
+        "weight": "Tloušťka",
+        "custom": "Vlastní"
+      },
+      "preview": {
+        "header": "Náhled",
+        "content": "Obsah",
+        "error": "Příklad chyby",
+        "button": "Tlačítko",
+        "text": "Spousta dalšího {0} a {1}",
+        "mono": "obsahu",
+        "input": "Právě jsem přistál v L.A.",
+        "faint_link": "pomocný manuál",
+        "fine_print": "Přečtěte si náš {0} a nenaučte se nic užitečného!",
+        "header_faint": "Tohle je v pohodě",
+        "checkbox": "Pročetl/a jsem podmínky používání",
+        "link": "hezký malý odkaz"
+      }
+    }
+  },
+  "timeline": {
+    "collapse": "Zabalit",
+    "conversation": "Konverzace",
+    "error_fetching": "Chyba při načítání aktualizací",
+    "load_older": "Načíst starší příspěvky",
+    "no_retweet_hint": "Příspěvek je označen jako pouze pro sledující či přímý a nemůže být zopakován",
+    "repeated": "zopakoval/a",
+    "show_new": "Zobrazit nové",
+    "up_to_date": "Aktuální",
+    "no_more_statuses": "Žádné další příspěvky",
+    "no_statuses": "Žádné příspěvky"
+  },
+  "status": {
+    "reply_to": "Odpověď uživateli",
+    "replies_list": "Odpovědi:"
+  },
+
+  "user_card": {
+    "approve": "Schválit",
+    "block": "Blokovat",
+    "blocked": "Blokován/a!",
+    "deny": "Zamítnout",
+    "favorites": "Oblíbené",
+    "follow": "Sledovat",
+    "follow_sent": "Požadavek odeslán!",
+    "follow_progress": "Odeslílám požadavek…",
+    "follow_again": "Odeslat požadavek znovu?",
+    "follow_unfollow": "Přestat sledovat",
+    "followees": "Sledovaní",
+    "followers": "Sledující",
+    "following": "Sledujete!",
+    "follows_you": "Sleduje vás!",
+    "its_you": "Jste to vy!",
+    "media": "Média",
+    "mute": "Ignorovat",
+    "muted": "Ignorován/a",
+    "per_day": "za den",
+    "remote_follow": "Vzdálené sledování",
+    "statuses": "Příspěvky",
+    "unblock": "Odblokovat",
+    "unblock_progress": "Odblokuji…",
+    "block_progress": "Blokuji…",
+    "unmute": "Přestat ignorovat",
+    "unmute_progress": "Ruším ignorování…",
+    "mute_progress": "Ignoruji…"
+  },
+  "user_profile": {
+    "timeline_title": "Uživatelská časová osa",
+    "profile_does_not_exist": "Omlouváme se, tento profil neexistuje.",
+    "profile_loading_error": "Omlouváme se, při načítání tohoto profilu se vyskytla chyba."
+  },
+  "who_to_follow": {
+    "more": "Více",
+    "who_to_follow": "Koho sledovat"
+  },
+  "tool_tip": {
+    "media_upload": "Nahrát média",
+    "repeat": "Zopakovat",
+    "reply": "Odpovědět",
+    "favorite": "Oblíbit",
+    "user_settings": "Uživatelské nastavení"
+  },
+  "upload":{
+    "error": {
+      "base": "Nahrávání selhalo.",
+      "file_too_big": "Soubor je příliš velký [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Zkuste to znovu později"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  }
+}

src/i18n/en.json

@@ -71,7 +71,9 @@
     "account_not_locked_warning_link": "locked",
     "attachments_sensitive": "Mark attachments as sensitive",
     "content_type": {
-      "plain_text": "Plain text"
+      "text/plain": "Plain text",
+      "text/html": "HTML",
+      "text/markdown": "Markdown"
     },
     "content_warning": "Subject (optional)",
     "default": "Just landed in L.A.",
@@ -221,7 +223,6 @@
     "subject_line_mastodon": "Like mastodon: copy as is",
     "subject_line_noop": "Do not copy",
     "post_status_content_type": "Post status content type",
-    "status_content_type_plain": "Plain text",
     "stop_gifs": "Play-on-hover GIFs",
     "streaming": "Enable automatic streaming of new posts when scrolled to the top",
     "text": "Text",
@@ -360,6 +361,10 @@
     "no_more_statuses": "No more statuses",
     "no_statuses": "No statuses"
   },
+  "status": {
+    "reply_to": "Reply to",
+    "replies_list": "Replies:"
+  },
   "user_card": {
     "approve": "Approve",
     "block": "Block",

src/i18n/eo.json

@@ -2,118 +2,420 @@
   "chat": {
     "title": "Babilejo"
   },
+  "features_panel": {
+    "chat": "Babilejo",
+    "gopher": "Gopher",
+    "media_proxy": "Aŭdvidaĵa prokurilo",
+    "scope_options": "Agordoj de amplekso",
+    "text_limit": "Teksta limo",
+    "title": "Funkcioj",
+    "who_to_follow": "Kiun aboni"
+  },
   "finder": {
     "error_fetching_user": "Eraro alportante uzanton",
     "find_user": "Trovi uzanton"
   },
   "general": {
     "apply": "Apliki",
-    "submit": "Sendi"
+    "submit": "Sendi",
+    "more": "Pli",
+    "generic_error": "Eraro okazis",
+    "optional": "Malnepra"
+  },
+  "image_cropper": {
+    "crop_picture": "Tondi bildon",
+    "save": "Konservi",
+    "cancel": "Nuligi"
   },
   "login": {
-    "login": "Ensaluti",
+    "login": "Saluti",
-    "logout": "Elsaluti",
+    "description": "Saluti per OAuth",
+    "logout": "Adiaŭi",
     "password": "Pasvorto",
     "placeholder": "ekz. lain",
     "register": "Registriĝi",
-    "username": "Salutnomo"
+    "username": "Salutnomo",
+    "hint": "Salutu por partopreni la diskutadon"
+  },
+  "media_modal": {
+    "previous": "Antaŭa",
+    "next": "Sekva"
   },
   "nav": {
+    "about": "Pri",
+    "back": "Reen",
     "chat": "Loka babilejo",
+    "friend_requests": "Abonaj petoj",
     "mentions": "Mencioj",
+    "dms": "Rektaj mesaĝoj",
     "public_tl": "Publika tempolinio",
     "timeline": "Tempolinio",
-    "twkn": "La tuta konata reto"
+    "twkn": "La tuta konata reto",
+    "user_search": "Serĉi uzantojn",
+    "who_to_follow": "Kiun aboni",
+    "preferences": "Agordoj"
   },
   "notifications": {
+    "broken_favorite": "Nekonata stato, serĉante ĝin…",
     "favorited_you": "ŝatis vian staton",
     "followed_you": "ekabonis vin",
+    "load_older": "Enlegi pli malnovajn sciigojn",
     "notifications": "Sciigoj",
     "read": "Legite!",
-    "repeated_you": "ripetis vian staton"
+    "repeated_you": "ripetis vian staton",
+    "no_more_notifications": "Neniuj pliaj sciigoj"
   },
   "post_status": {
+    "new_status": "Afiŝi novan staton",
+    "account_not_locked_warning": "Via konto ne estas {0}. Iu ajn povas vin aboni por vidi viajn afiŝoj nur por abonantoj.",
+    "account_not_locked_warning_link": "ŝlosita",
+    "attachments_sensitive": "Marki kunsendaĵojn kiel konsternajn",
+    "content_type": {
+      "plain_text": "Plata teksto"
+    },
+    "content_warning": "Temo (malnepra)",
     "default": "Ĵus alvenis al la Universala Kongreso!",
-    "posting": "Afiŝante"
+    "direct_warning": "Ĉi tiu afiŝo estos videbla nur por ĉiuj menciitaj uzantoj.",
+    "posting": "Afiŝante",
+    "scope": {
+      "direct": "Rekta – Afiŝi nur al menciitaj uzantoj",
+      "private": "Nur abonantoj – Afiŝi nur al abonantoj",
+      "public": "Publika – Afiŝi al publikaj tempolinioj",
+      "unlisted": "Nelistigita – Ne afiŝi al publikaj tempolinioj"
+    }
   },
   "registration": {
     "bio": "Priskribo",
     "email": "Retpoŝtadreso",
     "fullname": "Vidiga nomo",
     "password_confirm": "Konfirmo de pasvorto",
-    "registration": "Registriĝo"
+    "registration": "Registriĝo",
+    "token": "Invita ĵetono",
+    "captcha": "TESTO DE HOMECO",
+    "new_captcha": "Alklaku la bildon por akiri novan teston",
+    "username_placeholder": "ekz. lain",
+    "fullname_placeholder": "ekz. Lain Iwakura",
+    "bio_placeholder": "ekz.\nSaluton, mi estas Lain\nMi estas animea knabino vivante en Japanujo. Eble vi konas min de la retejo « Wired ».",
+    "validations": {
+      "username_required": "ne povas resti malplena",
+      "fullname_required": "ne povas resti malplena",
+      "email_required": "ne povas resti malplena",
+      "password_required": "ne povas resti malplena",
+      "password_confirmation_required": "ne povas resti malplena",
+      "password_confirmation_match": "samu la pasvorton"
+    }
   },
   "settings": {
+    "app_name": "Nomo de aplikaĵo",
     "attachmentRadius": "Kunsendaĵoj",
     "attachments": "Kunsendaĵoj",
-    "autoload": "Ŝalti memfaran ŝarĝadon ĉe subo de paĝo",
+    "autoload": "Ŝalti memfaran enlegadon ĉe subo de paĝo",
     "avatar": "Profilbildo",
     "avatarAltRadius": "Profilbildoj (sciigoj)",
     "avatarRadius": "Profilbildoj",
     "background": "Fono",
     "bio": "Priskribo",
+    "blocks_tab": "Baroj",
     "btnRadius": "Butonoj",
     "cBlue": "Blua (Respondo, abono)",
     "cGreen": "Verda (Kunhavigo)",
     "cOrange": "Oranĝa (Ŝato)",
     "cRed": "Ruĝa (Nuligo)",
+    "change_password": "Ŝanĝi pasvorton",
+    "change_password_error": "Okazis eraro dum ŝanĝo de via pasvorto.",
+    "changed_password": "Pasvorto sukcese ŝanĝiĝis!",
+    "collapse_subject": "Maletendi afiŝojn kun temoj",
+    "composing": "Verkante",
+    "confirm_new_password": "Konfirmu novan pasvorton",
     "current_avatar": "Via nuna profilbildo",
+    "current_password": "Nuna pasvorto",
     "current_profile_banner": "Via nuna profila rubando",
+    "data_import_export_tab": "Enporto / Elporto de datenoj",
+    "default_vis": "Implicita videbleca amplekso",
+    "delete_account": "Forigi konton",
+    "delete_account_description": "Por ĉiam forigi vian konton kaj ĉiujn viajn mesaĝojn",
+    "delete_account_error": "Okazis eraro dum forigo de via kanto. Se tio daŭre okazados, bonvolu kontakti la administranton de via nodo.",
+    "delete_account_instructions": "Entajpu sube vian pasvorton por konfirmi forigon de konto.",
+    "avatar_size_instruction": "La rekomendata malpleja grando de profilbildoj estas 150×150 bilderoj.",
+    "export_theme": "Konservi antaŭagordon",
     "filtering": "Filtrado",
-    "filtering_explanation": "Ĉiuj statoj kun tiuj ĉi vortoj silentiĝos, po unu linie",
+    "filtering_explanation": "Ĉiuj statoj kun tiuj ĉi vortoj silentiĝos, po unu linio",
+    "follow_export": "Abona elporto",
+    "follow_export_button": "Elporti viajn abonojn al CSV-dosiero",
+    "follow_export_processing": "Traktante; baldaŭ vi ricevos peton elŝuti la dosieron",
     "follow_import": "Abona enporto",
     "follow_import_error": "Eraro enportante abonojn",
     "follows_imported": "Abonoj enportiĝis! Traktado daŭros iom.",
     "foreground": "Malfono",
+    "general": "Ĝenerala",
     "hide_attachments_in_convo": "Kaŝi kunsendaĵojn en interparoloj",
     "hide_attachments_in_tl": "Kaŝi kunsendaĵojn en tempolinio",
+    "max_thumbnails": "Plej multa nombro da bildetoj po afiŝo",
+    "hide_isp": "Kaŝi nodo-propran breton",
+    "preload_images": "Antaŭ-enlegi bildojn",
+    "use_one_click_nsfw": "Malfermi konsternajn kunsendaĵojn per nur unu klako",
+    "hide_post_stats": "Kaŝi statistikon de afiŝoj (ekz. nombron da ŝatoj)",
+    "hide_user_stats": "Kaŝi statistikon de uzantoj (ekz. nombron da abonantoj)",
+    "hide_filtered_statuses": "Kaŝi filtritajn statojn",
     "import_followers_from_a_csv_file": "Enporti abonojn el CSV-dosiero",
+    "import_theme": "Enlegi antaŭagordojn",
+    "inputRadius": "Enigaj kampoj",
+    "checkboxRadius": "Markbutonoj",
+    "instance_default": "(implicita: {value})",
+    "instance_default_simple": "(implicita)",
+    "interface": "Fasado",
+    "interfaceLanguage": "Lingvo de fasado",
+    "invalid_theme_imported": "La elektita dosiero ne estas subtenata haŭto de Pleromo. Neniuj ŝanĝoj al via haŭto okazis.",
+    "limited_availability": "Nehavebla en via foliumilo",
     "links": "Ligiloj",
+    "lock_account_description": "Limigi vian konton al nur abonantoj aprobitaj",
+    "loop_video": "Ripetadi filmojn",
+    "loop_video_silent_only": "Ripetadi nur filmojn sen sono (ekz. la \"GIF-ojn\" de Mastodon)",
+    "mutes_tab": "Silentigoj",
+    "play_videos_in_modal": "Ludi filmojn rekte en la aŭdvidaĵa spektilo",
+    "use_contain_fit": "Ne tondi la kunsendaĵon en bildetoj",
     "name": "Nomo",
     "name_bio": "Nomo kaj priskribo",
+    "new_password": "Nova pasvorto",
+    "notification_visibility": "Montrotaj specoj de sciigoj",
+    "notification_visibility_follows": "Abonoj",
+    "notification_visibility_likes": "Ŝatoj",
+    "notification_visibility_mentions": "Mencioj",
+    "notification_visibility_repeats": "Ripetoj",
+    "no_rich_text_description": "Forigi riĉtekstajn formojn de ĉiuj afiŝoj",
+    "no_blocks": "Neniuj baroj",
+    "no_mutes": "Neniuj silentigoj",
+    "hide_follows_description": "Ne montri kiun mi sekvas",
+    "hide_followers_description": "Ne montri kiu min sekvas",
+    "show_admin_badge": "Montri la insignon de administranto en mia profilo",
+    "show_moderator_badge": "Montri la insignon de kontrolanto en mia profilo",
     "nsfw_clickthrough": "Ŝalti traklakan kaŝon de konsternaj kunsendaĵoj",
-    "panelRadius": "Paneloj",
+    "oauth_tokens": "Ĵetonoj de OAuth",
+    "token": "Ĵetono",
+    "refresh_token": "Ĵetono de novigo",
+    "valid_until": "Valida ĝis",
+    "revoke_token": "Senvalidigi",
+    "panelRadius": "Bretoj",
+    "pause_on_unfocused": "Paŭzigi elsendfluon kiam langeto ne estas fokusata",
     "presets": "Antaŭagordoj",
     "profile_background": "Profila fono",
     "profile_banner": "Profila rubando",
-    "radii_help": "Agordi fasadan rondigon de randoj (rastrumere)",
+    "profile_tab": "Profilo",
-    "reply_link_preview": "Ŝalti respond-ligilan antaŭvidon dum ŝvebo",
+    "radii_help": "Agordi fasadan rondigon de randoj (bildere)",
+    "replies_in_timeline": "Respondoj en tempolinio",
+    "reply_link_preview": "Ŝalti respond-ligilan antaŭvidon dum musa ŝvebo",
+    "reply_visibility_all": "Montri ĉiujn respondojn",
+    "reply_visibility_following": "Montri nur respondojn por mi aŭ miaj abonatoj",
+    "reply_visibility_self": "Montri nur respondojn por mi",
+    "saving_err": "Eraro dum konservo de agordoj",
+    "saving_ok": "Agordoj konserviĝis",
+    "security_tab": "Sekureco",
+    "scope_copy": "Kopii amplekson por respondo (rektaj mesaĝoj ĉiam kopiiĝas)",
     "set_new_avatar": "Agordi novan profilbildon",
     "set_new_profile_background": "Agordi novan profilan fonon",
     "set_new_profile_banner": "Agordi novan profilan rubandon",
     "settings": "Agordoj",
-    "stop_gifs": "Movi GIF-bildojn dum ŝvebo",
+    "subject_input_always_show": "Ĉiam montri teman kampon",
+    "subject_line_behavior": "Kopii temon por respondo",
+    "subject_line_email": "Kiel retpoŝto: \"re: temo\"",
+    "subject_line_mastodon": "Kiel Mastodon: kopii senŝanĝe",
+    "subject_line_noop": "Ne kopii",
+    "post_status_content_type": "Afiŝi specon de la enhavo de la stato",
+    "stop_gifs": "Movi GIF-bildojn dum musa ŝvebo",
     "streaming": "Ŝalti memfaran fluigon de novaj afiŝoj ĉe la supro de la paĝo",
     "text": "Teksto",
-    "theme": "Etoso",
+    "theme": "Haŭto",
-    "theme_help": "Uzu deksesumajn kolorkodojn (#rrvvbb) por adapti vian koloran etoson.",
+    "theme_help": "Uzu deksesumajn kolorkodojn (#rrvvbb) por adapti vian koloran haŭton.",
+    "theme_help_v2_1": "Vi ankaŭ povas superagordi la kolorojn kaj travideblecon de kelkaj eroj per marko de la markbutono; uzu la butonon \"Vakigi ĉion\" por forigi ĉîujn superagordojn.",
+    "theme_help_v2_2": "Bildsimboloj sub kelkaj eroj estas indikiloj de kontrasto inter fono kaj teksto; muse ŝvebu por detalaj informoj. Bonvolu memori, ke la indikilo montras la plej malbonan okazeblon dum sia uzo.",
     "tooltipRadius": "Ŝpruchelpiloj/avertoj",
-    "user_settings": "Uzantaj agordoj"
+    "upload_a_photo": "Alŝuti foton",
+    "user_settings": "Agordoj de uzanto",
+    "values": {
+      "false": "ne",
+      "true": "jes"
+    },
+    "notifications": "Sciigoj",
+    "enable_web_push_notifications": "Ŝalti retajn puŝajn sciigojn",
+    "style": {
+      "switcher": {
+        "keep_color": "Konservi kolorojn",
+        "keep_shadows": "Konservi ombrojn",
+        "keep_opacity": "Konservi maltravideblecon",
+        "keep_roundness": "Konservi rondecon",
+        "keep_fonts": "Konservi tiparojn",
+        "save_load_hint": "Elektebloj de \"konservi\" konservas la nuntempajn agordojn dum elektado aŭ enlegado de haŭtoj. Ĝi ankaŭ konservas tiujn agordojn dum elportado de haŭto. Kun ĉiuj markbutonoj nemarkitaj, elporto de la haŭto ĉion konservos.",
+        "reset": "Restarigi",
+        "clear_all": "Vakigi ĉion",
+        "clear_opacity": "Vakigi maltravideblecon"
+      },
+      "common": {
+        "color": "Koloro",
+        "opacity": "Maltravidebleco",
+        "contrast": {
+          "hint": "Proporcio de kontrasto estas {ratio}, ĝi {level} {context}",
+          "level": {
+            "aa": "plenumas la gvidilon je nivelo AA (malpleja)",
+            "aaa": "plenumas la gvidilon je nivela AAA (rekomendita)",
+            "bad": "plenumas neniujn faciluzajn gvidilojn"
+          },
+          "context": {
+            "18pt": "por granda (18pt+) teksto",
+            "text": "por teksto"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Komunaj",
+        "main": "Komunaj koloroj",
+        "foreground_hint": "Vidu langeton \"Specialaj\" por pli detalaj agordoj",
+        "rgbo": "Bildsimboloj, emfazoj, insignoj"
+      },
+      "advanced_colors": {
+        "_tab_label": "Specialaj",
+        "alert": "Averta fono",
+        "alert_error": "Eraro",
+        "badge": "Insigna fono",
+        "badge_notification": "Sciigo",
+        "panel_header": "Kapo de breto",
+        "top_bar": "Supra breto",
+        "borders": "Limoj",
+        "buttons": "Butonoj",
+        "inputs": "Enigaj kampoj",
+        "faint_text": "Malvigla teksto"
+      },
+      "radii": {
+        "_tab_label": "Rondeco"
+      },
+      "shadows": {
+        "_tab_label": "Ombro kaj lumo",
+        "component": "Ero",
+        "override": "Transpasi",
+        "shadow_id": "Ombro #{value}",
+        "blur": "Malklarigo",
+        "spread": "Vastigo",
+        "inset": "Internigo",
+        "hint": "Por ombroj vi ankaŭ povas uzi --variable kiel koloran valoron, por uzi variantojn de CSS3. Bonvolu rimarki, ke tiuokaze agordoj de maltravidebleco ne funkcios.",
+        "filter_hint": {
+          "always_drop_shadow": "Averto: ĉi tiu ombro ĉiam uzas {0} kiam la foliumilo ĝin subtenas.",
+          "drop_shadow_syntax": "{0} ne subtenas parametron {1} kaj ŝlosilvorton {2}.",
+          "avatar_inset": "Bonvolu rimarki, ke agordi ambaŭ internajn kaj eksterajn ombrojn por profilbildoj povas redoni neatenditajn rezultojn ĉe profilbildoj travideblaj.",
+          "spread_zero": "Ombroj kun vastigo > 0 aperos kvazaŭ ĝi estus fakte nulo",
+          "inset_classic": "Internaj ombroj uzos {0}"
+        },
+        "components": {
+          "panel": "Breto",
+          "panelHeader": "Kapo de breto",
+          "topBar": "Supra breto",
+          "avatar": "Profilbildo de uzanto (en profila vido)",
+          "avatarStatus": "Profilbildo de uzanto (en afiŝa vido)",
+          "popup": "Ŝprucaĵoj",
+          "button": "Butono",
+          "buttonHover": "Butono (je ŝvebo)",
+          "buttonPressed": "Butono (premita)",
+          "buttonPressedHover": "Butono (premita je ŝvebo)",
+          "input": "Eniga kampo"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Tiparoj",
+        "help": "Elektu tiparon uzotan por eroj de la fasado. Por \"propra\" vi devas enigi la precizan nomon de tiparo tiel, kiel ĝi aperas en la sistemo",
+        "components": {
+          "interface": "Fasado",
+          "input": "Enigaj kampoj",
+          "post": "Teksto de afiŝo",
+          "postCode": "Egallarĝa teksto en afiŝo (riĉteksto)"
+        },
+        "family": "Nomo de tiparo",
+        "size": "Grando (en bilderoj)",
+        "weight": "Pezo (graseco)",
+        "custom": "Propra"
+      },
+      "preview": {
+        "header": "Antaŭrigardo",
+        "content": "Enhavo",
+        "error": "Ekzempla eraro",
+        "button": "Butono",
+        "text": "Kelko da pliaj {0} kaj {1}",
+        "mono": "enhavo",
+        "input": "Ĵus alvenis al la Universala Kongreso!",
+        "faint_link": "helpan manlibron",
+        "fine_print": "Legu nian {0} por nenion utilan ekscii!",
+        "header_faint": "Tio estas en ordo",
+        "checkbox": "Mi legetis la kondiĉojn de uzado",
+        "link": "bela eta ligil’"
+      }
+    }
   },
   "timeline": {
     "collapse": "Maletendi",
     "conversation": "Interparolo",
     "error_fetching": "Eraro dum ĝisdatigo",
     "load_older": "Montri pli malnovajn statojn",
-    "repeated": "ripetata",
+    "no_retweet_hint": "Afiŝo estas markita kiel rekta aŭ nur por abonantoj, kaj ne eblas ĝin ripeti",
+    "repeated": "ripetita",
     "show_new": "Montri novajn",
-    "up_to_date": "Ĝisdata"
+    "up_to_date": "Ĝisdata",
+    "no_more_statuses": "Neniuj pliaj statoj",
+    "no_statuses": "Neniuj statoj"
   },
   "user_card": {
+    "approve": "Aprobi",
     "block": "Bari",
     "blocked": "Barita!",
+    "deny": "Rifuzi",
+    "favorites": "Ŝatataj",
     "follow": "Aboni",
+    "follow_sent": "Peto sendiĝis!",
+    "follow_progress": "Petanta…",
+    "follow_again": "Ĉu sendi peton denove?",
+    "follow_unfollow": "Malaboni",
     "followees": "Abonatoj",
     "followers": "Abonantoj",
     "following": "Abonanta!",
     "follows_you": "Abonas vin!",
+    "its_you": "Tio estas vi!",
+    "media": "Aŭdvidaĵoj",
     "mute": "Silentigi",
     "muted": "Silentigitaj",
     "per_day": "tage",
     "remote_follow": "Fore aboni",
-    "statuses": "Statoj"
+    "statuses": "Statoj",
+    "unblock": "Malbari",
+    "unblock_progress": "Malbaranta…",
+    "block_progress": "Baranta…",
+    "unmute": "Malsilentigi",
+    "unmute_progress": "Malsilentiganta…",
+    "mute_progress": "Silentiganta…"
   },
   "user_profile": {
-    "timeline_title": "Uzanta tempolinio"
+    "timeline_title": "Uzanta tempolinio",
+    "profile_does_not_exist": "Pardonu, ĉi tiu profilo ne ekzistas.",
+    "profile_loading_error": "Pardonu, eraro okazis dum enlegado de ĉi tiu profilo."
+  },
+  "who_to_follow": {
+    "more": "Pli",
+    "who_to_follow": "Kiun aboni"
+  },
+  "tool_tip": {
+    "media_upload": "Alŝuti aŭdvidaĵon",
+    "repeat": "Ripeti",
+    "reply": "Respondi",
+    "favorite": "Ŝati",
+    "user_settings": "Agordoj de uzanto"
+  },
+  "upload":{
+    "error": {
+      "base": "Alŝuto malsukcesis.",
+      "file_too_big": "Dosiero estas tro granda [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Reprovu pli poste"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
   }
 }

src/i18n/es.json

@@ -202,7 +202,6 @@
     "subject_line_mastodon": "Tipo mastodon: copiar como es",
     "subject_line_noop": "No copiar",
     "post_status_content_type": "Formato de publicación",
-    "status_content_type_plain": "Texto plano",
     "stop_gifs": "Iniciar GIFs al pasar el ratón",
     "streaming": "Habilite la transmisión automática de nuevas publicaciones cuando se desplaza hacia la parte superior",
     "text": "Texto",

src/i18n/fi.json

@@ -221,6 +221,10 @@
     "up_to_date": "Ajantasalla",
     "no_more_statuses": "Ei enempää viestejä"
   },
+  "status": {
+    "reply_to": "Vastaus",
+    "replies_list": "Vastaukset:"
+  },
   "user_card": {
     "approve": "Hyväksy",
     "block": "Estä",

src/i18n/ja.json

@@ -202,7 +202,6 @@
     "subject_line_mastodon": "マストドンふう: そのままコピー",
     "subject_line_noop": "コピーしない",
     "post_status_content_type": "とうこうのコンテントタイプ",
-    "status_content_type_plain": "プレーンテキスト",
     "stop_gifs": "カーソルをかさねたとき、GIFをうごかす",
     "streaming": "うえまでスクロールしたとき、じどうてきにストリーミングする",
     "text": "もじ",

src/i18n/messages.js

@@ -10,6 +10,7 @@
 const messages = {
   ar: require('./ar.json'),
   ca: require('./ca.json'),
+  cs: require('./cs.json'),
   de: require('./de.json'),
   en: require('./en.json'),
   eo: require('./eo.json'),

src/i18n/oc.json

@@ -1,51 +1,82 @@
 {
   "chat": {
     "title": "Messatjariá"
+  },
+    "features_panel": {
+      "chat": "Chat",
+      "gopher": "Gopher",
+      "media_proxy": "Servidor mandatari mèdia",
+      "scope_options": "Nivèls de confidencialitat",
+      "text_limit": "Limita de tèxte",
+      "title": "Foncionalitats",
+      "who_to_follow": "Qual seguir"
   },
   "finder": {
-    "error_fetching_user": "Error pendent la recèrca d’un utilizaire",
+    "error_fetching_user": "Error pendent la cèrca d’un utilizaire",
     "find_user": "Cercar un utilizaire"
   },
   "general": {
     "apply": "Aplicar",
-    "submit": "Mandar"
+    "submit": "Mandar",
+    "more": "Mai",
+    "generic_error": "Una error s’es producha",
+    "optional": "opcional"
+  },
+  "image_cropper": {
+     "crop_picture": "Talhar l’imatge",
+     "save": "Salvar",
+     "cancel": "Anullar"
   },
   "login": {
     "login": "Connexion",
+    "description": "Connexion via OAuth",
     "logout": "Desconnexion",
     "password": "Senhal",
     "placeholder": "e.g. lain",
     "register": "Se marcar",
-    "username": "Nom d’utilizaire"
+    "username": "Nom d’utilizaire",
+    "hint": "Connectatz-vos per participar a la discutida"
+  },
+  "media_modal": {
+    "previous": "Precedent",
+    "next": "Seguent"
   },
   "nav": {
+    "about": "A prepaus",
+    "back": "Tornar",
     "chat": "Chat local",
+    "friend_requests": "Demandas de seguiment",
     "mentions": "Notificacions",
+    "dms": "Messatges privats",
     "public_tl": "Estatuts locals",
     "timeline": "Flux d’actualitat",
     "twkn": "Lo malhum conegut",
-    "friend_requests": "Demandas d'abonament"
+    "user_search": "Cèrca d’utilizaires",
+    "who_to_follow": "Qual seguir",
+    "preferences": "Preferéncias"
   },
   "notifications": {
+    "broken_favorite": "Estatut desconegut, sèm a lo cercar...",
     "favorited_you": "a aimat vòstre estatut",
     "followed_you": "vos a seguit",
+    "load_older": "Cargar las notificaciones mai ancianas",
     "notifications": "Notficacions",
-    "read": "Legit !",
+    "read": "Legit !",
     "repeated_you": "a repetit vòstre estatut",
-    "broken_favorite": "Estatut desconegut, sèm a lo cercar...",
+    "no_more_notifications": "Pas mai de notificacions"
-    "load_older": "Cargar las notificaciones mai ancianas"
   },
   "post_status": {
-    "content_warning": "Avís de contengut (opcional)",
+    "new_status": "Publicar d’estatuts novèls",
-    "default": "Escrivètz aquí vòstre estatut.",
-    "posting": "Mandadís",
     "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.",
     "account_not_locked_warning_link": "clavat",
     "attachments_sensitive": "Marcar las pèças juntas coma sensiblas",
     "content_type": {
       "plain_text": "Tèxte brut"
     },
+    "content_warning": "Avís de contengut (opcional)",
+    "default": "Escrivètz aquí vòstre estatut.",
     "direct_warning": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.",
+    "posting": "Mandadís",
     "scope": {
       "direct": "Dirècte - Publicar pels utilizaires mencionats solament",
       "private": "Seguidors solament - Publicar pels sols seguidors",
@@ -59,9 +90,23 @@
     "fullname": "Nom complèt",
     "password_confirm": "Confirmar lo senhal",
     "registration": "Inscripcion",
-    "token": "Geton de convidat"
+    "token": "Geton de convidat",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Clicatz l’imatge per obténer una nòva captcha",
+    "username_placeholder": "e.g. lain",
+    "fullname_placeholder": "e.g. Lain Iwakura",
+    "bio_placeholder": "e.g.\nHi, Soi lo Lain\nSoi afocada d’animes e vivi al Japan. Benlèu que me coneissètz de the Wired.",
+    "validations": {
+      "username_required": "pòt pas èsser void",
+      "fullname_required": "pòt pas èsser void",
+      "email_required": "pòt pas èsser void",
+      "password_required": "pòt pas èsser void",
+      "password_confirmation_required": "pòt pas èsser void",
+      "password_confirmation_match": "deu èsser lo meteis senhal"
+    }
   },
   "settings": {
+    "app_name": "Nom de l’aplicacion",
     "attachmentRadius": "Pèças juntas",
     "attachments": "Pèças juntas",
     "autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina",
@@ -70,6 +115,7 @@
     "avatarRadius": "Avatars",
     "background": "Rèire plan",
     "bio": "Biografia",
+    "blocks_tab": "Blocatges",
     "btnRadius": "Botons",
     "cBlue": "Blau (Respondre, seguir)",
     "cGreen": "Verd (Repartajar)",
@@ -78,15 +124,21 @@
     "change_password": "Cambiar lo senhal",
     "change_password_error": "Una error s’es producha en cambiant lo senhal.",
     "changed_password": "Senhal corrèctament cambiat !",
+    "collapse_subject": "Replegar las publicacions amb de subjèctes",
+    "composing": "Escritura",
     "confirm_new_password": "Confirmatz lo nòu senhal",
     "current_avatar": "Vòstre avatar actual",
     "current_password": "Senhal actual",
     "current_profile_banner": "Bandièra actuala del perfil",
+    "data_import_export_tab": "Importar / Exportar las donadas",
+    "default_vis": "Nivèl de visibilitat per defaut",
     "delete_account": "Suprimir lo compte",
     "delete_account_description": "Suprimir vòstre compte e los messatges per sempre.",
     "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.",
     "delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.",
-    "filtering": "Filtre",
+    "avatar_size_instruction": "La talha minimum recomandada pels imatges d’avatar es 150x150 pixèls.",
+    "export_theme": "Enregistrar la preconfiguracion",
+    "filtering": "Filtratge",
     "filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha",
     "follow_export": "Exportar los abonaments",
     "follow_export_button": "Exportar vòstres abonaments dins un fichièr csv",
@@ -95,63 +147,90 @@
     "follow_import_error": "Error en important los seguidors",
     "follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.",
     "foreground": "Endavant",
+    "general": "General",
     "hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions",
     "hide_attachments_in_tl": "Rescondre las pèças juntas",
-    "import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv",
+    "max_thumbnails": "Nombre maximum de vinhetas per publicacion",
-    "inputRadius": "Camps tèxte",
+    "hide_isp": "Amagar lo panèl especial instància",
-    "links": "Ligams",
+    "preload_images": "Precargar los imatges",
-    "name": "Nom",
+    "use_one_click_nsfw": "Dobrir las pèças juntas NSFW amb un clic",
-    "name_bio": "Nom & Bio",
-    "new_password": "Nòu senhal",
-    "nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles",
-    "panelRadius": "Panèls",
-    "presets": "Pre-enregistrats",
-    "profile_background": "Imatge de fons",
-    "profile_banner": "Bandièra del perfil",
-    "radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)",
-    "reply_link_preview": "Activar l’apercebut en passar la mirga",
-    "set_new_avatar": "Cambiar l’avatar",
-    "set_new_profile_background": "Cambiar l’imatge de fons",
-    "set_new_profile_banner": "Cambiar de bandièra",
-    "settings": "Paramètres",
-    "stop_gifs": "Lançar los GIFs al subrevòl",
-    "streaming": "Activar lo cargament automatic dels novèls estatus en anar amont",
-    "text": "Tèxte",
-    "theme": "Tèma",
-    "theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.",
-    "tooltipRadius": "Astúcias/Alèrta",
-    "user_settings": "Paramètres utilizaire",
-    "collapse_subject": "Replegar las publicacions amb de subjèctes",
-    "data_import_export_tab": "Importar / Exportar las donadas",
-    "default_vis": "Nivèl de visibilitat per defaut",
-    "export_theme": "Enregistrar la preconfiguracion",
-    "general": "General",
     "hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)",
     "hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)",
+    "hide_filtered_statuses": "Amagar los estatuts filtrats",
+    "import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv",
     "import_theme": "Cargar un tèma",
-    "instance_default": "(defaut : {value})",
+    "inputRadius": "Camps tèxte",
+    "checkboxRadius": "Casas de marcar",
+    "instance_default": "(defaut : {value})",
+    "instance_default_simple": "(defaut)",
+    "interface": "Interfàcia",
     "interfaceLanguage": "Lenga de l’interfàcia",
     "invalid_theme_imported": "Lo fichièr seleccionat es pas un tèma Pleroma valid. Cap de cambiament es estat fach a vòstre tèma.",
     "limited_availability": "Pas disponible per vòstre navigador",
+    "links": "Ligams",
     "lock_account_description": "Limitar vòstre compte als seguidors acceptats solament",
     "loop_video": "Bocla vidèo",
-    "loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)",
+    "loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)",
-    "notification_visibility": "Tipes de notificacion de mostrar",
+    "mutes_tab": "Agamats",
+    "play_videos_in_modal": "Legir las vidèoas dirèctament dins la visualizaira mèdia",
+    "use_contain_fit": "Talhar pas las pèças juntas per las vinhetas",
+    "name": "Nom",
+    "name_bio": "Nom & Bio",
+    "new_password": "Nòu senhal",
     "notification_visibility_follows": "Abonaments",
-    "notification_visibility_likes": "Aiman",
+    "notification_visibility_likes": "Aimar",
     "notification_visibility_mentions": "Mencions",
     "notification_visibility_repeats": "Repeticions",
+    "notification_visibility": "Tipes de notificacion de mostrar",
     "no_rich_text_description": "Netejar lo format tèxte de totas las publicacions",
-    "oauth_tokens": "Llistats OAuth",
+    "no_blocks": "Cap de blocatge",
+    "no_mutes": "Cap d’amagat",
+    "hide_follows_description": "Mostrar pas qual seguissi",
+    "hide_followers_description": "Mostrar pas qual me seguisson",
+    "show_admin_badge": "Mostrar lo badge Admin badge al perfil meu",
+    "show_moderator_badge": "Mostrar lo badge Moderator al perfil meu",
+    "nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles",
+    "oauth_tokens": "Listats OAuth",
+    "token": "Geton",
+    "refresh_token": "Actualizar lo geton",
+    "valid_until": "Valid fins a",
+    "revoke_token": "Revocar",
+    "panelRadius": "Panèls",
     "pause_on_unfocused": "Pausar la difusion quand l’onglet es pas seleccionat",
+    "presets": "Pre-enregistrats",
+    "profile_background": "Imatge de fons",
+    "profile_banner": "Bandièra del perfil",
     "profile_tab": "Perfil",
+    "radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)",
     "replies_in_timeline": "Responsas del flux",
+    "reply_link_preview": "Activar l’apercebut en passar la mirga",
     "reply_visibility_all": "Mostrar totas las responsas",
     "reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi",
     "reply_visibility_self": "Mostrar pas que las responsas que me son destinadas",
     "saving_err": "Error en enregistrant los paramètres",
     "saving_ok": "Paramètres enregistrats",
+    "scope_copy": "Copiar lo nivèl de confidencialitat per las responsas (Totjorn aissí pels Messatges Dirèctes)",
     "security_tab": "Seguretat",
+    "set_new_avatar": "Definir un nòu avatar",
+    "set_new_profile_background": "Definir un nòu fons de perfil",
+    "set_new_profile_banner": "Definir una nòva bandièra de perfil",
+    "settings": "Paramètres",
+    "subject_input_always_show": "Totjorn mostrar lo camp de subjècte",
+    "subject_line_behavior": "Copiar lo subjècte per las responsas",
+    "subject_line_email": "Coma los corrièls : \"re: subjècte\"",
+    "subject_line_mastodon": "Coma mastodon : copiar tal coma es",
+    "subject_line_noop": "Copiar pas",
+"post_status_content_type": "Publicar lo tipe de contengut dels estatuts",
+    "stop_gifs": "Lançar los GIFs al subrevòl",
+    "streaming": "Activar lo cargament automatic dels novèls estatus en anar amont",
+    "text": "Tèxt",
+    "theme": "Tèma",
+    "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
+    "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
+    "theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.",
+    "tooltipRadius": "Astúcias/alèrtas",
+    "upload_a_photo": "Enviar una fotografia",
+    "user_settings": "Paramètres utilizaire",
     "values": {
       "false": "non",
       "true": "òc"
@@ -167,36 +246,67 @@
     "up_to_date": "A jorn",
     "no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida"
   },
+  "status": {
+    "reply_to": "Respondre à",
+    "replies_list": "Responsas :"
+  },
   "user_card": {
+    "approve": "Validar",
     "block": "Blocar",
     "blocked": "Blocat !",
+    "deny": "Refusar",
+    "favorites": "Favorits",
     "follow": "Seguir",
+    "follow_sent": "Demanda enviada !",
+    "follow_progress": "Demanda…",
+    "follow_again": "Tornar enviar la demanda ?",
+    "follow_unfollow": "Quitar de seguir",
     "followees": "Abonaments",
     "followers": "Seguidors",
-    "following": "Seguit !",
+    "following": "Seguit !",
-    "follows_you": "Vos sèc !",
+    "follows_you": "Vos sèc !",
+    "its_you": "Sètz vos !",
+    "media": "Mèdia",
     "mute": "Amagar",
     "muted": "Amagat",
     "per_day": "per jorn",
     "remote_follow": "Seguir a distància",
     "statuses": "Estatuts",
-    "approve": "Validar",
+    "unblock": "Desblocar",
-    "deny": "Refusar"
+    "unblock_progress": "Desblocatge...",
+    "block_progress": "Blocatge...",
+    "unmute": "Tornar mostrar",
+    "unmute_progress": "Afichatge...",
+    "mute_progress": "A amagar..."
   },
   "user_profile": {
-    "timeline_title": "Flux utilizaire"
+    "timeline_title": "Flux utilizaire",
-  },
+    "profile_does_not_exist": "Aqueste perfil existís pas.",
-  "features_panel": {
+    "profile_loading_error": "Una error s’es producha en cargant aqueste perfil."
-    "chat": "Discutida",
-    "gopher": "Gopher",
-    "media_proxy": "Servidor mandatari dels mèdias",
-    "scope_options": "Opcions d'encastres",
-    "text_limit": "Limit de tèxte",
-    "title": "Foncionalitats",
-    "who_to_follow": "Qui seguir"
   },
   "who_to_follow": {
     "more": "Mai",
-    "who_to_follow": "Qui seguir"
+    "who_to_follow": "Qual seguir"
+  },
+  "tool_tip": {
+    "media_upload": "Enviar un mèdia",
+    "repeat": "Repetir",
+    "reply": "Respondre",
+    "favorite": "aimar",
+    "user_settings": "Paramètres utilizaire"
+  },
+  "upload":{
+    "error": {
+      "base": "Mandadís fracassat.",
+      "file_too_big": "Fichièr tròp grand [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Tornatz ensajar mai tard"
+    },
+    "file_size_units": {
+      "B": "o",
+      "KiB": "Kio",
+      "MiB": "Mio",
+      "GiB": "Gio",
+      "TiB": "Tio"
+    }
   }
 }

src/i18n/pt.json

@@ -2,116 +2,424 @@
   "chat": {
     "title": "Chat"
   },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Proxy de mídia",
+    "scope_options": "Opções de privacidade",
+    "text_limit": "Limite de caracteres",
+    "title": "Funções",
+    "who_to_follow": "Quem seguir"
+  },
   "finder": {
-    "error_fetching_user": "Erro procurando usuário",
+    "error_fetching_user": "Erro ao procurar usuário",
     "find_user": "Buscar usuário"
   },
   "general": {
     "apply": "Aplicar",
-    "submit": "Enviar"
+    "submit": "Enviar",
+    "more": "Mais",
+    "generic_error": "Houve um erro",
+    "optional": "opcional"
+  },
+  "image_cropper": {
+    "crop_picture": "Cortar imagem",
+    "save": "Salvar",
+    "cancel": "Cancelar"
   },
   "login": {
     "login": "Entrar",
+    "description": "Entrar com OAuth",
     "logout": "Sair",
     "password": "Senha",
     "placeholder": "p.e. lain",
     "register": "Registrar",
-    "username": "Usuário"
+    "username": "Usuário",
+    "hint": "Entre para participar da discussão"
+  },
+  "media_modal": {
+    "previous": "Anterior",
+    "next": "Próximo"
   },
   "nav": {
+    "about": "Sobre",
+    "back": "Voltar",
     "chat": "Chat local",
+    "friend_requests": "Solicitações de seguidores",
     "mentions": "Menções",
+    "dms": "Mensagens diretas",
     "public_tl": "Linha do tempo pública",
     "timeline": "Linha do tempo",
-    "twkn": "Toda a rede conhecida"
+    "twkn": "Toda a rede conhecida",
+    "user_search": "Busca de usuário",
+    "who_to_follow": "Quem seguir",
+    "preferences": "Preferências"
   },
   "notifications": {
+    "broken_favorite": "Status desconhecido, buscando...",
     "favorited_you": "favoritou sua postagem",
     "followed_you": "seguiu você",
+    "load_older": "Carregar notificações antigas",
     "notifications": "Notificações",
     "read": "Lido!",
-    "repeated_you": "repetiu sua postagem"
+    "repeated_you": "repetiu sua postagem",
+    "no_more_notifications": "Mais nenhuma notificação"
   },
   "post_status": {
+    "new_status": "Postar novo status",
+    "account_not_locked_warning": "Sua conta não está {0}. Qualquer pessoa pode te seguir para ver seus posts restritos.",
+    "account_not_locked_warning_link": "fechada",
+    "attachments_sensitive": "Marcar anexos como sensíveis",
+    "content_type": {
+      "plain_text": "Texto puro"
+    },
+    "content_warning": "Assunto (opcional)",
     "default": "Acabei de chegar no Rio!",
-    "posting": "Publicando"
+    "direct_warning": "Este post será visível apenas para os usuários mencionados.",
+    "posting": "Publicando",
+    "scope": {
+      "direct": "Direto - Enviar somente aos usuários mencionados",
+      "private": "Apenas para seguidores - Enviar apenas para seguidores",
+      "public": "Público - Enviar a linhas do tempo públicas",
+      "unlisted": "Não listado - Não enviar a linhas do tempo públicas"
+    }
   },
   "registration": {
     "bio": "Biografia",
     "email": "Correio eletrônico",
     "fullname": "Nome para exibição",
     "password_confirm": "Confirmação de senha",
-    "registration": "Registro"
+    "registration": "Registro",
+    "token": "Código do convite",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Clique na imagem para carregar um novo captcha",
+    "username_placeholder": "p. ex. lain",
+    "fullname_placeholder": "p. ex. Lain Iwakura",
+    "bio_placeholder": "e.g.\nOi, sou Lain\nSou uma garota que vive no subúrbio do Japão. Você deve me conhecer da Rede.",
+    "validations": {
+      "username_required": "não pode ser deixado em branco",
+      "fullname_required": "não pode ser deixado em branco",
+      "email_required": "não pode ser deixado em branco",
+      "password_required": "não pode ser deixado em branco",
+      "password_confirmation_required": "não pode ser deixado em branco",
+      "password_confirmation_match": "deve ser idêntica à senha"
+    }
   },
   "settings": {
+    "app_name": "Nome do aplicativo",
     "attachmentRadius": "Anexos",
     "attachments": "Anexos",
     "autoload": "Habilitar carregamento automático quando a rolagem chegar ao fim.",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatares (Notificações)",
     "avatarRadius": "Avatares",
-    "background": "Plano de Fundo",
+    "background": "Pano de Fundo",
     "bio": "Biografia",
+    "blocks_tab": "Blocos",
     "btnRadius": "Botões",
     "cBlue": "Azul (Responder, seguir)",
     "cGreen": "Verde (Repetir)",
     "cOrange": "Laranja (Favoritar)",
     "cRed": "Vermelho (Cancelar)",
+    "change_password": "Mudar senha",
+    "change_password_error": "Houve um erro ao modificar sua senha.",
+    "changed_password": "Senha modificada com sucesso!",
+    "collapse_subject": "Esconder posts com assunto",
+    "composing": "Escrevendo",
+    "confirm_new_password": "Confirmar nova senha",
     "current_avatar": "Seu avatar atual",
+    "current_password": "Sua senha atual",
     "current_profile_banner": "Sua capa de perfil atual",
+    "data_import_export_tab": "Importação/exportação de dados",
+    "default_vis": "Opção de privacidade padrão",
+    "delete_account": "Deletar conta",
+    "delete_account_description": "Deletar sua conta e mensagens permanentemente.",
+    "delete_account_error": "Houve um problema ao deletar sua conta. Se ele persistir, por favor entre em contato com o/a administrador/a da instância.",
+    "delete_account_instructions": "Digite sua senha no campo abaixo para confirmar a exclusão da conta.",
+    "avatar_size_instruction": "O tamanho mínimo recomendado para imagens de avatar é 150x150 pixels.",
+    "export_theme": "Salvar predefinições",
     "filtering": "Filtragem",
     "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas, uma por linha.",
-    "follow_import": "Importar seguidas",
+    "follow_export": "Exportar quem você segue",
+    "follow_export_button": "Exportar quem você segue para um arquivo CSV",
+    "follow_export_processing": "Processando. Em breve você receberá a solicitação de download do arquivo",
+    "follow_import": "Importar quem você segue",
     "follow_import_error": "Erro ao importar seguidores",
     "follows_imported": "Seguidores importados! O processamento pode demorar um pouco.",
     "foreground": "Primeiro Plano",
+    "general": "Geral",
     "hide_attachments_in_convo": "Ocultar anexos em conversas",
     "hide_attachments_in_tl": "Ocultar anexos na linha do tempo.",
+    "max_thumbnails": "Número máximo de miniaturas por post",
+    "hide_isp": "Esconder painel específico da instância",
+    "preload_images": "Pré-carregar imagens",
+    "use_one_click_nsfw": "Abrir anexos sensíveis com um clique",
+    "hide_post_stats": "Esconder estatísticas de posts (p. ex. número de favoritos)",
+    "hide_user_stats": "Esconder estatísticas do usuário (p. ex. número de seguidores)",
+    "hide_filtered_statuses": "Esconder posts filtrados",
     "import_followers_from_a_csv_file": "Importe seguidores a partir de um arquivo CSV",
+    "import_theme": "Carregar pré-definição",
+    "inputRadius": "Campos de entrada",
+    "checkboxRadius": "Checkboxes",
+    "instance_default": "(padrão: {value})",
+    "instance_default_simple": "(padrão)",
+    "interface": "Interface",
+    "interfaceLanguage": "Idioma da interface",
+    "invalid_theme_imported": "O arquivo selecionado não é um tema compatível com o Pleroma. Nenhuma mudança no tema foi feita.",
+    "limited_availability": "Indisponível para seu navegador",
     "links": "Links",
+    "lock_account_description": "Restringir sua conta a seguidores aprovados",
+    "loop_video": "Repetir vídeos",
+    "loop_video_silent_only": "Repetir apenas vídeos sem som (como os \"gifs\" do Mastodon)",
+    "mutes_tab": "Silenciados",
+    "play_videos_in_modal": "Tocar vídeos diretamente no visualizador de mídia",
+    "use_contain_fit": "Não cortar o anexo na miniatura",
     "name": "Nome",
     "name_bio": "Nome & Biografia",
-    "nsfw_clickthrough": "Habilitar clique para ocultar anexos NSFW",
+    "new_password": "Nova senha",
+    "notification_visibility": "Tipos de notificação para mostrar",
+    "notification_visibility_follows": "Seguidos",
+    "notification_visibility_likes": "Favoritos",
+    "notification_visibility_mentions": "Menções",
+    "notification_visibility_repeats": "Repetições",
+    "no_rich_text_description": "Remover formatação de todos os posts",
+    "no_blocks": "Sem bloqueios",
+    "no_mutes": "Sem silenciados",
+    "hide_follows_description": "Não mostrar quem estou seguindo",
+    "hide_followers_description": "Não mostrar quem me segue",
+    "show_admin_badge": "Mostrar distintivo de Administrador em meu perfil",
+    "show_moderator_badge": "Mostrar título de Moderador em meu perfil",
+    "nsfw_clickthrough": "Habilitar clique para ocultar anexos sensíveis",
+    "oauth_tokens": "Token OAuth",
+    "token": "Token",
+    "refresh_token": "Atualizar Token",
+    "valid_until": "Válido até",
+    "revoke_token": "Revogar",
     "panelRadius": "Paineis",
+    "pause_on_unfocused": "Parar transmissão quando a aba não estiver em primeiro plano",
     "presets": "Predefinições",
-    "profile_background": "Plano de fundo de perfil",
+    "profile_background": "Pano de fundo de perfil",
     "profile_banner": "Capa de perfil",
+    "profile_tab": "Perfil",
     "radii_help": "Arredondar arestas da interface (em píxeis)",
+    "replies_in_timeline": "Respostas na linha do tempo",
     "reply_link_preview": "Habilitar a pré-visualização de link de respostas ao passar o mouse.",
+    "reply_visibility_all": "Mostrar todas as respostas",
+    "reply_visibility_following": "Só mostrar respostas direcionadas a mim ou a usuários que sigo",
+    "reply_visibility_self": "Só mostrar respostas direcionadas a mim",
+    "saving_err": "Erro ao salvar configurações",
+    "saving_ok": "Configurações salvas",
+    "security_tab": "Segurança",
+    "scope_copy": "Copiar opções de privacidade ao responder (Mensagens diretas sempre copiam)",
     "set_new_avatar": "Alterar avatar",
     "set_new_profile_background": "Alterar o plano de fundo de perfil",
     "set_new_profile_banner": "Alterar capa de perfil",
     "settings": "Configurações",
+    "subject_input_always_show": "Sempre mostrar campo de assunto",
+    "subject_line_behavior": "Copiar assunto ao responder",
+    "subject_line_email": "Como em email: \"re: assunto\"",
+    "subject_line_mastodon": "Como o Mastodon: copiar como está",
+    "subject_line_noop": "Não copiar",
+    "post_status_content_type": "Postar tipo de conteúdo do status",
     "stop_gifs": "Reproduzir GIFs ao passar o cursor em cima",
     "streaming": "Habilitar o fluxo automático de postagens quando ao topo da página",
     "text": "Texto",
     "theme": "Tema",
     "theme_help": "Use cores em código hexadecimal (#rrggbb) para personalizar seu esquema de cores.",
-    "tooltipRadius": "Dicass/alertas",
+    "theme_help_v2_1": "Você também pode sobrescrever as cores e opacidade de alguns componentes ao modificar o checkbox, use \"Limpar todos\" para limpar todas as modificações.",
-    "user_settings": "Configurações de Usuário"
+    "theme_help_v2_2": "Alguns ícones sob registros são indicadores de fundo/contraste de textos, passe por cima para informações detalhadas.  Tenha ciência de que os indicadores de contraste não funcionam muito bem com transparência.",
+    "tooltipRadius": "Dicas/alertas",
+    "upload_a_photo": "Enviar uma foto",
+    "user_settings": "Configurações de Usuário",
+    "values": {
+      "false": "não",
+      "true": "sim"
+    },
+    "notifications": "Notifications",
+    "enable_web_push_notifications": "Habilitar notificações web push",
+    "style": {
+      "switcher": {
+        "keep_color": "Manter cores",
+        "keep_shadows": "Manter sombras",
+        "keep_opacity": "Manter opacidade",
+        "keep_roundness": "Manter arredondado",
+        "keep_fonts": "Manter fontes",
+        "save_load_hint": "Manter as opções preserva as opções atuais ao selecionar ou carregar temas; também salva as opções ao exportar um tempo. Quanto todos os campos estiverem desmarcados, tudo será salvo ao exportar o tema.",
+        "reset": "Voltar ao padrão",
+        "clear_all": "Limpar tudo",
+        "clear_opacity": "Limpar opacidade"
+      },
+      "common": {
+        "color": "Cor",
+        "opacity": "Opacidade",
+        "contrast": {
+          "hint": "A taxa de contraste é {ratio}, {level} {context}",
+          "level": {
+            "aa": "padrão Nível AA (mínimo)",
+            "aaa": "padrão Nível AAA (recomendado)",
+            "bad": "nenhum padrão de acessibilidade"
+          },
+          "context": {
+            "18pt": "para textos longos (18pt+)",
+            "text": "para texto"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Comum",
+        "main": "Cores Comuns",
+        "foreground_hint": "Configurações mais detalhadas na aba\"Avançado\"",
+        "rgbo": "Ícones, acentuação, distintivos"
+      },
+      "advanced_colors": {
+        "_tab_label": "Avançado",
+        "alert": "Fundo de alerta",
+        "alert_error": "Erro",
+        "badge": "Fundo do distintivo",
+        "badge_notification": "Notificação",
+        "panel_header": "Topo do painel",
+        "top_bar": "Barra do topo",
+        "borders": "Bordas",
+        "buttons": "Botões",
+        "inputs": "Caixas de entrada",
+        "faint_text": "Texto esmaecido"
+      },
+      "radii": {
+        "_tab_label": "Arredondado"
+      },
+      "shadows": {
+        "_tab_label": "Luz e sombra",
+        "component": "Componente",
+        "override": "Sobrescrever",
+        "shadow_id": "Sombra #{value}",
+        "blur": "Borrado",
+        "spread": "Difusão",
+        "inset": "Inserção",
+        "hint": "Para as sombras você também pode usar --variável como valor de cor para utilizar variáveis do CSS3. Tenha em mente que configurar a opacidade não será possível neste caso.",
+        "filter_hint": {
+          "always_drop_shadow": "Atenção, esta sombra sempre utiliza {0} quando compatível com o navegador.",
+          "drop_shadow_syntax": "{0} não é compatível com o parâmetro {1} e a palavra-chave {2}.",
+          "avatar_inset": "Tenha em mente que combinar as sombras de inserção e a não-inserção em avatares pode causar resultados inesperados em avatares transparentes.",
+          "spread_zero": "Sombras com uma difusão > 0 aparecerão como se fossem definidas como 0.",
+          "inset_classic": "Sombras de inserção utilizarão {0}"
+        },
+        "components": {
+          "panel": "Painel",
+          "panelHeader": "Topo do painel",
+          "topBar": "Barra do topo",
+          "avatar": "Avatar do usuário (na visualização do perfil)",
+          "avatarStatus": "Avatar do usuário (na exibição de posts)",
+          "popup": "Dicas e notificações",
+          "button": "Botão",
+          "buttonHover": "Botão (em cima)",
+          "buttonPressed": "Botão (pressionado)",
+          "buttonPressedHover": "Botão (pressionado+em cima)",
+          "input": "Campo de entrada"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Fontes",
+        "help": "Selecionar fonte dos elementos da interface. Para fonte \"personalizada\" você deve entrar exatamente o nome da fonte no sistema.",
+        "components": {
+          "interface": "Interface",
+          "input": "Campo de entrada",
+          "post": "Postar texto",
+          "postCode": "Texto monoespaçado em post (formatação rica)"
+        },
+        "family": "Nome da fonte",
+        "size": "Tamanho (em px)",
+        "weight": "Peso",
+        "custom": "Personalizada"
+      },
+      "preview": {
+        "header": "Pré-visualizar",
+        "content": "Conteúdo",
+        "error": "Erro de exemplo",
+        "button": "Botão",
+        "text": "Vários {0} e {1}",
+        "mono": "conteúdo",
+        "input": "Acabei de chegar no Rio!",
+        "faint_link": "manual útil",
+        "fine_print": "Leia nosso {0} para não aprender nada!",
+        "header_faint": "Está ok!",
+        "checkbox": "Li os termos e condições",
+        "link": "um belo link"
+      }
+    }
   },
   "timeline": {
+    "collapse": "Esconder",
     "conversation": "Conversa",
-    "error_fetching": "Erro buscando atualizações",
+    "error_fetching": "Erro ao buscar atualizações",
     "load_older": "Carregar postagens antigas",
+    "no_retweet_hint": "Posts apenas para seguidores ou diretos não podem ser repetidos",
+    "repeated": "Repetido",
     "show_new": "Mostrar novas",
-    "up_to_date": "Atualizado"
+    "up_to_date": "Atualizado",
+    "no_more_statuses": "Sem mais posts",
+    "no_statuses": "Sem posts"
+  },
+  "status": {
+    "reply_to": "Responder a",
+    "replies_list": "Respostas:"
   },
   "user_card": {
+    "approve": "Aprovar",
     "block": "Bloquear",
     "blocked": "Bloqueado!",
+    "deny": "Negar",
+    "favorites": "Favoritos",
     "follow": "Seguir",
+    "follow_sent": "Pedido enviado!",
+    "follow_progress": "Enviando…",
+    "follow_again": "Enviar solicitação novamente?",
+    "follow_unfollow": "Deixar de seguir",
     "followees": "Seguindo",
     "followers": "Seguidores",
     "following": "Seguindo!",
     "follows_you": "Segue você!",
+    "its_you": "É você!",
+    "media": "Mídia",
     "mute": "Silenciar",
     "muted": "Silenciado",
     "per_day": "por dia",
     "remote_follow": "Seguidor Remoto",
-    "statuses": "Postagens"
+    "statuses": "Postagens",
+    "unblock": "Desbloquear",
+    "unblock_progress": "Desbloqueando...",
+    "block_progress": "Bloqueando...",
+    "unmute": "Retirar silêncio",
+    "unmute_progress": "Retirando silêncio...",
+    "mute_progress": "Silenciando..."
   },
   "user_profile": {
-    "timeline_title": "Linha do tempo do usuário"
+    "timeline_title": "Linha do tempo do usuário",
+    "profile_does_not_exist": "Desculpe, este perfil não existe.",
+    "profile_loading_error": "Desculpe, houve um erro ao carregar este perfil."
+  },
+  "who_to_follow": {
+    "more": "Mais",
+    "who_to_follow": "Quem seguir"
+  },
+  "tool_tip": {
+    "media_upload": "Envio de mídia",
+    "repeat": "Repetir",
+    "reply": "Responder",
+    "favorite": "Favoritar",
+    "user_settings": "Configurações do usuário"
+  },
+  "upload":{
+    "error": {
+      "base": "Falha no envio.",
+      "file_too_big": "Arquivo grande demais [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Tente novamente mais tarde"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
   }
 }

src/main.js

@@ -30,8 +30,9 @@ const currentLocale = (window.navigator.language || 'en').split('-')[0]
 Vue.use(Vuex)
 Vue.use(VueRouter)
 Vue.use(VueTimeago, {
-  locale: currentLocale === 'ja' ? 'ja' : 'en',
+  locale: currentLocale === 'cs' ? 'cs' : currentLocale === 'ja' ? 'ja' : 'en',
   locales: {
+    'cs': require('../static/timeago-cs.json'),
     'en': require('../static/timeago-en.json'),
     'ja': require('../static/timeago-ja.json')
   }

src/modules/chat.js

@@ -1,12 +1,16 @@
 const chat = {
   state: {
     messages: [],
-    channel: {state: ''}
+    channel: {state: ''},
+    socket: null
   },
   mutations: {
     setChannel (state, channel) {
       state.channel = channel
     },
+    setSocket (state, socket) {
+      state.socket = socket
+    },
     addMessage (state, message) {
       state.messages.push(message)
       state.messages = state.messages.slice(-19, 20)
@@ -16,8 +20,12 @@ const chat = {
     }
   },
   actions: {
+    disconnectFromChat (store) {
+      store.state.socket.disconnect()
+    },
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')
+      store.commit('setSocket', socket)
       channel.on('new_msg', (msg) => {
         store.commit('addMessage', msg)
       })

src/modules/instance.js

@@ -37,6 +37,7 @@ const defaultState = {
   emoji: [],
   customEmoji: [],
   restrictedNicknames: [],
+  postFormats: [],
 
   // Feature-set, apparently, not everything here is reported...
   mediaProxyAvailable: false,

src/modules/statuses.js

@@ -1,4 +1,4 @@
-import { remove, slice, each, find, maxBy, minBy, merge, last, isArray } from 'lodash'
+import { remove, slice, each, find, maxBy, minBy, merge, first, last, isArray } from 'lodash'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
 
@@ -10,6 +10,7 @@ const emptyTl = (userId = 0) => ({
   visibleStatusesObject: {},
   newStatusCount: 0,
   maxId: 0,
+  minId: 0,
   minVisibleId: 0,
   loading: false,
   followers: [],
@@ -18,7 +19,7 @@ const emptyTl = (userId = 0) => ({
   flushMarker: 0
 })
 
-export const defaultState = {
+export const defaultState = () => ({
   allStatuses: [],
   allStatusesObject: {},
   maxId: 0,
@@ -29,7 +30,8 @@ export const defaultState = {
     data: [],
     idStore: {},
     loading: false,
-    error: false
+    error: false,
+    fetcherId: null
   },
   favorites: new Set(),
   error: false,
@@ -44,7 +46,7 @@ export const defaultState = {
     tag: emptyTl(),
     dms: emptyTl()
   }
-}
+})
 
 export const prepareStatus = (status) => {
   // Set deleted flag
@@ -117,11 +119,16 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   const timelineObject = state.timelines[timeline]
 
   const maxNew = statuses.length > 0 ? maxBy(statuses, 'id').id : 0
-  const older = timeline && maxNew < timelineObject.maxId
+  const minNew = statuses.length > 0 ? minBy(statuses, 'id').id : 0
+  const newer = timeline && maxNew > timelineObject.maxId && statuses.length > 0
+  const older = timeline && (minNew < timelineObject.minId || timelineObject.minId === 0) && statuses.length > 0
 
-  if (timeline && !noIdUpdate && statuses.length > 0 && !older) {
+  if (!noIdUpdate && newer) {
     timelineObject.maxId = maxNew
   }
+  if (!noIdUpdate && older) {
+    timelineObject.minId = minNew
+  }
 
   // This makes sure that user timeline won't get data meant for other
   // user. I.e. opening different user profiles makes request which could
@@ -258,9 +265,6 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   // Keep the visible statuses sorted
   if (timeline) {
     sortTimeline(timelineObject)
-    if ((older || timelineObject.minVisibleId <= 0) && statuses.length > 0) {
-      timelineObject.minVisibleId = minBy(statuses, 'id').id
-    }
   }
 }
 
@@ -309,18 +313,39 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
   })
 }
 
+const removeStatus = (state, { timeline, userId }) => {
+  const timelineObject = state.timelines[timeline]
+  if (userId) {
+    remove(timelineObject.statuses, { user: { id: userId } })
+    remove(timelineObject.visibleStatuses, { user: { id: userId } })
+    timelineObject.minVisibleId = timelineObject.visibleStatuses.length > 0 ? last(timelineObject.visibleStatuses).id : 0
+    timelineObject.maxId = timelineObject.statuses.length > 0 ? first(timelineObject.statuses).id : 0
+  }
+}
+
 export const mutations = {
   addNewStatuses,
   addNewNotifications,
+  removeStatus,
   showNewStatuses (state, { timeline }) {
     const oldTimeline = (state.timelines[timeline])
 
     oldTimeline.newStatusCount = 0
     oldTimeline.visibleStatuses = slice(oldTimeline.statuses, 0, 50)
     oldTimeline.minVisibleId = last(oldTimeline.visibleStatuses).id
+    oldTimeline.minId = oldTimeline.minVisibleId
     oldTimeline.visibleStatusesObject = {}
     each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status })
   },
+  setNotificationFetcher (state, { fetcherId }) {
+    state.notifications.fetcherId = fetcherId
+  },
+  resetStatuses (state) {
+    const emptyState = defaultState()
+    Object.entries(emptyState).forEach(([key, value]) => {
+      state[key] = value
+    })
+  },
   clearTimeline (state, { timeline }) {
     state.timelines[timeline] = emptyTl(state.timelines[timeline].userId)
   },
@@ -371,7 +396,7 @@ export const mutations = {
 }
 
 const statuses = {
-  state: defaultState,
+  state: defaultState(),
   actions: {
     addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId }) {
       commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId })
@@ -391,6 +416,12 @@ const statuses = {
     setNotificationsSilence ({ rootState, commit }, { value }) {
       commit('setNotificationsSilence', { value })
     },
+    stopFetchingNotifications ({ rootState, commit }) {
+      if (rootState.statuses.notifications.fetcherId) {
+        window.clearInterval(rootState.statuses.notifications.fetcherId)
+      }
+      commit('setNotificationFetcher', { fetcherId: null })
+    },
     deleteStatus ({ rootState, commit }, status) {
       commit('setDeleted', { status })
       apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })

src/modules/users.js

@@ -292,9 +292,12 @@ const users = {
 
     logout (store) {
       store.commit('clearCurrentUser')
+      store.dispatch('disconnectFromChat')
       store.commit('setToken', false)
       store.dispatch('stopFetching', 'friends')
       store.commit('setBackendInteractor', backendInteractorService())
+      store.dispatch('stopFetchingNotifications')
+      store.commit('resetStatuses')
     },
     loginUser (store, accessToken) {
       return new Promise((resolve, reject) => {
@@ -319,6 +322,9 @@ const users = {
 
               if (user.token) {
                 store.dispatch('setWsToken', user.token)
+
+                // Initialize the chat socket.
+                store.dispatch('initializeSocket')
               }
 
               // Start getting fresh posts.

src/services/backend_interactor_service/backend_interactor_service.js

@@ -54,8 +54,8 @@ const backendInteractorService = (credentials) => {
     return apiService.denyUser({credentials, id})
   }
 
-  const startFetching = ({timeline, store, userId = false}) => {
+  const startFetching = ({timeline, store, userId = false, tag}) => {
-    return timelineFetcherService.startFetching({timeline, store, credentials, userId})
+    return timelineFetcherService.startFetching({timeline, store, credentials, userId, tag})
   }
 
   const setUserMute = ({id, muted = true}) => {

src/services/timeline_fetcher/timeline_fetcher.service.js

@@ -21,7 +21,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false
   const timelineData = rootState.statuses.timelines[camelCase(timeline)]
 
   if (older) {
-    args['until'] = until || timelineData.minVisibleId
+    args['until'] = until || timelineData.minId
   } else {
     args['since'] = timelineData.maxId
   }

static/font/css/fontello.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?40976680');
+  src: url('../font/fontello.eot?72648396');
-  src: url('../font/fontello.eot?40976680#iefix') format('embedded-opentype'),
+  src: url('../font/fontello.eot?72648396#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?40976680') format('woff2'),
+       url('../font/fontello.woff2?72648396') format('woff2'),
-       url('../font/fontello.woff?40976680') format('woff'),
+       url('../font/fontello.woff?72648396') format('woff'),
-       url('../font/fontello.ttf?40976680') format('truetype'),
+       url('../font/fontello.ttf?72648396') format('truetype'),
-       url('../font/fontello.svg?40976680#fontello') format('svg');
+       url('../font/fontello.svg?72648396#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?40976680#fontello') format('svg');
+    src: url('../font/fontello.svg?72648396#fontello') format('svg');
   }
 }
 */

static/font/demo.html

@@ -229,11 +229,11 @@ body {
 }
 @font-face {
       font-family: 'fontello';
-      src: url('./font/fontello.eot?96534782');
+      src: url('./font/fontello.eot?23081587');
-      src: url('./font/fontello.eot?96534782#iefix') format('embedded-opentype'),
+      src: url('./font/fontello.eot?23081587#iefix') format('embedded-opentype'),
-           url('./font/fontello.woff?96534782') format('woff'),
+           url('./font/fontello.woff?23081587') format('woff'),
-           url('./font/fontello.ttf?96534782') format('truetype'),
+           url('./font/fontello.ttf?23081587') format('truetype'),
-           url('./font/fontello.svg?96534782#fontello') format('svg');
+           url('./font/fontello.svg?23081587#fontello') format('svg');
       font-weight: normal;
       font-style: normal;
     }

static/timeago-cs.json

@@ -0,0 +1,10 @@
+[
+  "teď",
+  ["%s s", "%s s"],
+  ["%s min", "%s min"],
+  ["%s h", "%s h"],
+  ["%s d", "%s d"],
+  ["%s týd", "%s týd"],
+  ["%s měs", "%s měs"],
+  ["%s r", "%s l"]
+]

test/unit/specs/boot/routes.spec.js

@@ -24,7 +24,7 @@ describe('routes', () => {
 
     const matchedComponents = router.getMatchedComponents()
 
-    expect(matchedComponents[0].components.hasOwnProperty('UserCardContent')).to.eql(true)
+    expect(matchedComponents[0].components.hasOwnProperty('UserCard')).to.eql(true)
   })
 
   it('user\'s profile at /users', () => {
@@ -32,6 +32,6 @@ describe('routes', () => {
 
     const matchedComponents = router.getMatchedComponents()
 
-    expect(matchedComponents[0].components.hasOwnProperty('UserCardContent')).to.eql(true)
+    expect(matchedComponents[0].components.hasOwnProperty('UserCard')).to.eql(true)
   })
 })

test/unit/specs/modules/statuses.spec.js

@@ -1,4 +1,3 @@
-import { cloneDeep } from 'lodash'
 import { defaultState, mutations, prepareStatus } from '../../../../src/modules/statuses.js'
 
 // eslint-disable-next-line camelcase
@@ -15,16 +14,17 @@ const makeMockStatus = ({id, text, type = 'status'}) => {
   }
 }
 
-describe('Statuses.prepareStatus', () => {
+describe('Statuses module', () => {
+  describe('prepareStatus', () => {
     it('sets deleted flag to false', () => {
       const aStatus = makeMockStatus({id: '1', text: 'Hello oniichan'})
       expect(prepareStatus(aStatus).deleted).to.eq(false)
     })
   })
 
-describe('The Statuses module', () => {
+  describe('addNewStatuses', () => {
     it('adds the status to allStatuses and to the given timeline', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
 
       mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
@@ -36,7 +36,7 @@ describe('The Statuses module', () => {
     })
 
     it('counts the status as new if it has not been seen on this timeline', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
 
       mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
@@ -54,7 +54,7 @@ describe('The Statuses module', () => {
     })
 
     it('add the statuses to allStatuses if no timeline is given', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
 
       mutations.addNewStatuses(state, { statuses: [status] })
@@ -66,7 +66,7 @@ describe('The Statuses module', () => {
     })
 
     it('adds the status to allStatuses and to the given timeline, directly visible', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
 
       mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
@@ -78,7 +78,7 @@ describe('The Statuses module', () => {
     })
 
     it('removes statuses by tag on deletion', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
       const otherStatus = makeMockStatus({id: '3'})
       status.uri = 'xxx'
@@ -96,7 +96,7 @@ describe('The Statuses module', () => {
     })
 
     it('does not update the maxId when the noIdUpdate flag is set', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
       const secondStatus = makeMockStatus({id: '2'})
 
@@ -110,7 +110,7 @@ describe('The Statuses module', () => {
     })
 
     it('keeps a descending by id order in timeline.visibleStatuses and timeline.statuses', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const nonVisibleStatus = makeMockStatus({id: '1'})
       const status = makeMockStatus({id: '3'})
       const statusTwo = makeMockStatus({id: '2'})
@@ -130,7 +130,7 @@ describe('The Statuses module', () => {
     })
 
     it('splits retweets from their status and links them', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
       const retweet = makeMockStatus({id: '2', type: 'retweet'})
       const modStatus = makeMockStatus({id: '1', text: 'something else'})
@@ -155,7 +155,7 @@ describe('The Statuses module', () => {
     })
 
     it('replaces existing statuses with the same id', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
       const modStatus = makeMockStatus({id: '1', text: 'something else'})
 
@@ -172,7 +172,7 @@ describe('The Statuses module', () => {
     })
 
     it('replaces existing statuses with the same id, coming from a retweet', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
       const modStatus = makeMockStatus({id: '1', text: 'something else'})
       const retweet = makeMockStatus({id: '2', type: 'retweet'})
@@ -193,7 +193,7 @@ describe('The Statuses module', () => {
     })
 
     it('handles favorite actions', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
 
       const favorite = {
@@ -239,20 +239,39 @@ describe('The Statuses module', () => {
       expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
       expect(state.timelines.public.visibleStatuses[0].favorited).to.eql(true)
     })
+  })
 
+  describe('showNewStatuses', () => {
+    it('resets the minId to the min of the visible statuses when adding new to visible statuses', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '10' })
+      mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+      const newStatus = makeMockStatus({ id: '20' })
+      mutations.addNewStatuses(state, { statuses: [newStatus], showImmediately: false, timeline: 'public' })
+      state.timelines.public.minId = '5'
+      mutations.showNewStatuses(state, { timeline: 'public' })
+
+      expect(state.timelines.public.visibleStatuses.length).to.eql(2)
+      expect(state.timelines.public.minVisibleId).to.eql('10')
+      expect(state.timelines.public.minId).to.eql('10')
+    })
+  })
+
+  describe('clearTimeline', () => {
     it('keeps userId when clearing user timeline', () => {
-    const state = cloneDeep(defaultState)
+      const state = defaultState()
       state.timelines.user.userId = 123
 
       mutations.clearTimeline(state, { timeline: 'user' })
 
       expect(state.timelines.user.userId).to.eql(123)
     })
+  })
 
   describe('notifications', () => {
     it('removes a notification when the notice gets removed', () => {
       const user = { id: '1' }
-      const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
       const otherStatus = makeMockStatus({id: '3'})
       const mentionedStatus = makeMockStatus({id: '2'})