diff --git a/.gitignore b/.gitignore
index 14b8360be0d..ce5a6b20f74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 /deploy
 /dist
 /docs
+/keys
 /nbproject
 /node_modules
 /temp
diff --git a/app/demo/template/buttons.htm b/app/demo/template/buttons.htm
index 9aa93904904..e4abb0083c4 100644
--- a/app/demo/template/buttons.htm
+++ b/app/demo/template/buttons.htm
@@ -17,7 +17,7 @@ <h2>Icon</h2>
 <br><br>
 <div class="button-icon">
   <div class="box-round icon-contacts"></div>
-  <span>Import OSX Contacts</span>
+  <span>Import macOS Contacts</span>
 </div>
 <h2>Round</h2>
 <h3>button-round-xl</h3>
diff --git a/app/font/Wire.ttf b/app/font/Wire.ttf
index b842d30bc84..d64f56a07cb 100755
Binary files a/app/font/Wire.ttf and b/app/font/Wire.ttf differ
diff --git a/app/font/redacted-script-regular.woff2 b/app/font/redacted-script-regular.woff2
new file mode 100644
index 00000000000..b076d61969d
Binary files /dev/null and b/app/font/redacted-script-regular.woff2 differ
diff --git a/app/page/template/_dist/app.htm b/app/page/template/_dist/app.htm
index a44f70d6435..cc6f969c319 100644
--- a/app/page/template/_dist/app.htm
+++ b/app/page/template/_dist/app.htm
@@ -13,6 +13,7 @@
 <script src="/script/util/scroll-helpers.js"></script>
 <script src="/script/util/Statistics.js"></script>
 <script src="/script/util/storage.js"></script>
+<script src="/script/util/StringUtil.js"></script>
 <script src="/script/util/CountryCodes.js"></script>
 <script src="/script/util/worker.js"></script>
 <!-- Storage -->
@@ -26,6 +27,7 @@
 <script src="/script/service/BackendClientError.js"></script>
 <script src="/script/service/BackendEnvironment.js"></script>
 <script src="/script/service/Client.js"></script>
+<script src="/script/service/RequestQueueBlockedState.js"></script>
 <!-- Events -->
 <script src="/script/event/Backend.js"></script>
 <script src="/script/event/Client.js"></script>
@@ -45,6 +47,11 @@
 <!-- Localization -->
 <script src="/script/localization/strings-init.js"></script>
 <script src="/script/localization/strings-de.js"></script>
+<script src="/script/localization/strings-es.js"></script>
+<script src="/script/localization/strings-fi.js"></script>
+<script src="/script/localization/strings-hr.js"></script>
+<script src="/script/localization/strings-ro.js"></script>
+<script src="/script/localization/strings-ru.js"></script>
 <script src="/script/localization/strings.js"></script>
 <script src="/script/localization/Localizer.js"></script>
 <!-- Media -->
@@ -68,6 +75,9 @@
 <!-- Announce -->
 <script src="/script/announce/AnnounceService.js"></script>
 <script src="/script/announce/AnnounceRepository.js"></script>
+<!-- Bot -->
+<script src="/script/bot/BotService.js"></script>
+<script src="/script/bot/BotRepository.js"></script>
 <!-- Telemetry -->
 <script src="/script/telemetry/app_init/AppInitStatistics.js"></script>
 <script src="/script/telemetry/app_init/AppInitStatisticsValue.js"></script>
@@ -94,6 +104,8 @@
 <script src="/script/connect/ConnectSource.js"></script>
 <script src="/script/connect/ConnectTrigger.js"></script>
 <script src="/script/connect/PhoneBook.js"></script>
+<!-- Ephemeral -->
+<script src="/script/ephemeral/ephemeralTimings.js"></script>
 <!-- GeoLocation -->
 <script src="/script/location/GeoLocation.js"></script>
 <!-- Conversation -->
@@ -184,6 +196,7 @@
 <script src="/script/components/contextMenu.js"></script>
 <script src="/script/components/deviceCard.js"></script>
 <script src="/script/components/deviceRemove.js"></script>
+<script src="/script/components/ephemeralTimer.js"></script>
 <script src="/script/components/groupList.js"></script>
 <script src="/script/components/inputElement.js"></script>
 <script src="/script/components/topPeople.js"></script>
@@ -203,6 +216,7 @@
 <script src="/script/components/calling/deviceToggleButton.js"></script>
 <!-- Entities -->
 <script src="/script/message/CallMessageType.js"></script>
+<script src="/script/message/EphemeralStatusType.js"></script>
 <script src="/script/message/StatusType.js"></script>
 <script src="/script/message/PingMessageType.js"></script>
 <script src="/script/message/ReactionType.js"></script>
diff --git a/app/page/template/content/conversation/conversation-input.htm b/app/page/template/content/conversation/conversation-input.htm
index d1274708445..b422fbe1819 100644
--- a/app/page/template/content/conversation/conversation-input.htm
+++ b/app/page/template/content/conversation/conversation-input.htm
@@ -19,13 +19,14 @@
                   class="conversation-input-text border-theme"
                   data-bind="event: {'keydown': on_input_key_down},
                              focus_on_keydown: true,
+                             css: {'ephemeral-input': conversation_et().ephemeral_timer()},
                              enter: on_input_enter,
                              hasFocus: blinking_cursor,
                              textInput: input,
                              resize: input,
                              resize_callback: scroll_message_list,
                              click: on_input_click,
-                             l10n_placeholder: z.string.tooltip_conversation_input_placeholder"
+                             attr: {'placeholder': input_tooltip}"
                   data-uie-name="input-message">
         </textarea>
       </div>
@@ -42,6 +43,27 @@
           <!-- /ko -->
 
           <!-- ko if: input().length === 0 -->
+
+            <!-- ko if: conversation_et().is_one2one() -->
+              <span id="conversation-input-ephemeral"
+                    class="controls-right-button conversation-input-ephemeral"
+                    data-bind="l10n_tooltip: z.string.de.tooltip_conversation_ephemeral"
+                    data-uie-name="do-set-ephemeral-timer">
+                <!-- ko if: conversation_et().ephemeral_timer() -->
+                  <div class="ephemeral-timer-button">
+                    <span class="ephemeral-timer-button-unit" data-bind="text: z.util.format_milliseconds_short(conversation_et().ephemeral_timer())[1]"></span>
+                    <span class="full-screen" data-bind="text: z.util.format_milliseconds_short(conversation_et().ephemeral_timer())[0]"></span>
+                  </div>
+                <!-- /ko -->
+                <!-- ko ifnot: conversation_et().ephemeral_timer() -->
+                  <span class="button-icon-large icon-hourglass"></span>
+                <!-- /ko -->
+                  <context-menu class="controls-right-button-ephemeral-context"
+                                params="entries: get_context_menu_entries(), placement: 'top', tag: 'ephemeral'"
+                                tabindex="-1"></context-menu>
+              </span>
+            <!-- /ko -->
+
             <label id="conversation-input-photo"
                    class="controls-right-button button-icon-large icon-library"
                    data-bind="attr: {'title': picture_tooltip}">
diff --git a/app/page/template/content/conversation/message-list.htm b/app/page/template/content/conversation/message-list.htm
index 0ad6fd66163..14dbc55511a 100644
--- a/app/page/template/content/conversation/message-list.htm
+++ b/app/page/template/content/conversation/message-list.htm
@@ -1,10 +1,11 @@
  <div id="message-list" class="message-list" data-bind="with: $root.message_list, show_all_timestamps: true">
    <div class="messages-wrap" data-bind="antiscroll, event: {scroll: on_scroll}">
      <div class="messages"
-          data-bind="css: {'messages-centered': center_messages},
+          data-bind="css: {'flex-center': center_messages},
                      foreach: {data: conversation().messages_visible, as: 'message'}">
       <div class="message"
            data-bind="css: $parent.get_css_class(message),
+                      message_in_viewport: function() {$parent.message_in_viewport(message)},
                       attr: {'data-uie-uid': message.id, 'data-uie-value': message.super_type}, 'data-uie-sending-status': message.status"
            data-uie-name="item-message">
         <div data-bind="template: {name: 'timestamp'}"></div>
diff --git a/app/page/template/content/preferences-account.htm b/app/page/template/content/preferences-account.htm
index 6674310325e..a9be26505e2 100644
--- a/app/page/template/content/preferences-account.htm
+++ b/app/page/template/content/preferences-account.htm
@@ -28,7 +28,7 @@
 
       <section class="preferences-section preferences-section-account-security">
         <hr class="preferences-separator">
-        <div class="preferences-link text-theme" data-bind="click: click_on_reset_password, l10n_text: z.string.preferences_account_change_password, l10n_tooltip: z.string.tooltip_preferences_password" data-uie-name="do-reset-password"></div>
+        <div class="preferences-link text-theme" data-bind="click: click_on_reset_password, l10n_text: z.string.preferences_account_reset_password, l10n_tooltip: z.string.tooltip_preferences_password" data-uie-name="do-reset-password"></div>
         <div class="preferences-link text-theme" data-bind="click: click_on_delete_account, l10n_text: z.string.preferences_account_delete" data-uie-name="go-delete-account"></div>
       </section>
 
diff --git a/app/page/template/content/preferences-device-details.htm b/app/page/template/content/preferences-device-details.htm
index d70f3042104..5978540eba1 100644
--- a/app/page/template/content/preferences-device-details.htm
+++ b/app/page/template/content/preferences-device-details.htm
@@ -1,4 +1,4 @@
-<div id="preferences-devices" class="preferences-page preferences-devices" data-bind="with: $root.preferences_device_details" data-uie-name="preferences-devices-details">
+<div id="preferences-device-details" class="preferences-page preferences-device-details" data-bind="with: $root.preferences_device_details" data-uie-name="preferences-devices-details">
   <div class="preferences-titlebar" data-bind="l10n_text: z.string.preferences_device_details"></div>
   <div class="preferences-content-wrapper">
     <div class="preferences-content" data-bind="antiscroll">
diff --git a/app/page/template/content/preferences-devices.htm b/app/page/template/content/preferences-devices.htm
index c954b90b224..d9ed37d9605 100644
--- a/app/page/template/content/preferences-devices.htm
+++ b/app/page/template/content/preferences-devices.htm
@@ -41,6 +41,7 @@
               </div>
             </div>
           <!-- /ko -->
+          <div class="preferences-detail" data-bind="l10n_text: z.string.preferences_devices_active_detail"></div>
         </section>
       <!-- /ko -->
     </div>
diff --git a/app/page/template/content/preferences-options.htm b/app/page/template/content/preferences-options.htm
index 885672b1919..88f8f28c7b8 100644
--- a/app/page/template/content/preferences-options.htm
+++ b/app/page/template/content/preferences-options.htm
@@ -28,20 +28,20 @@
       <section class="preferences-section">
         <header class="preferences-header" data-bind="l10n_text: z.string.preferences_options_contacts"></header>
         <div class="preferences-option">
-          <div class="preferences-option-icon" data-bind="click: connect_google, l10n_tooltip: z.string.tooltip_preferences_contacts" data-uie-name="do-share-contacts">
+          <div class="preferences-option-icon" data-bind="click: connect_google, l10n_tooltip: z.string.tooltip_preferences_contacts_gmail" data-uie-name="do-share-contacts">
             <svg>
               <use xlink:href="#icon-gmail"></use>
             </svg>
             <label data-bind="l10n_text: z.string.preferences_options_contacts_gmail"></label>
           </div>
           <!-- ko if: window.zAddressBook -->
-            <div class="preferences-option-icon" data-bind="click: connect_osx_contacts, l10n_tooltip: z.string.preferences_share_osx_contacts" data-uie-name="do-share-osx-contacts">
+            <div class="preferences-option-icon" data-bind="click: connect_macos_contacts, l10n_tooltip: z.string.tooltip_preferences_contacts_macos" data-uie-name="do-share-osx-contacts">
               <div class="icon-contacts"></div>
-              <label data-bind="l10n_text: z.string.preferences_options_contacts_osx"></label>
+              <label data-bind="l10n_text: z.string.preferences_options_contacts_macos"></label>
             </div>
           <!-- /ko -->
         </div>
-        <div class="preferences-detail"  data-bind="l10n_text: z.string.preferences_options_contacts_detail"></div>
+        <div class="preferences-detail" data-bind="l10n_text: z.string.preferences_options_contacts_detail"></div>
       </section>
 
       <section class="preferences-section">
diff --git a/app/page/template/partials/template-message.htm b/app/page/template/partials/template-message.htm
index e3bb2a62873..e8b1639fbaa 100644
--- a/app/page/template/partials/template-message.htm
+++ b/app/page/template/partials/template-message.htm
@@ -38,12 +38,14 @@
       <span data-bind='text: message.sender_name()'></span>
       <span class="message-header-label-icon icon-trash" data-bind="attr: {title: message.display_deleted_timestamp()}"></span>
     </div>
-    <time class="time" data-bind="text: message.display_deleted_timestamp(), attr: {'data-timestamp': message.deleted_timestamp, 'data-uie-uid': message.id}" data-uie-name="item-message-delete-timestamp"></time>
+    <div class="message-body-actions message-body-actions-large">
+      <time class="time" data-bind="text: message.display_deleted_timestamp(), attr: {'data-timestamp': message.deleted_timestamp, 'data-uie-uid': message.id}" data-uie-name="item-message-delete-timestamp"></time>
+    </div>
   </div>
 </script>
 
 <script type="text/html" id="normal">
-  <div class="message-header" data-bind="css: {'message-hide-user-avatar': $parent.should_hide_user_avatar($data)}">
+  <div class="message-header" data-bind="visible: !$parent.should_hide_user_avatar($data)">
     <div class="message-header-icon">
       <user-avatar class="sender-avatar user-avatar-xs" data-bubble="#participants-bubble" data-placement="vertical" params="user: message.user(), click: $parent.on_message_user_click"></user-avatar>
     </div>
@@ -59,51 +61,52 @@
     <!-- ko foreach: {data: message.assets, as: 'asset'} -->
       <!-- ko if: asset.is_medium_image() -->
         <div class="message-asset-image" data-bind="fit_to_viewport: asset">
-          <div class="image image-loading" data-bind="background_image: asset.resource, viewport_changed: $parents[1].viewport_changed, click: $parents[1].show_detail, attr: {'data-uie-visible': $parent.visible}" data-uie-name="go-image-detail" >
-            <img class="image-element" data-bind="attr: {src: asset.dummy_url}"/>
-            <span class="image-placeholder-icon">
-              <div class="three-dots">
-                <span></span>
-                <span></span>
-                <span></span>
-              </div>
-            </span>
+          <div class="image image-loading" data-bind="
+            attr: {'data-uie-visible': $parent.visible},
+            background_image: asset.resource,
+            click: $parents[1].show_detail,
+            css: {'bg-color-ephemeral': message.is_expired()},
+            viewport_changed: $parents[1].viewport_changed
+            " data-uie-name="go-image-detail">
+            <!-- ko ifnot: message.is_expired() -->
+              <img class="image-element" data-bind="attr: {src: asset.dummy_url}"/>
+              <span class="image-placeholder-icon">
+                <div class="three-dots">
+                  <span></span>
+                  <span></span>
+                  <span></span>
+                </div>
+              </span>
+            <!-- /ko -->
+            <!-- ko if: message.is_expired() -->
+              <img class="image-element image-ephemeral" data-bind="attr: {src: asset.dummy_url}"/>
+            <!-- /ko -->
           </div>
         </div>
       <!-- /ko -->
       <!-- ko if: asset.is_text() -->
         <!-- ko if: asset.should_render_text -->
-          <div class="text" data-bind="html: asset.render(), css: {'message-is-editing': $parent.is_editing, 'text-large': z.util.emoji.contains_only_emojies(asset.text), 'text-graphite': message.status() === z.message.StatusType.SENDING}"></div>
+          <div class="text" data-bind="html: asset.render(), css: {'text-graphite': $parent.is_editing, 'text-large': z.util.emoji.contains_only_emojies(asset.text), 'text-graphite': message.status() === z.message.StatusType.SENDING, 'ephemeral-message-obfuscated': message.is_expired()}"></div>
         <!-- /ko -->
         <!-- ko foreach: asset.previews() -->
-          <link-preview-asset params="preview: $data, viewport_changed: $parents[2].viewport_changed"></link-preview-asset>
+          <link-preview-asset params="expired: message.is_expired(), preview: $data, viewport_changed: $parents[2].viewport_changed"></link-preview-asset>
         <!-- /ko -->
       <!-- /ko -->
       <!-- ko if: asset.is_video() -->
-        <video-asset params="asset: asset"></video-asset>
+        <video-asset data-bind="css: {'bg-color-ephemeral': message.is_expired()}" params="asset: asset, expired: message.is_expired()"></video-asset>
       <!-- /ko -->
       <!-- ko if: asset.is_audio() -->
-        <audio-asset params="asset: asset"></audio-asset>
+        <audio-asset data-bind="css: {'bg-color-ephemeral': message.is_expired()}" params="asset: asset, expired: message.is_expired()"></audio-asset>
       <!-- /ko -->
       <!-- ko if: asset.is_file() -->
-        <file-asset params="asset: asset"></file-asset>
+        <file-asset data-bind="css: {'bg-color-ephemeral': message.is_expired()}" params="asset: asset, expired: message.is_expired()"></file-asset>
       <!-- /ko -->
       <!-- ko if: asset.is_location() -->
         <location-asset params="asset: asset"></location-asset>
       <!-- /ko -->
-
-      <context-menu params="entries: function() {return $parents[1].get_context_menu_entries(message)}, tag: 'message', data: message.id"
-                    class="context-menu icon-more font-size-xs"
-                    tabindex="-1"></context-menu>
-      <!-- ko ifnot: message.timestamp == '' -->
-        <time class="time" data-bind="text: message.display_timestamp_short(), attr: {'data-timestamp': message.timestamp, 'data-uie-uid': message.id}" data-uie-name="item-message-timestamp"></time>
-        <!-- ko if: $parents[1].is_last_delivered_message(message) -->
-          <span class="message-status" data-bind="l10n_text: z.string.conversation_message_delivered"></span>
-        <!-- /ko -->
-      <!-- /ko -->
     <!-- /ko -->
 
-    <!-- ko if: !message.other_likes().length && message.status() !== z.message.StatusType.SENDING -->
+    <!-- ko if: !message.other_likes().length && message.is_reactable() -->
       <div class="message-body-like">
         <span class="message-body-like-icon like-button message-show-on-hover" data-bind="attr: {'data-ui-value': message.is_liked()}, css: {'like-button-liked': message.is_liked()}, style: {opacity: message.is_liked() ? 1 : ''}, click: $parent.click_on_like">
           <span class="icon-liked"></span>
@@ -112,6 +115,19 @@
       </div>
     <!-- /ko -->
 
+    <div class="message-body-actions">
+      <context-menu params="entries: function() {return $parent.get_context_menu_entries(message)}, tag: 'message', data: message.id"
+                    class="context-menu icon-more font-size-xs"
+                    tabindex="-1"></context-menu>
+      <time class="time" data-bind="text: message.display_timestamp_short(), attr: {'data-timestamp': message.timestamp, 'data-uie-uid': message.id}" data-uie-name="item-message-timestamp"></time>
+      <!-- ko if: $parent.is_last_delivered_message(message) -->
+        <span class="message-status" data-bind="l10n_text: z.string.conversation_message_delivered"></span>
+      <!-- /ko -->
+      <!-- ko if: message.ephemeral_status() === z.message.EphemeralStatusType.ACTIVE -->
+        <ephemeral-timer class="message-ephemeral-timer" params="expires: message.expire_after_millis()"></ephemeral-timer>
+      <!-- /ko -->
+    </div>
+
   </div>
   <!-- ko if: message.other_likes().length -->
     <div class="message-footer">
@@ -205,18 +221,21 @@
     <div class="message-header-icon">
       <user-avatar class="sender-avatar user-avatar-xs" data-bubble="#participants-bubble" data-placement="vertical" params="user: message.user(), click: $parent.on_message_user_click"></user-avatar>
     </div>
-    <div class="message-header-label" data-bind="css: message.accent_color">
+    <div class="message-header-label" data-bind="css: message.ping_color">
       <span class="label-bold" data-bind='text: message.sender_name()'></span>
       <span class="ellipsis" data-bind="text: message.caption"></span>
       <span class="message-icon-ping icon-ping" data-bind="css: message.animation()"></span>
     </div>
+    <div class="message-body-actions">
+      <context-menu params="entries: function() {return $parent.get_context_menu_entries($data)}, tag: 'message', data: message.id"
+                    class="context-menu icon-more font-size-xs"
+                    tabindex="-1"></context-menu>
+      <time class="time" data-bind="text: message.display_timestamp_short(), attr: {'data-timestamp': message.timestamp}"></time>
+      <!-- ko if: message.ephemeral_status() === z.message.EphemeralStatusType.ACTIVE -->
+      <ephemeral-timer class="message-ephemeral-timer" params="expires: message.expire_after_millis()"></ephemeral-timer>
+      <!-- /ko -->
+    </div>
   </div>
-  <context-menu params="entries: function() {return $parent.get_context_menu_entries($data)}, tag: 'message', data: message.id"
-                class="context-menu icon-more font-size-xs"
-                tabindex="-1"></context-menu>
-  <!-- ko ifnot: message.timestamp == '' -->
-    <time class="time" data-bind="text: message.display_timestamp_short(), attr: {'data-timestamp': message.timestamp}"></time>
-  <!-- /ko -->
 </script>
 
 <script type="text/html" id="system">
diff --git a/app/script/assets/AssetService.coffee b/app/script/assets/AssetService.coffee
index 81fe67d980b..734ee33ec9d 100644
--- a/app/script/assets/AssetService.coffee
+++ b/app/script/assets/AssetService.coffee
@@ -216,13 +216,17 @@ class z.assets.AssetService
   @param conversation_id [String] ID of the self conversation
   @param json_payload [Object] First part of the multipart message
   @param image_data [Uint8Array|ArrayBuffer] encrypted image data
-  @param force_sending [Boolean] Force sending
+  @param precondition_option [Array<String>|Boolean] Level that backend checks for missing clients
   @param upload_id [String] Identifies the upload request
   ###
-  post_asset_v2: (conversation_id, json_payload, image_data, force_sending, upload_id) ->
+  post_asset_v2: (conversation_id, json_payload, image_data, precondition_option, upload_id) ->
     return new Promise (resolve, reject) =>
       url = @client.create_url "/conversations/#{conversation_id}/otr/assets"
-      url = "#{url}?ignore_missing=true" if force_sending
+
+      if _.isArray precondition_option
+        url = "#{url}?report_missing=#{precondition_option.join ','}"
+      else if precondition_option
+        url = "#{url}?ignore_missing=true"
 
       image_data = new Uint8Array image_data
       data = @_create_asset_multipart_body image_data, json_payload
diff --git a/app/script/auth/AuthRepository.coffee b/app/script/auth/AuthRepository.coffee
index 939cb7e6561..426c005186a 100644
--- a/app/script/auth/AuthRepository.coffee
+++ b/app/script/auth/AuthRepository.coffee
@@ -127,9 +127,7 @@ class z.auth.AuthRepository
   request_login_code: (request_code) =>
     @auth_service.post_login_send request_code
 
-  ###
-  Renew access-token provided a valid cookie.
-  ###
+  # Renew access-token provided a valid cookie.
   renew_access_token: =>
     @get_access_token()
     .then =>
@@ -165,7 +163,7 @@ class z.auth.AuthRepository
   ###
   get_access_token: =>
     return new Promise (resolve, reject) =>
-      if @auth_service.client.is_requesting_access_token()
+      if @auth_service.client.request_queue_blocked_state() is z.service.RequestQueueBlockedState.ACCESS_TOKEN_REFRESH
         error = new z.auth.AccessTokenError z.auth.AccessTokenError::TYPE.REFRESH_IN_PROGRESS
         @logger.log @logger.levels.WARN, error.message
         reject error
diff --git a/app/script/auth/AuthService.coffee b/app/script/auth/AuthService.coffee
index 3766158a753..ff86d461679 100644
--- a/app/script/auth/AuthService.coffee
+++ b/app/script/auth/AuthService.coffee
@@ -73,7 +73,7 @@ class z.auth.AuthService
   ###
   post_access: (options) ->
     return new Promise (resolve, reject) =>
-      @client.is_requesting_access_token true
+      @client.request_queue_blocked_state z.service.RequestQueueBlockedState.ACCESS_TOKEN_REFRESH
 
       options = $.extend
         should_retry: true
@@ -258,4 +258,4 @@ class z.auth.AuthService
   save_access_token_in_client: (type = '', value = '') =>
     @client.access_token_type = type
     @client.access_token = value
-    @client.is_requesting_access_token false
+    @client.request_queue_blocked_state z.service.RequestQueueBlockedState.NONE
diff --git a/app/script/auth/URLParameter.coffee b/app/script/auth/URLParameter.coffee
index 3eb9c5ec85a..7501b3309a8 100644
--- a/app/script/auth/URLParameter.coffee
+++ b/app/script/auth/URLParameter.coffee
@@ -20,6 +20,7 @@ window.z ?= {}
 z.auth ?= {}
 
 z.auth.URLParameter =
+  BOT: 'bot'
   CONNECT: 'connect'
   ENVIRONMENT: 'env'
   EXPIRED: 'expired'
diff --git a/app/script/bot/BotRepository.coffee b/app/script/bot/BotRepository.coffee
new file mode 100644
index 00000000000..684306e3990
--- /dev/null
+++ b/app/script/bot/BotRepository.coffee
@@ -0,0 +1,39 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+window.z ?= {}
+z.bot ?= {}
+
+class z.bot.BotRepository
+  constructor: (@bot_service, @conversation_repository) ->
+    @logger = new z.util.Logger 'z.bot.BotRepository', z.config.LOGGER.OPTIONS
+
+  # Add bot to conversation.
+  add_bot: (bot_name, create_conversation = true) =>
+    bot_result = undefined
+
+    @bot_service.fetch_bot bot_name
+    .then (result) =>
+      bot_result = result
+      @logger.log @logger.levels.INFO, "Info for bot '#{bot_name}' retrieved", bot_result
+      if create_conversation
+        @conversation_repository.create_new_conversation [], bot_result.name or bot_name
+    .then (conversation_et) =>
+      conversation_et ?= @conversation_repository.active_conversation()
+      @conversation_repository.add_bot conversation_et, bot_result.provider, bot_result.service
+      amplify.publish z.event.WebApp.CONVERSATION.SHOW, conversation_et
diff --git a/app/script/bot/BotService.coffee b/app/script/bot/BotService.coffee
new file mode 100644
index 00000000000..bf780055f3d
--- /dev/null
+++ b/app/script/bot/BotService.coffee
@@ -0,0 +1,34 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+window.z ?= {}
+z.bot ?= {}
+
+class z.bot.BotService
+  constructor: ->
+    @logger = new z.util.Logger 'z.bot.BotService', z.config.LOGGER.OPTIONS
+    @url = "#{z.config.BOT_URL}"
+    return @
+
+  fetch_bot: (bot_name) ->
+    return new Promise (resolve) =>
+      $.get "#{@url}#{bot_name}/"
+      .done (data, textStatus, jqXHR) ->
+        resolve data.result
+      .fail (jqXHR, textStatus, errorThrown) =>
+        @logger.log @logger.levels.WARNING, "Could not find information for bot '#{bot_name}': #{errorThrown}"
diff --git a/app/script/calling/CallService.coffee b/app/script/calling/CallService.coffee
index 6ca056213f1..6ea2fa506fc 100644
--- a/app/script/calling/CallService.coffee
+++ b/app/script/calling/CallService.coffee
@@ -49,7 +49,6 @@ class z.calling.CallService
 
     @client.send_request
       type: 'DELETE'
-      api_endpoint: '/conversations/{conversation_id}/call/flows/{flow_id}'
       url: @client.create_url url
 
   ###
@@ -69,7 +68,6 @@ class z.calling.CallService
   get_state: (conversation_id) ->
     @client.send_request
       type: 'GET'
-      api_endpoint: '/conversations/{conversation_id}/call/state'
       url: @client.create_url "/conversations/#{conversation_id}/call/state"
 
   ###
@@ -92,7 +90,6 @@ class z.calling.CallService
   post_local_candidates: (conversation_id, flow_id, ice_info) ->
     @client.send_json
       type: 'POST'
-      api_endpoint: '/conversations/{conversation_id}/call/flows/{flow_id}/local_candidates'
       url: @client.create_url "/conversations/#{conversation_id}/call/flows/#{flow_id}/local_candidates"
       data:
         candidates: [ice_info]
@@ -125,7 +122,6 @@ class z.calling.CallService
   put_state: (conversation_id, payload) ->
     @client.send_json
       type: 'PUT'
-      api_endpoint: '/conversations/{conversation_id}/call/state'
       url: @client.create_url "/conversations/#{conversation_id}/call/state"
       data:
         self: payload
diff --git a/app/script/calling/handler/CallStateHandler.coffee b/app/script/calling/handler/CallStateHandler.coffee
index 99b44626fbe..b4e900238f2 100644
--- a/app/script/calling/handler/CallStateHandler.coffee
+++ b/app/script/calling/handler/CallStateHandler.coffee
@@ -381,6 +381,7 @@ class z.calling.handler.CallStateHandler
               amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.MEDIA.COMPLETED_MEDIA_ACTION,
                 action: media_action
                 conversation_type: z.tracking.helpers.get_conversation_type conversation_et
+                is_ephemeral: false
                 with_bot: conversation_et.is_with_bot()
         return true
 
diff --git a/app/script/client/ClientRepository.coffee b/app/script/client/ClientRepository.coffee
index 3878cef93d1..fe4c2185cf5 100644
--- a/app/script/client/ClientRepository.coffee
+++ b/app/script/client/ClientRepository.coffee
@@ -279,7 +279,7 @@ class z.client.ClientRepository
 
     if z.util.Environment.electron
       if z.util.Environment.os.mac
-        identifier = z.string.wire_osx
+        identifier = z.string.wire_macos
       else if z.util.Environment.os.win
         identifier = z.string.wire_windows
       else
diff --git a/app/script/components/asset/audioAsset.coffee b/app/script/components/asset/audioAsset.coffee
index c69ffbec6d5..10cc47e6773 100644
--- a/app/script/components/asset/audioAsset.coffee
+++ b/app/script/components/asset/audioAsset.coffee
@@ -29,6 +29,7 @@ class z.components.AudioAssetComponent
   constructor: (params, component_info) ->
     @logger = new z.util.Logger 'AudioAssetComponent', z.config.LOGGER.OPTIONS
     @asset = params.asset
+    @expired = params.expired
 
     @audio_src = ko.observable()
     @audio_element = $(component_info.element).find('audio')[0]
@@ -79,37 +80,39 @@ ko.components.register 'audio-asset',
   viewModel: createViewModel: (params, component_info) ->
     return new z.components.AudioAssetComponent params, component_info
   template: """
-    <audio data-bind="attr: {src: audio_src},
-                      event: {loadedmetadata: on_loadedmetadata, timeupdate: on_timeupdate}">
-    </audio>
-    <!-- ko if: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
-      <div class="asset-placeholder">
-        <div class="three-dots">
-          <span></span>
-          <span></span>
-          <span></span>
+    <!-- ko ifnot: expired() -->
+      <audio data-bind="attr: {src: audio_src},
+                        event: {loadedmetadata: on_loadedmetadata, timeupdate: on_timeupdate}">
+      </audio>
+      <!-- ko if: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
+        <div class="asset-placeholder">
+          <div class="three-dots">
+            <span></span>
+            <span></span>
+            <span></span>
+          </div>
         </div>
-      </div>
-    <!-- /ko -->
-    <!-- ko ifnot: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
-      <media-button params="src: audio_element,
-                            asset: asset,
-                            play: on_play_button_clicked,
-                            pause: on_pause_button_clicked,
-                            cancel: function() {asset.cancel($parents[1])}">
-      </media-button>
-      <!-- ko if: asset.status() !== z.assets.AssetTransferState.UPLOADING -->
-        <span class="audio-controls-time label-xs"
-              data-uie-name="status-audio-time"
-              data-bind="text: z.util.format_seconds(audio_time())">
-        </span>
-        <!-- ko if: show_loudness_preview -->
-          <audio-seek-bar data-uie-name="status-audio-seekbar"
-                          params="src: audio_element, asset: asset, disabled: !audio_is_loaded()"></audio-seek-bar>
-        <!-- /ko -->
-        <!-- ko ifnot: show_loudness_preview -->
-          <seek-bar data-uie-name="status-audio-seekbar"
-                    params="src: audio_element, dark: true, disabled: !audio_is_loaded()"></seek-bar>
+      <!-- /ko -->
+      <!-- ko ifnot: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
+        <media-button params="src: audio_element,
+                              asset: asset,
+                              play: on_play_button_clicked,
+                              pause: on_pause_button_clicked,
+                              cancel: function() {asset.cancel($parents[1])}">
+        </media-button>
+        <!-- ko if: asset.status() !== z.assets.AssetTransferState.UPLOADING -->
+          <span class="audio-controls-time label-xs"
+                data-uie-name="status-audio-time"
+                data-bind="text: z.util.format_seconds(audio_time())">
+          </span>
+          <!-- ko if: show_loudness_preview -->
+            <audio-seek-bar data-uie-name="status-audio-seekbar"
+                            params="src: audio_element, asset: asset, disabled: !audio_is_loaded()"></audio-seek-bar>
+          <!-- /ko -->
+          <!-- ko ifnot: show_loudness_preview -->
+            <seek-bar data-uie-name="status-audio-seekbar"
+                      params="src: audio_element, dark: true, disabled: !audio_is_loaded()"></seek-bar>
+          <!-- /ko -->
         <!-- /ko -->
       <!-- /ko -->
     <!-- /ko -->
diff --git a/app/script/components/asset/fileAsset.coffee b/app/script/components/asset/fileAsset.coffee
index 602f49a9c71..e142645ced2 100644
--- a/app/script/components/asset/fileAsset.coffee
+++ b/app/script/components/asset/fileAsset.coffee
@@ -28,6 +28,7 @@ class z.components.FileAssetComponent
   ###
   constructor: (params, component_info) ->
     @asset = params.asset
+    @expired = params.expired
 
     @circle_upload_progress = ko.pureComputed =>
       size = if @large then '200' else '100'
@@ -46,67 +47,72 @@ ko.components.register 'file-asset',
   viewModel: createViewModel: (params, component_info) ->
     return new z.components.FileAssetComponent params, component_info
   template: """
-            <div class="file"
+            <!-- ko if: expired() -->
+              <div class="file bg-color-ephemeral"></div>
+            <!-- /ko -->
+            <!-- ko ifnot: expired() -->
+              <div class="file"
                  data-uie-name="file"
                  data-bind="attr: {'data-uie-value': asset.file_name},
                             click: asset.status() === z.assets.AssetTransferState.UPLOADED ? asset.download : null,
                             css: {'cursor-pointer': asset.status() === z.assets.AssetTransferState.UPLOADED}">
-              <!-- ko if: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
-                <div class="asset-placeholder">
-                  <div class="three-dots">
-                    <span></span>
-                    <span></span>
-                    <span></span>
-                  </div>
-                </div>
-              <!-- /ko -->
-              <!-- ko ifnot: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
-                <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOADED -->
-                  <div class="file-icon icon-file" data-uie-name="file-icon" data-bind="click: asset.download, clickBubble: false">
-                    <span class="file-icon-ext icon-view"></span>
-                  </div>
-                <!-- /ko -->
-                <!-- ko if: asset.status() === z.assets.AssetTransferState.DOWNLOADING -->
-                  <div class="media-button icon-close" data-bind="click: asset.cancel_download, clickBubble: false">
-                    <div class='media-button-border-file-fill'></div>
-                    <div class='media-button-border-fill'></div>
-                    <svg class="svg-theme" viewBox="0 0 32 32">
-                      <circle data-bind="style: {'stroke-dasharray': circle_download_progress}" class="stroke-theme" r="50%" cx="50%" cy="50%"></circle>
-                    </svg>
+                <!-- ko if: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
+                  <div class="asset-placeholder">
+                    <div class="three-dots">
+                      <span></span>
+                      <span></span>
+                      <span></span>
+                    </div>
                   </div>
                 <!-- /ko -->
-                <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOADING -->
-                  <div class="media-button icon-close" data-bind="click: function() {asset.cancel($parents[1])}, clickBubble: false">
-                    <div class='media-button-border-file-fill'></div>
-                    <div class='media-button-border-fill'></div>
-                    <svg class="svg-theme" viewBox="0 0 32 32">
-                      <circle data-bind="style: {'stroke-dasharray': circle_upload_progress}" class="stroke-theme" r="50%" cx="50%" cy="50%"></circle>
-                    </svg>
+                <!-- ko ifnot: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
+                  <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOADED -->
+                    <div class="file-icon icon-file" data-uie-name="file-icon" data-bind="click: asset.download, clickBubble: false">
+                      <span class="file-icon-ext icon-view"></span>
+                    </div>
+                  <!-- /ko -->
+                  <!-- ko if: asset.status() === z.assets.AssetTransferState.DOWNLOADING -->
+                    <div class="media-button icon-close" data-bind="click: asset.cancel_download, clickBubble: false">
+                      <div class='media-button-border-file-fill'></div>
+                      <div class='media-button-border-fill'></div>
+                      <svg class="svg-theme" viewBox="0 0 32 32">
+                        <circle data-bind="style: {'stroke-dasharray': circle_download_progress}" class="stroke-theme" r="50%" cx="50%" cy="50%"></circle>
+                      </svg>
+                    </div>
+                  <!-- /ko -->
+                  <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOADING -->
+                    <div class="media-button icon-close" data-bind="click: function() {asset.cancel($parents[1])}, clickBubble: false">
+                      <div class='media-button-border-file-fill'></div>
+                      <div class='media-button-border-fill'></div>
+                      <svg class="svg-theme" viewBox="0 0 32 32">
+                        <circle data-bind="style: {'stroke-dasharray': circle_upload_progress}" class="stroke-theme" r="50%" cx="50%" cy="50%"></circle>
+                      </svg>
+                    </div>
+                  <!-- /ko -->
+                  <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOAD_FAILED -->
+                    <div class="media-button media-button-error"></div>
+                  <!-- /ko -->
+                  <div class="file-desc">
+                    <div data-uie-name="file-name"
+                         data-bind="text: z.util.trim_file_extension(asset.file_name)"
+                         class="label-xs label-semibold ellipsis"></div>
+                    <ul class="file-desc-meta label-xs text-graphite">
+                      <li data-uie-name="file-size" data-bind="text: z.util.format_bytes(asset.file_size)"></li>
+                      <!-- ko if: z.util.get_file_extension(asset.file_name) -->
+                        <li data-uie-name="file-type" data-bind="text: z.util.get_file_extension(asset.file_name)"></li>
+                      <!-- /ko -->
+                      <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOADING -->
+                        <li data-uie-name="file-status" data-bind="l10n_text: z.string.conversation_asset_uploading"></li>
+                      <!-- /ko -->
+                      <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOAD_FAILED -->
+                        <li data-uie-name="file-status" data-bind="l10n_text: z.string.conversation_asset_upload_failed" class="text-red" ></li>
+                      <!-- /ko -->
+                      <!-- ko if: asset.status() === z.assets.AssetTransferState.DOWNLOADING -->
+                        <li data-uie-name="file-status" data-bind="l10n_text: z.string.conversation_asset_downloading"></li>
+                      <!-- /ko -->
+                    </ul>
                   </div>
                 <!-- /ko -->
-                <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOAD_FAILED -->
-                  <div class="media-button media-button-error"></div>
-                <!-- /ko -->
-                <div class="file-desc">
-                  <div data-uie-name="file-name"
-                       data-bind="text: z.util.trim_file_extension(asset.file_name)"
-                       class="label-xs label-semibold ellipsis"></div>
-                  <ul class="file-desc-meta label-xs text-graphite">
-                    <li data-uie-name="file-size" data-bind="text: z.util.format_bytes(asset.file_size)"></li>
-                    <!-- ko if: z.util.get_file_extension(asset.file_name) -->
-                      <li data-uie-name="file-type" data-bind="text: z.util.get_file_extension(asset.file_name)"></li>
-                    <!-- /ko -->
-                    <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOADING -->
-                      <li data-uie-name="file-status" data-bind="l10n_text: z.string.conversation_asset_uploading"></li>
-                    <!-- /ko -->
-                    <!-- ko if: asset.status() === z.assets.AssetTransferState.UPLOAD_FAILED -->
-                      <li data-uie-name="file-status" data-bind="l10n_text: z.string.conversation_asset_upload_failed" class="text-red" ></li>
-                    <!-- /ko -->
-                    <!-- ko if: asset.status() === z.assets.AssetTransferState.DOWNLOADING -->
-                      <li data-uie-name="file-status" data-bind="l10n_text: z.string.conversation_asset_downloading"></li>
-                    <!-- /ko -->
-                  </ul>
-                </div>
-              <!-- /ko -->
-            </div>
+              </div>
+            <!-- /ko -->
             """
diff --git a/app/script/components/asset/linkPreviewAsset.coffee b/app/script/components/asset/linkPreviewAsset.coffee
index 6240984bc59..9276cb054bd 100644
--- a/app/script/components/asset/linkPreviewAsset.coffee
+++ b/app/script/components/asset/linkPreviewAsset.coffee
@@ -31,6 +31,7 @@ class z.components.LinkPreviewAssetComponent
     @viewport_changed = params.viewport_changed
     @element = component_info.element
     @url = @preview.original_url
+    @expired = params.expired
 
   on_link_preview_click: =>
     z.util.safe_window_open @url
@@ -44,20 +45,31 @@ ko.components.register 'link-preview-asset',
     return new z.components.LinkPreviewAssetComponent params, component_info
   template: """
             <div class="link-preview-icon icon-link"></div>
-            <div class="link-preview-container" data-bind="click: on_link_preview_click">
-              <!-- ko if: preview.image_resource() -->
-                <span class="link-preview-image image-placeholder-icon image-loading"
-                      data-bind="background_image: preview.image_resource, viewport_changed: viewport_changed">
-                  <img />
-                  <div class="three-dots">
-                    <span></span>
-                    <span></span>
-                    <span></span>
-                  </div>
-                </span>
-              <!-- /ko -->
-              <div class="link-preview-title" data-bind="text: preview.title"></div>
-              <a class="link-preview-site text-graphite ellipsis" target="_blank" rel="nofollow noopener noreferrer"
-                 data-bind="text: z.util.naked_url(url), attr: {href: z.util.add_http(url), title: url}"></a>
-            </div>
+            <!-- ko ifnot: expired()-->
+              <div class="link-preview-container" data-bind="click: on_link_preview_click">
+                <!-- ko if: preview.image_resource()-->
+                  <span class="link-preview-image image-placeholder-icon image-loading"
+                        data-bind="background_image: preview.image_resource, viewport_changed: viewport_changed">
+                    <img />
+                    <div class="three-dots">
+                      <span></span>
+                      <span></span>
+                      <span></span>
+                    </div>
+                  </span>
+                <!-- /ko -->
+                <div class="link-preview-title" data-bind="text: preview.title"></div>
+                <a class="link-preview-site text-graphite ellipsis" target="_blank" rel="nofollow noopener noreferrer"
+                   data-bind="text: z.util.naked_url(url), attr: {href: z.util.add_http(url), title: url}"></a>
+              </div>
+            <!-- /ko -->
+            <!-- ko if: expired()-->
+              <div class="link-preview-container">
+                <!-- ko if: preview.image_resource()-->
+                  <span class="link-preview-image bg-color-ephemeral"></span>
+                <!-- /ko -->
+                <div class="link-preview-title ephemeral-message-obfuscated" data-bind="text: z.util.StringUtil.obfuscate(preview.title)"></div>
+                <div class="link-preview-site ephemeral-message-obfuscated ellipsis" data-bind="text: z.util.StringUtil.obfuscate(url)"></div>
+              </div>
+            <!-- /ko -->
             """
diff --git a/app/script/components/asset/videoAsset.coffee b/app/script/components/asset/videoAsset.coffee
index 3296b14cee9..72498b648e3 100644
--- a/app/script/components/asset/videoAsset.coffee
+++ b/app/script/components/asset/videoAsset.coffee
@@ -29,6 +29,7 @@ class z.components.VideoAssetComponent
   constructor: (params, component_info) ->
     @logger = new z.util.Logger 'VideoAssetComponent', z.config.LOGGER.OPTIONS
     @asset = params.asset
+    @expired = params.expired
     @preview_subscription = undefined
 
     @video_element = $(component_info.element).find('video')[0]
@@ -95,42 +96,47 @@ ko.components.register 'video-asset',
   viewModel: createViewModel: (params, component_info) ->
     return new z.components.VideoAssetComponent params, component_info
   template: """
-            <div class="video-asset-container" data-uie-name="video-asset" data-bind="hide_controls: 2000, attr: {'data-uie-value': asset.file_name}">
-              <video data-bind="attr: {src: video_src},
-                                css: {hidden: asset.status() === z.assets.AssetTransferState.UPLOADING},
-                                event: { loadedmetadata: on_loadedmetadata,
-                                         timeupdate: on_timeupdate,
-                                         error: on_error,
-                                         playing: on_video_playing}">
-              </video>
-              <!-- ko if: video_playback_error -->
-                <div class="video-playback-error label-xs" data-bind="l10n_text: z.string.conversation_playback_error"></div>
-              <!-- /ko -->
-              <!-- ko ifnot: video_playback_error -->
-                <!-- ko if: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
-                  <div class="asset-placeholder">
-                    <div class="three-dots">
-                      <span></span>
-                      <span></span>
-                      <span></span>
-                    </div>
-                  </div>
+            <!-- ko if: expired() -->
+              <div class="video-asset-container"></div>
+            <!-- /ko -->
+            <!-- ko ifnot: expired() -->
+              <div class="video-asset-container" data-uie-name="video-asset" data-bind="hide_controls: 2000, attr: {'data-uie-value': asset.file_name}">
+                <video data-bind="attr: {src: video_src},
+                                  css: {hidden: asset.status() === z.assets.AssetTransferState.UPLOADING},
+                                  event: { loadedmetadata: on_loadedmetadata,
+                                           timeupdate: on_timeupdate,
+                                           error: on_error,
+                                           playing: on_video_playing}">
+                </video>
+                <!-- ko if: video_playback_error -->
+                  <div class="video-playback-error label-xs" data-bind="l10n_text: z.string.conversation_playback_error"></div>
                 <!-- /ko -->
-                <!-- ko ifnot: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
-                  <div class="video-controls-center">
-                    <media-button params="src: video_element,
-                                          large: true,
-                                          asset: asset,
-                                          play: on_play_button_clicked,
-                                          pause: on_pause_button_clicked,
-                                          cancel: function() {asset.cancel($parents[1])}">
-                    </media-button>
-                  </div>
-                  <div class='video-controls-bottom' data-bind='visible: show_bottom_controls()'>
-                    <seek-bar data-ui-name="status-video-seekbar" class="video-controls-seekbar" params="src: video_element"></seek-bar>
-                    <span class="video-controls-time label-xs" data-uie-name="status-video-time" data-bind="text: z.util.format_seconds(video_time_rest())"></span>
-                  </div>
+                <!-- ko ifnot: video_playback_error -->
+                  <!-- ko if: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
+                    <div class="asset-placeholder">
+                      <div class="three-dots">
+                        <span></span>
+                        <span></span>
+                        <span></span>
+                      </div>
+                    </div>
+                  <!-- /ko -->
+                  <!-- ko ifnot: !asset.uploaded_on_this_client() && asset.status() === z.assets.AssetTransferState.UPLOADING -->
+                    <div class="video-controls-center">
+                      <media-button params="src: video_element,
+                                            large: true,
+                                            asset: asset,
+                                            play: on_play_button_clicked,
+                                            pause: on_pause_button_clicked,
+                                            cancel: function() {asset.cancel($parents[1])}">
+                      </media-button>
+                    </div>
+                    <div class='video-controls-bottom' data-bind='visible: show_bottom_controls()'>
+                      <seek-bar data-ui-name="status-video-seekbar" class="video-controls-seekbar" params="src: video_element"></seek-bar>
+                      <span class="video-controls-time label-xs" data-uie-name="status-video-time" data-bind="text: z.util.format_seconds(video_time_rest())"></span>
+                    </div>
+                  <!-- /ko -->
                 <!-- /ko -->
-              <!-- /ko -->
-            </div>
+              </div>
+            <!-- /ko -->
             """
diff --git a/app/script/components/deviceCard.coffee b/app/script/components/deviceCard.coffee
index ad043d7a0a2..2a784b6d057 100644
--- a/app/script/components/deviceCard.coffee
+++ b/app/script/components/deviceCard.coffee
@@ -57,9 +57,8 @@ class z.components.DeviceCard
 
     z.location.get_location @device.location.lat, @device.location.lon
     .then (retrieved_location) =>
-      @_update_activation_location "#{retrieved_location.place}, #{retrieved_location.country_code}"
-    .catch (error) =>
-      @logger.log @logger.levels.WARN, "Could not update device location: #{error.message}", error
+      if retrieved_location
+        @_update_activation_location "#{retrieved_location.place}, #{retrieved_location.country_code}"
 
 
 ko.components.register 'device-card',
diff --git a/app/script/components/ephemeralTimer.coffee b/app/script/components/ephemeralTimer.coffee
new file mode 100644
index 00000000000..503a3725d88
--- /dev/null
+++ b/app/script/components/ephemeralTimer.coffee
@@ -0,0 +1,76 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+window.z ?= {}
+z.components ?= {}
+
+class z.components.EphemeralTimer
+  constructor: (params) ->
+    scheduled_time = new Date(params.expires()).getTime()
+    starting_time = Date.now()
+    timer = scheduled_time - starting_time
+    update_interval = 1000 / 10
+
+    @progress = ko.observable 0
+    @remaining_time = ko.observable 0
+
+    @title_caption = ko.pureComputed =>
+      title = ''
+      moment_duration = moment.duration(@remaining_time())
+      if moment_duration.asHours() is 1
+        title += "#{moment_duration.hours()} #{z.localization.Localizer.get_text z.string.ephememal_units_hour}, "
+      else if moment_duration.asHours() > 1
+        title += "#{moment_duration.hours()} #{z.localization.Localizer.get_text z.string.ephememal_units_hours}, "
+
+      if moment_duration.asMinutes() is 1
+        title += "#{moment_duration.minutes()} #{z.localization.Localizer.get_text z.string.ephememal_units_minute} #{z.localization.Localizer.get_text z.string.and} "
+      else if moment_duration.asMinutes() > 1
+        title += "#{moment_duration.minutes()} #{z.localization.Localizer.get_text z.string.ephememal_units_minutes} #{z.localization.Localizer.get_text z.string.and} "
+
+      if moment_duration.asSeconds() is 1
+        title += "#{moment_duration.seconds()} #{z.localization.Localizer.get_text z.string.ephememal_units_second}"
+      else if moment_duration.asSeconds() > 1
+        title += "#{moment_duration.seconds()} #{z.localization.Localizer.get_text z.string.ephememal_units_seconds}"
+
+    @interval_id = window.setInterval =>
+      if Date.now() >= scheduled_time
+        window.clearInterval @interval_id
+      else
+        @remaining_time scheduled_time - Date.now()
+        elapsed_time = timer - @remaining_time()
+        @progress elapsed_time / timer
+    , update_interval
+
+    @bullet_count = [0..4]
+
+  is_bullet_active: (index) =>
+    passed_index = @progress() > (index + 1) / @bullet_count.length
+    return 'ephemeral-timer-bullet-inactive' if passed_index
+
+  destroy: =>
+    window.clearInterval @interval_id
+
+ko.components.register 'ephemeral-timer',
+  viewModel: z.components.EphemeralTimer
+  template: """
+            <ul class="ephemeral-timer" data-bind="attr: {'title': title_caption()}">
+              <!-- ko foreach : bullet_count -->
+               <li class="ephemeral-timer-bullet" data-bind="css: $parent.is_bullet_active($data)"></li>
+              <!-- /ko -->
+            </ul>
+            """
diff --git a/app/script/config.coffee b/app/script/config.coffee
index 651d9e7c6aa..16337f1e086 100644
--- a/app/script/config.coffee
+++ b/app/script/config.coffee
@@ -36,8 +36,6 @@ z.config =
         'wire-webapp-staging.wire.com': -> 300
         'zinfra.io': -> 300
 
-  TIME_BETWEEN_PING: 30000
-
   # number of message that will be pulled
   MESSAGES_FETCH_LIMIT: 30
 
@@ -57,13 +55,6 @@ z.config =
     PINK: 6
     PURPLE: 7
 
-  # Ignored by the emoji lib
-  EXCLUDE_EMOJI: [
-    '\u2122' # trademark
-    '\u00A9' # copyright
-    '\u00AE' # registered
-  ]
-
   # Conversation size
   MAXIMUM_CONVERSATION_SIZE: 128
 
@@ -100,8 +91,8 @@ z.config =
   # measured in pixel
   SCROLL_TO_LAST_MESSAGE_THRESHOLD: 100
 
-  # defines if it was a recently viewed conversation (5 min)
-  CONVERSATION_ACTIVITY_TIMEOUT: 5 * 60 * 1000
+  # Interval when to check whether to unblock the sending queue
+  SENDING_QUEUE_UNBLOCK_INTERVAL: 60 * 1000
 
   PROPERTIES_KEY: 'webapp'
 
@@ -110,3 +101,4 @@ z.config =
 
   UNSPLASH_URL: 'https://source.unsplash.com/1200x1200/?landscape'
   ANNOUNCE_URL: 'https://wire.com/api/v1/announce/'
+  BOT_URL: 'https://wire.com/api/v1/bot/'
diff --git a/app/script/connect/ConnectRepository.coffee b/app/script/connect/ConnectRepository.coffee
index 60e5ba00b04..fe0af452207 100644
--- a/app/script/connect/ConnectRepository.coffee
+++ b/app/script/connect/ConnectRepository.coffee
@@ -71,12 +71,12 @@ class z.connect.ConnectRepository
           reject new z.connect.ConnectError z.connect.ConnectError::TYPE.UPLOAD
 
   ###
-  Retrieve a user's OSX address book contacts.
+  Retrieve a user's macOS address book contacts.
   @return [Promise] Promise that resolves with the user's address book contacts that match on Wire
   ###
-  get_osx_contacts: ->
+  get_macos_contacts: ->
     return new Promise (resolve, reject) =>
-      phone_book = @_parse_osx_contacts()
+      phone_book = @_parse_macos_contacts()
 
       if phone_book.cards.length is 0
         @logger.log @logger.levels.WARN, 'No contacts found for upload'
@@ -86,15 +86,15 @@ class z.connect.ConnectRepository
         @connect_service.post_onboarding phone_book
         .then (response) =>
           @logger.log @logger.levels.INFO,
-            "OS X contacts upload successful: #{response.results.length} matches, #{response['auto-connects'].length} auto connects", response
-          @user_repository.save_property_contact_import_osx Date.now()
+            "macOS contacts upload successful: #{response.results.length} matches, #{response['auto-connects'].length} auto connects", response
+          @user_repository.save_property_contact_import_macos Date.now()
           resolve response
         .catch (error) =>
           if error.code is z.service.BackendClientError::STATUS_CODE.TOO_MANY_REQUESTS
-            error_message = 'Backend refused OS X contacts upload: Endpoint used too frequent'
+            error_message = 'Backend refused macOS contacts upload: Endpoint used too frequent'
             @logger.log @logger.levels.ERROR, error_message
           else
-            @logger.log @logger.levels.ERROR, 'OS X contacts upload failed', error
+            @logger.log @logger.levels.ERROR, 'macOS contacts upload failed', error
           reject new z.connect.ConnectError z.connect.ConnectError::TYPE.UPLOAD
 
   ###
@@ -116,18 +116,14 @@ class z.connect.ConnectRepository
     return phone_book
 
   ###
-  Parse a user's OSX address book Contacts.
+  Parse a user's macOS address book Contacts.
   @private
   @return [z.connect.PhoneBook] Encoded phone book data
   ###
-  _parse_osx_contacts: ->
+  _parse_macos_contacts: ->
     return if not window.zAddressBook
 
-    if _.isFunction window.zAddressBook
-      address_book = window.zAddressBook() # for osx >= 2.7
-    else
-      address_book = window.zAddressBook # for osx < 2.7
-
+    address_book = window.zAddressBook()
     phone_book = new z.connect.PhoneBook @user_repository.self()
 
     me = address_book.getMe()
diff --git a/app/script/conversation/ConversationRepository.coffee b/app/script/conversation/ConversationRepository.coffee
index d648f052165..e0f12c03a53 100644
--- a/app/script/conversation/ConversationRepository.coffee
+++ b/app/script/conversation/ConversationRepository.coffee
@@ -49,7 +49,11 @@ class z.conversation.ConversationRepository
 
     @filtered_conversations = ko.pureComputed =>
       @conversations().filter (conversation_et) ->
-        states_to_filter = [z.user.ConnectionStatus.BLOCKED, z.user.ConnectionStatus.CANCELLED, z.user.ConnectionStatus.PENDING]
+        states_to_filter = [
+          z.user.ConnectionStatus.BLOCKED
+          z.user.ConnectionStatus.CANCELLED
+          z.user.ConnectionStatus.PENDING
+        ]
         return false if conversation_et.connection().status() in states_to_filter
         return false if conversation_et.is_self()
         return false if conversation_et.is_cleared() and conversation_et.removed_from_conversation()
@@ -61,6 +65,7 @@ class z.conversation.ConversationRepository
     @sending_promises = []
     @sending_queue = ko.observableArray []
     @sending_blocked = false
+    @sending_interval = undefined
 
     @sending_queue.subscribe @_execute_from_sending_queue
 
@@ -134,11 +139,20 @@ class z.conversation.ConversationRepository
     queue_entry = @sending_queue()[0]
     if queue_entry
       @sending_blocked = true
+      @sending_interval = window.setInterval =>
+        return if @conversation_service.client.request_queue_blocked_state() isnt z.service.RequestQueueBlockedState.NONE
+        @logger.log @logger.levels.ERROR, 'Sending of message from queue failed, unblocking queue', {entry_function: @sending_queue()[0].function, queue: @sending_queue()}
+        @sending_blocked = false
+        @_execute_from_sending_queue()
+        window.clearInterval @sending_interval
+      , z.config.SENDING_QUEUE_UNBLOCK_INTERVAL
+
       queue_entry.function()
       .catch (error) ->
         queue_entry.reject error
       .then (response) =>
         queue_entry.resolve response if response
+        window.clearInterval @sending_interval
         @sending_blocked = false
         @sending_queue.shift()
 
@@ -153,15 +167,11 @@ class z.conversation.ConversationRepository
 
   @param user_ids [Array<String>] IDs of users (excluding the requestor) to be part of the conversation
   @param name [String] User defined name for the Conversation (optional)
-  @param on_success [Function] Function to be called on success
-  @param on_error [Function] Function to be called on failure
   ###
-  create_new_conversation: (user_ids, name, on_success, on_error) =>
-    @conversation_service.create_conversation user_ids, name, (response, error) =>
-      if response
-        on_success? @_on_create response
-      else
-        on_error? error
+  create_new_conversation: (user_ids, name) =>
+    @conversation_service.create_conversation user_ids, name
+    .then (response) =>
+      @_on_create response
 
   ###
   Get a conversation from the backend.
@@ -509,6 +519,19 @@ class z.conversation.ConversationRepository
   # Send events
   ###############################################################################
 
+  ###
+  Add a bot to an existing conversation.
+
+  @param conversation_et [z.entity.Conversation] Conversation to add bot to
+  @param provider_id [String] ID of bot provider
+  @param service_id [String] ID of service provider
+  ###
+  add_bot: (conversation_et, provider_id, service_id) =>
+    @conversation_service.post_bots conversation_et.id, provider_id, service_id
+    .then (response) =>
+      amplify.publish z.event.WebApp.EVENT.INJECT, response.event
+      @logger.log @logger.levels.DEBUG, "Successfully added bot to conversation '#{conversation_et.display_name()}'", response
+
   ###
   Add users to an existing conversation.
 
@@ -791,11 +814,19 @@ class z.conversation.ConversationRepository
     .then ([asset, ciphertext]) =>
       generic_message = new z.proto.GenericMessage nonce
       generic_message.set 'asset', asset
+      if conversation_et.ephemeral_timer()
+        generic_message = @_wrap_in_ephemeral_message generic_message, conversation_et.ephemeral_timer()
       @_send_encrypted_asset conversation_et.id, generic_message, ciphertext, nonce
     .then ([response, asset_id]) =>
       event = @_construct_otr_event conversation_et.id, z.event.Backend.CONVERSATION.ASSET_ADD
-      event.data.otr_key = generic_message.asset.uploaded.otr_key
-      event.data.sha256 = generic_message.asset.uploaded.sha256
+
+      if conversation_et.ephemeral_timer()
+        asset = generic_message.ephemeral.asset
+      else
+        asset = generic_message.asset
+
+      event.data.otr_key = asset.uploaded.otr_key
+      event.data.sha256 = asset.uploaded.sha256
       event.data.id = asset_id
       event.id = nonce
       return @_on_asset_upload_complete conversation_et, event
@@ -810,6 +841,8 @@ class z.conversation.ConversationRepository
     asset.set 'original', new z.proto.Asset.Original file.type, file.size, file.name
     generic_message = new z.proto.GenericMessage z.util.create_random_uuid()
     generic_message.set 'asset', asset
+    if conversation_et.ephemeral_timer()
+      generic_message = @_wrap_in_ephemeral_message generic_message, conversation_et.ephemeral_timer()
     @_send_and_inject_generic_message conversation_et, generic_message
 
   ###
@@ -849,6 +882,8 @@ class z.conversation.ConversationRepository
     .then ([image, ciphertext]) =>
       generic_message = new z.proto.GenericMessage z.util.create_random_uuid()
       generic_message.set 'image', image
+      if conversation_et.ephemeral_timer()
+        generic_message = @_wrap_in_ephemeral_message generic_message, conversation_et.ephemeral_timer()
       optimistic_event = @_construct_otr_event conversation_et.id, z.event.Backend.CONVERSATION.ASSET_ADD
       @cryptography_repository.cryptography_mapper.map_generic_message generic_message, optimistic_event
       .then (mapped_event) =>
@@ -859,15 +894,12 @@ class z.conversation.ConversationRepository
         # we don't need to wait for the sending to resolve
         @_send_encrypted_asset conversation_et.id, generic_message, ciphertext
         .then ([response, asset_id]) =>
-          amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.MEDIA.COMPLETED_MEDIA_ACTION,
-            action: 'photo'
-            conversation_type: if conversation_et.is_one2one() then 'one_to_one' else 'group'
-            with_bot: conversation_et.is_with_bot()
+          @_track_completed_media_action conversation_et, generic_message
           saved_event.data.id = asset_id
           saved_event.data.info.nonce = asset_id
           @_update_image_as_sent conversation_et, saved_event
         .catch (error) =>
-          @logger.log "Failed to upload otr asset for conversation #{conversation_et.id}", error
+          @logger.log @logger.levels.ERROR, "Failed to upload otr asset for conversation #{conversation_et.id}", error
           throw error
 
         return saved_event
@@ -880,6 +912,8 @@ class z.conversation.ConversationRepository
   send_knock: (conversation_et) =>
     generic_message = new z.proto.GenericMessage z.util.create_random_uuid()
     generic_message.set 'knock', new z.proto.Knock false
+    if conversation_et.ephemeral_timer()
+      generic_message = @_wrap_in_ephemeral_message generic_message, conversation_et.ephemeral_timer()
 
     @_send_and_inject_generic_message conversation_et, generic_message
     .catch (error) => @logger.log @logger.levels.ERROR, "#{error.message}"
@@ -897,12 +931,13 @@ class z.conversation.ConversationRepository
     .then (link_preview) =>
       if link_preview?
         switch generic_message.content
+          when 'ephemeral'
+            generic_message.ephemeral.text.link_preview.push link_preview
           when 'edited'
             generic_message.edited.text.link_preview.push link_preview
           when 'text'
             generic_message.text.link_preview.push link_preview
         @_send_and_inject_generic_message conversation_et, generic_message
-        @link_repository.get_link_preview_from_string message
 
   ###
   Send text message in specified conversation.
@@ -914,10 +949,25 @@ class z.conversation.ConversationRepository
   send_message: (message, conversation_et) =>
     generic_message = new z.proto.GenericMessage z.util.create_random_uuid()
     generic_message.set 'text', new z.proto.Text message
-
+    if conversation_et.ephemeral_timer()
+      generic_message = @_wrap_in_ephemeral_message generic_message, conversation_et.ephemeral_timer()
     @_send_and_inject_generic_message conversation_et, generic_message
-    .then ->
-      return generic_message
+    .then -> return generic_message
+
+  ###
+  Wraps generic message in ephemeral message.
+
+  @param generic_message [z.proto.Message]
+  @param millis [Number] expire time in milliseconds
+  @return [z.proto.Message]
+  ###
+  _wrap_in_ephemeral_message: (generic_message, millis) ->
+    ephemeral = new z.proto.Ephemeral()
+    ephemeral.set 'expire_after_millis', millis
+    ephemeral.set generic_message.content, generic_message[generic_message.content]
+    generic_message = new z.proto.GenericMessage generic_message.message_id
+    generic_message.set 'ephemeral', ephemeral
+    return generic_message
 
   ###
   Send edited message in specified conversation.
@@ -1021,14 +1071,16 @@ class z.conversation.ConversationRepository
 
   @private
   @param conversation_id [String] Conversation ID
+  @param skip_own_clients [Boolean] True, if other own clients should be skipped (to not sync messages on own clients)
   @return [Promise<Object>] Promise that resolves with a user client map
   ###
-  _create_user_client_map: (conversation_id) ->
+  _create_user_client_map: (conversation_id, skip_own_clients = false) ->
     @get_all_users_in_conversation conversation_id
     .then (user_ets) ->
       user_client_map = {}
 
-      for user_et in user_ets when user_et.devices()[0]
+      for user_et in user_ets
+        continue if user_et.is_me and skip_own_clients
         user_client_map[user_et.id] = (client_et.id for client_et in user_et.devices())
 
       return user_client_map
@@ -1120,14 +1172,17 @@ class z.conversation.ConversationRepository
     key_bytes = null
     sha256 = null
     ciphertext = null
+    skip_own_clients = generic_message.content is 'ephemeral'
 
     z.assets.AssetCrypto.encrypt_aes_asset generic_message.toArrayBuffer()
     .then (data) =>
       [key_bytes, sha256, ciphertext] = data
-      return @_create_user_client_map conversation_id
+      return @_create_user_client_map conversation_id, skip_own_clients
     .then (user_client_map) =>
       if user_ids
         delete user_client_map[user_id] for user_id of user_client_map when user_id not in user_ids
+      if skip_own_clients
+        user_ids = Object.keys user_client_map
       generic_message_external = new z.proto.GenericMessage z.util.create_random_uuid()
       generic_message_external.set 'external', new z.proto.External new Uint8Array(key_bytes), new Uint8Array(sha256)
       return @cryptography_repository.encrypt_generic_message user_client_map, generic_message_external
@@ -1155,10 +1210,13 @@ class z.conversation.ConversationRepository
       if send_as_external
         @_send_external_generic_message conversation_id, generic_message, user_ids, native_push
       else
-        @_create_user_client_map conversation_id
+        skip_own_clients = generic_message.content is 'ephemeral'
+        @_create_user_client_map conversation_id, skip_own_clients
         .then (user_client_map) =>
           if user_ids
             delete user_client_map[user_id] for user_id of user_client_map when user_id not in user_ids
+          if skip_own_clients
+            user_ids = Object.keys user_client_map
           return @cryptography_repository.encrypt_generic_message user_client_map, generic_message
         .then (payload) =>
           payload.native_push = native_push
@@ -1202,12 +1260,17 @@ class z.conversation.ConversationRepository
   @return [Promise] Promise that resolves after sending the encrypted message
   ###
   _send_encrypted_asset: (conversation_id, generic_message, image_data, nonce) =>
-    @_create_user_client_map conversation_id
+    skip_own_clients = generic_message.content is 'ephemeral'
+    precondition_option = false
+
+    @_create_user_client_map conversation_id, skip_own_clients
     .then (user_client_map) =>
+      if skip_own_clients
+        precondition_option = Object.keys user_client_map
       return @cryptography_repository.encrypt_generic_message user_client_map, generic_message
     .then (payload) =>
       payload.inline = false
-      @asset_service.post_asset_v2 conversation_id, payload, image_data, false, nonce
+      @asset_service.post_asset_v2 conversation_id, payload, image_data, precondition_option, nonce
       .catch (error_response) =>
         return @_update_payload_for_changed_clients error_response, generic_message, payload
         .then (updated_payload) =>
@@ -1277,7 +1340,7 @@ class z.conversation.ConversationRepository
       amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.FILE.UPLOAD_SUCCESSFUL,
         $.extend tracking_data, {time: upload_duration}
     .catch (error) =>
-      @logger.log "Failed to upload asset for conversation '#{conversation_et.id}", error
+      @logger.log @logger.levels.ERROR, "Failed to upload asset for conversation '#{conversation_et.id}': #{error.message}", error
       if message_et.id
         @send_asset_upload_failed conversation_et, message_et.id
         @update_message_as_upload_failed message_et
@@ -1292,7 +1355,7 @@ class z.conversation.ConversationRepository
   delete_message_everyone: (conversation_et, message_et) =>
     Promise.resolve()
     .then ->
-      if not message_et.user().is_me
+      if not message_et.user().is_me and not message_et.expire_after_millis()
         throw new z.conversation.ConversationError z.conversation.ConversationError::TYPE.WRONG_USER
       generic_message = new z.proto.GenericMessage z.util.create_random_uuid()
       generic_message.set 'deleted', new z.proto.MessageDelete message_et.id
@@ -1329,6 +1392,104 @@ class z.conversation.ConversationRepository
       @logger.log "Failed to send delete message with id '#{message_et.id}' for conversation '#{conversation_et.id}'", error
       throw error
 
+  ###
+  Get remaining lifetime for give message.
+
+  @param message_et [z.entity.Message]
+  ###
+  get_ephemeral_timer: (message_et) =>
+    millis = message_et.expire_after_millis()
+
+    switch message_et.ephemeral_status()
+      when z.message.EphemeralStatusType.TIMED_OUT
+        return Promise.resolve 0
+      when z.message.EphemeralStatusType.ACTIVE
+        expiration_timestamp = new Date(millis).getTime()
+        expires_in = expiration_timestamp - Date.now()
+        return Promise.resolve expires_in
+      when z.message.EphemeralStatusType.INACTIVE
+        expiration_date_iso = new Date(Date.now() + millis).toISOString()
+        message_et.expire_after_millis expiration_date_iso
+        return @conversation_service.update_message_in_db message_et, {expire_after_millis: expiration_date_iso}
+        .then -> return millis
+      else
+        Promise.resolve()
+
+  timeout_ephemeral_message: (conversation_et, message_et) =>
+    if message_et.user().is_me
+      switch
+        when message_et.has_asset_text()
+          @_obfuscate_text_message conversation_et, message_et.id
+        when message_et.is_ping()
+          @_obfuscate_ping_message conversation_et, message_et.id
+        when message_et.has_asset()
+          @_obfuscate_asset_message conversation_et, message_et.id
+        when message_et.has_asset_medium_image()
+          @_obfuscate_image_message conversation_et, message_et.id
+        else
+          @logger.log 'Unsupported ephemeral type', message_et.type
+    else
+      @delete_message_everyone conversation_et, message_et
+
+  _obfuscate_text_message: (conversation_et, message_id) =>
+    @get_message_in_conversation_by_id conversation_et, message_id
+    .then (message_et) =>
+      asset = message_et.get_first_asset()
+      obfuscated = new z.entity.Text message_et.id
+      obfuscated.previews asset.previews()
+      obfuscated.text = z.util.StringUtil.obfuscate asset.text if obfuscated.previews().length is 0
+      message_et.assets [obfuscated]
+      message_et.expire_after_millis true
+
+      @conversation_service.update_message_in_db message_et,
+        expire_after_millis: true
+        data:
+          content: obfuscated.text
+          nonce: obfuscated.id
+    .then =>
+      @logger.log 'Obfuscated text message'
+
+  _obfuscate_ping_message: (conversation_et, message_id) =>
+    @get_message_in_conversation_by_id conversation_et, message_id
+    .then (message_et) =>
+      message_et.expire_after_millis true
+      @conversation_service.update_message_in_db message_et, expire_after_millis: true
+    .then =>
+      @logger.log 'Obfuscated ping message'
+
+  _obfuscate_asset_message: (conversation_et, message_id) =>
+    @get_message_in_conversation_by_id conversation_et, message_id
+    .then (message_et) =>
+      asset = message_et.get_first_asset()
+      message_et.expire_after_millis true
+      @conversation_service.update_message_in_db message_et,
+        data:
+          content_type: asset.file_type
+          info:
+            nonce: message_et.nonce
+          meta: {}
+        expire_after_millis: true
+    .then =>
+      @logger.log 'Obfuscated asset message'
+
+  _obfuscate_image_message: (conversation_et, message_id) =>
+    @get_message_in_conversation_by_id conversation_et, message_id
+    .then (message_et) =>
+      asset = message_et.get_first_asset()
+      message_et.expire_after_millis true
+      @conversation_service.update_message_in_db message_et,
+        data:
+          info:
+            nonce: message_et.nonce
+            height: asset.height
+            width: asset.width
+            original_height: asset.original_height
+            original_width: asset.original_width
+            tag: 'medium'
+        expire_after_millis: true
+    .then =>
+      @logger.log 'Obfuscated image message'
+
   ###
   Can user upload assets to conversation.
 
@@ -1585,6 +1746,8 @@ class z.conversation.ConversationRepository
   _on_message_deleted: (conversation_et, event_json) =>
     @get_message_in_conversation_by_id conversation_et, event_json.data.message_id
     .then (message_to_delete_et) =>
+      if message_to_delete_et.expire_after_millis()
+        return
       if event_json.from isnt message_to_delete_et.from
         throw new z.conversation.ConversationError z.conversation.ConversationError::TYPE.WRONG_USER
       if event_json.from isnt @user_repository.self().id
@@ -2052,15 +2215,28 @@ class z.conversation.ConversationRepository
   @param generic_message [z.protobuf.GenericMessage]
   ###
   _track_completed_media_action: (conversation_et, generic_message) ->
-    action_type = switch generic_message.content
-      when 'asset' then 'file' if generic_message.asset.original?
+    if generic_message.content is 'ephemeral'
+      message = generic_message.ephemeral
+      message_content_type = generic_message.ephemeral.content
+      is_ephemeral = true
+      ephemeral_time = generic_message.ephemeral.expire_after_millis / 1000
+    else
+      message = generic_message
+      message_content_type = generic_message.content
+      is_ephemeral = false
+
+    action_type = switch message_content_type
+      when 'asset' then 'file' if message.asset.original?
+      when 'image' then 'photo'
       when 'knock' then 'ping'
-      when 'text' then 'text' if not generic_message.text.link_preview.length
+      when 'text' then 'text' if not message.text.link_preview.length
 
     return if not action_type
     amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.MEDIA.COMPLETED_MEDIA_ACTION,
       action: action_type
       conversation_type: z.tracking.helpers.get_conversation_type conversation_et
+      is_ephemeral: is_ephemeral
+      ephemeral_time: ephemeral_time if is_ephemeral
       with_bot: conversation_et.is_with_bot()
 
   ###
diff --git a/app/script/conversation/ConversationService.coffee b/app/script/conversation/ConversationService.coffee
index ee9888fc181..9f0f6f0a30d 100644
--- a/app/script/conversation/ConversationService.coffee
+++ b/app/script/conversation/ConversationService.coffee
@@ -37,15 +37,13 @@ class z.conversation.ConversationService
   @return [Promise<String>] Promise that will resolve with the primary key of the persisted conversation entity
   ###
   _save_conversation_in_db: (conversation_et) ->
-    return new Promise (resolve, reject) =>
-      store_name = @storage_service.OBJECT_STORE_CONVERSATIONS
-      @storage_service.save store_name, conversation_et.id, conversation_et.serialize()
-      .then (primary_key) =>
-        @logger.log @logger.levels.INFO, "Conversation '#{primary_key}' was stored for the first time"
-        resolve conversation_et
-      .catch (error) =>
-        @logger.log @logger.levels.ERROR, "Conversation '#{conversation_et.id}' could not be stored", error
-        reject error
+    @storage_service.save @storage_service.OBJECT_STORE_CONVERSATIONS, conversation_et.id, conversation_et.serialize()
+    .then (primary_key) =>
+      @logger.log @logger.levels.INFO, "Conversation '#{primary_key}' was stored for the first time"
+      return conversation_et
+    .catch (error) =>
+      @logger.log @logger.levels.ERROR, "Conversation '#{conversation_et.id}' could not be stored", error
+      throw error
 
   ###
   Updates a conversation entity in the database.
@@ -97,16 +95,14 @@ class z.conversation.ConversationService
 
   @param user_ids [Array<String>] IDs of users (excluding the requestor) to be part of the conversation
   @param name [String] User defined name for the Conversation (optional)
-  @param callback [Function] Function to be called on server return
   ###
-  create_conversation: (user_ids, name, callback) ->
+  create_conversation: (user_ids, name) ->
     @client.send_json
       url: @client.create_url z.conversation.ConversationService::URL_CONVERSATIONS
       type: 'POST'
       data:
         users: user_ids
         name: name
-      callback: callback
 
   ###
   Create a One:One conversation.
@@ -287,14 +283,7 @@ class z.conversation.ConversationService
   @return [Promise] Promise that resolves with all the stored conversation states
   ###
   load_conversation_states_from_db: =>
-    return new Promise (resolve, reject) =>
-      @storage_service.get_all @storage_service.OBJECT_STORE_CONVERSATIONS
-      .then (conversation_states) =>
-        @logger.log @logger.levels.INFO, "Loaded '#{conversation_states.length}' local conversation states", conversation_states
-        resolve conversation_states
-      .catch (error) =>
-        @logger.log @logger.levels.ERROR, 'Failed to load local conversation states', error
-        reject error
+    @storage_service.get_all @storage_service.OBJECT_STORE_CONVERSATIONS
 
   ###
   Load conversation event.
@@ -302,18 +291,15 @@ class z.conversation.ConversationService
   @param message_id [String]
   ###
   load_event_from_db: (conversation_id, message_id) ->
-    return new Promise (resolve, reject) =>
-      @storage_service.db[@storage_service.OBJECT_STORE_CONVERSATION_EVENTS]
-      .where 'conversation'
-      .equals conversation_id
-      .filter (record) -> record.id is message_id
-      .first()
-      .then (record) ->
-        resolve record
-      .catch (error) =>
-        @logger.log @logger.levels.ERROR,
-          "Failed to get event for conversation '#{conversation_id}': #{error.message}", error
-        reject error
+    @storage_service.db[@storage_service.OBJECT_STORE_CONVERSATION_EVENTS]
+    .where 'conversation'
+    .equals conversation_id
+    .filter (record) -> record.id is message_id
+    .first()
+    .catch (error) =>
+      @logger.log @logger.levels.ERROR,
+        "Failed to get event for conversation '#{conversation_id}': #{error.message}", error
+      throw error
 
   ###
   Load conversation events. Start and end are not included.
@@ -344,6 +330,22 @@ class z.conversation.ConversationService
         "Failed to get events for conversation '#{conversation_id}': #{error.message}", error
       throw error
 
+  ###
+  Add a bot to an existing conversation.
+
+  @param conversation_id [String] ID of conversation to add users to
+  @param provider_id [String] ID of bot provider
+  @param service_id [String] ID of service provider
+  @return [Promise] Promise that resolves with the server response
+  ###
+  post_bots: (conversation_id, provider_id, service_id) ->
+    @client.send_json
+      url: @client.create_url "/conversations/#{conversation_id}/bots"
+      type: 'POST'
+      data:
+        provider: provider_id
+        service: service_id
+
   ###
   Add users to an existing conversation.
 
diff --git a/app/script/conversation/EventMapper.coffee b/app/script/conversation/EventMapper.coffee
index 1ff79218c96..c4c66ffb906 100644
--- a/app/script/conversation/EventMapper.coffee
+++ b/app/script/conversation/EventMapper.coffee
@@ -97,6 +97,9 @@ class z.conversation.EventMapper
       message_et.reactions event.reactions or {}
       message_et.status event.status if event.status
 
+    if event.expire_after_millis
+      message_et.expire_after_millis event.expire_after_millis
+
     if window.isNaN message_et.timestamp
       @logger.log @logger.levels.WARN, "Could not get timestamp for message '#{message_et.id}'. Skipping it.", event
       message_et = undefined
diff --git a/app/script/cryptography/CryptographyMapper.coffee b/app/script/cryptography/CryptographyMapper.coffee
index de1769353cd..6ad9edd32e4 100644
--- a/app/script/cryptography/CryptographyMapper.coffee
+++ b/app/script/cryptography/CryptographyMapper.coffee
@@ -26,7 +26,8 @@ class z.cryptography.CryptographyMapper
     @logger = new z.util.Logger 'z.cryptography.CryptographyMapper', z.config.LOGGER.OPTIONS
 
   ###
-  OTR to JSON mapper.
+  Maps a generic message into an event in JSON.
+
   @param generic_message [z.proto.GenericMessage] Received ProtoBuffer message
   @param event [z.event.Backend.CONVERSATION.OTR-ASSET-ADD, z.event.Backend.CONVERSATION.OTR-MESSAGE-ADD] Event
   @return [Object] Promise that resolves with the mapped event
@@ -58,6 +59,8 @@ class z.cryptography.CryptographyMapper
         return @_map_deleted generic_message.deleted
       when 'edited'
         return @_map_edited generic_message.edited, generic_message.message_id
+      when 'ephemeral'
+        return @_map_ephemeral generic_message, event
       when 'external'
         return @_map_external generic_message.external, event
       when 'hidden'
@@ -168,6 +171,13 @@ class z.cryptography.CryptographyMapper
     mapped.data.replacing_message_id = edited.replacing_message_id
     return mapped
 
+  _map_ephemeral: (generic_message, event) ->
+    millis_as_number = generic_message.ephemeral.expire_after_millis.toNumber()
+    generic_message.ephemeral.message_id = generic_message.message_id
+    embedded_message = @_map_generic_message generic_message.ephemeral, event
+    embedded_message.expire_after_millis = z.ephemeral.timings.map_to_closest_timing millis_as_number
+    return embedded_message
+
   ###
   Unpacks a specific generic message which is wrapped inside an external generic message.
 
diff --git a/app/script/cryptography/CryptographyRepository.coffee b/app/script/cryptography/CryptographyRepository.coffee
index eb9d147b6fa..fcda9d02922 100644
--- a/app/script/cryptography/CryptographyRepository.coffee
+++ b/app/script/cryptography/CryptographyRepository.coffee
@@ -542,28 +542,6 @@ class z.cryptography.CryptographyRepository
 
         resolve [undefined, undefined]
 
-  ###
-  Save an encrypted event.
-
-  @note IMPORTANT:
-    Session should only be saved after the plaintext is saved somewhere safe, as, after saving,
-    the session will be unable to decrypt the message again.
-
-  @param generic_message [z.proto.GenericMessage] Received ProtoBuffer message
-  @param event [JSON] JSON of 'z.event.Backend.CONVERSATION.OTR-ASSET-ADD' or 'z.event.Backend.CONVERSATION.OTR-MESSAGE-ADD' event
-  @return [Promise] Promise that will resolve with the saved record
-  ###
-  save_encrypted_event: (generic_message, event) =>
-    @cryptography_mapper.map_generic_message generic_message, event
-    .then (mapped) =>
-      return @storage_repository.save_conversation_event mapped
-    .catch (error) =>
-      if error instanceof z.cryptography.CryptographyError
-        return undefined
-      else
-        @logger.log @logger.levels.ERROR, "Saving encrypted message failed: #{error.message}", error
-        throw error
-
   ###
   Save an unencrypted event.
   @param event [Object] JSON of unencrypted backend event
diff --git a/app/script/entity/Conversation.coffee b/app/script/entity/Conversation.coffee
index 3c5719d89d4..03006ee7988 100644
--- a/app/script/entity/Conversation.coffee
+++ b/app/script/entity/Conversation.coffee
@@ -91,6 +91,8 @@ class z.entity.Conversation
     # Messages
     ###############################################################################
 
+    @ephemeral_timer = ko.observable false
+
     @messages_unordered = ko.observableArray()
     @messages = ko.pureComputed => @messages_unordered().sort (a, b) -> a.timestamp - b.timestamp
     @messages.subscribe => @update_latest_from_message @get_last_message()
@@ -110,7 +112,10 @@ class z.entity.Conversation
       return message_ets
     .extend trackArrayChanges: true
 
-    # Call related
+    ###############################################################################
+    # Calling
+    ###############################################################################
+
     @call = ko.observable undefined
     @has_active_call = ko.pureComputed =>
       return false if not @call()
@@ -474,8 +479,8 @@ class z.entity.Conversation
   Get the last text message that was added by self user.
   @return [z.entity.Message]
   ###
-  get_last_added_text_message: ->
-    for message_et in @messages() when message_et.has_asset_text() and message_et.user().is_me by -1
+  get_last_editable_message: ->
+    for message_et in @messages() when message_et.is_editable() by -1
       return message_et
 
   ###
@@ -523,6 +528,7 @@ class z.entity.Conversation
   ###
   is_with_bot: =>
     return false if not @is_one2one()
+    return false if not @participating_user_ets()[0]
     possible_bot_email = @participating_user_ets()[0].email()
     return !!possible_bot_email?.match /(anna|ottobot|welcome)(\+\S+)?@wire.com/ig
 
diff --git a/app/script/entity/message/Message.coffee b/app/script/entity/message/Message.coffee
index 066b9b5360e..79bddca4f44 100644
--- a/app/script/entity/message/Message.coffee
+++ b/app/script/entity/message/Message.coffee
@@ -29,17 +29,34 @@ class z.entity.Message
     message_ets.sort (m1, m2) -> m1.timestamp > m2.timestamp
 
   # Construct a new base message entity.
-  constructor: (id = '0', super_type = '') ->
+  constructor: (@id = '0', @super_type = '') ->
+    @expire_after_millis = ko.observable false
+    @ephemeral_status = ko.computed =>
+      expiration = @expire_after_millis()
+
+      if expiration is true
+        return z.message.EphemeralStatusType.TIMED_OUT
+
+      if _.isString expiration
+        expiration_timestamp = new Date(expiration).getTime()
+        expires_in = expiration_timestamp - Date.now()
+        if expires_in > 0
+          return z.message.EphemeralStatusType.ACTIVE
+        else
+          return z.message.EphemeralStatusType.TIMED_OUT
+      else if _.isNumber expiration
+        return z.message.EphemeralStatusType.INACTIVE
+      else
+        return z.message.EphemeralStatusType.NONE
+
     @from = ''
-    @id = id
+    @is_editing = ko.observable false
     @primary_key = undefined
-    @super_type = super_type
+    @status = ko.observable z.message.StatusType.UNSPECIFIED
     @timestamp = Date.now()
     @type = ''
     @user = ko.observable new z.entity.User()
     @visible = ko.observable true
-    @is_editing = ko.observable false
-    @status = ko.observable z.message.StatusType.UNSPECIFIED
 
     @display_timestamp_short = =>
       date = moment.unix @timestamp / 1000
@@ -51,7 +68,6 @@ class z.entity.Message
 
     @accent_color = ko.pureComputed =>
       return "accent-color-#{@user().accent_id()}"
-    , @, deferEvaluation: true
 
   ###
   Check if message contains an asset of type file.
@@ -185,21 +201,36 @@ class z.entity.Message
   ###
   is_deletable: ->
     return true if @is_ping() or not @has_asset()
-    return @get_first_asset().status() not in [z.assets.AssetTransferState.DOWNLOADING, z.assets.AssetTransferState.UPLOADING]
+    return @get_first_asset().status() not in [z.assets.AssetTransferState.DOWNLOADING,
+        z.assets.AssetTransferState.UPLOADING]
 
   ###
   Check if message can be edited.
   @return [Boolean]
   ###
   is_editable: ->
-    return @has_asset_text() and @user().is_me
+    return @has_asset_text() and @user().is_me and not @is_ephemeral()
+
+  ###
+  Check if message is ephemeral.
+  @return [Boolean]
+  ###
+  is_ephemeral: ->
+    return @expire_after_millis() isnt false
+
+  ###
+  Check if ephemeral message is expired.
+  @return [Boolean]
+  ###
+  is_expired: ->
+    return @expire_after_millis() is true
 
   ###
   Check if message can be reacted to.
   @return [Boolean]
   ###
   is_reactable: ->
-    return @is_content()
+    return @is_content() and @status() isnt z.message.StatusType.SENDING and not @is_ephemeral()
 
   ###
   Update the status of a message.
diff --git a/app/script/entity/message/PingMessage.coffee b/app/script/entity/message/PingMessage.coffee
index 33da54df135..bd6bc12361c 100644
--- a/app/script/entity/message/PingMessage.coffee
+++ b/app/script/entity/message/PingMessage.coffee
@@ -29,6 +29,8 @@ class z.entity.PingMessage extends z.entity.Message
       return z.localization.Localizer.get_text string
     , @, deferEvaluation: true
 
-    @animation = ko.pureComputed ->
+    @animation = ko.pureComputed =>
       return 'ping-animation ping-animation-soft' if Date.now() - @timestamp < 2000
-    , @, deferEvaluation: true
+
+    @ping_color = ko.pureComputed =>
+      return if @is_expired() then 'ephemeral-message-obfuscated' else @accent_color()
diff --git a/app/script/entity/message/Text.coffee b/app/script/entity/message/Text.coffee
index edf367a7d19..106927d5457 100644
--- a/app/script/entity/message/Text.coffee
+++ b/app/script/entity/message/Text.coffee
@@ -27,7 +27,7 @@ class z.entity.Text extends z.entity.Asset
   @param id [String] Asset ID
   ###
   constructor: (id) ->
-    super(id)
+    super id
     @type = z.assets.AssetType.TEXT
 
     # Raw message text
@@ -43,6 +43,7 @@ class z.entity.Text extends z.entity.Asset
     @previews = ko.observableArray()
 
     @should_render_text = ko.pureComputed =>
+      return false if not @text? or @text.length is 0
       has_link_previews = @previews().length > 0
       return not has_link_previews or (has_link_previews and not z.links.LinkPreviewHelpers.contains_only_link(@text))
 
diff --git a/app/script/ephemeral/ephemeralTimings.coffee b/app/script/ephemeral/ephemeralTimings.coffee
new file mode 100644
index 00000000000..231973ab331
--- /dev/null
+++ b/app/script/ephemeral/ephemeralTimings.coffee
@@ -0,0 +1,43 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+window.z ?= {}
+z.ephemeral ?= {}
+
+z.ephemeral.timings = do ->
+
+  # timings in milliseconds
+  timings = [
+    1000 * 5
+    1000 * 15
+    1000 * 30
+    1000 * 60
+    1000 * 60 * 5
+    1000 * 60 * 60 * 24
+  ]
+
+  get_values = ->
+    return timings
+
+  map_to_closest_timing = (milliseconds) ->
+    return z.util.ArrayUtil.find_closest timings, milliseconds
+
+  return {
+    get_values: get_values
+    map_to_closest_timing: map_to_closest_timing
+  }
diff --git a/app/script/event/WebApp.coffee b/app/script/event/WebApp.coffee
index cda74cd2e9f..dd0df11477b 100644
--- a/app/script/event/WebApp.coffee
+++ b/app/script/event/WebApp.coffee
@@ -121,9 +121,9 @@ z.event.WebApp =
     CHANGE:
       DEBUG: 'wire.webapp.properties.change.debug'
     UPDATE:
-      GOOGLE: 'wire.webapp.properties.update.google'
-      OSX_CONTACTS: 'wire.webapp.properties.update.google'
       CALL_MUTE: 'wire.webapp.properties.update.call-mute'
+      CONTACTS_GOOGLE: 'wire.webapp.properties.update.contacts-google'
+      CONTACTS_MACOS: 'wire.webapp.properties.update.contacts-macos'
       SEND_DATA: 'wire.webapp.properties.update.send-data'
       SOUND_ALERTS: 'wire.webapp.properties.update.sound-alerts'
       HAS_CREATED_CONVERSATION: 'wire.webapp.properties.update.has-created-conversation'
diff --git a/app/script/localization/strings-de.coffee b/app/script/localization/strings-de.coffee
old mode 100755
new mode 100644
index b5ff069add2..3ab4b4b4404
--- a/app/script/localization/strings-de.coffee
+++ b/app/script/localization/strings-de.coffee
@@ -18,7 +18,7 @@
 
 #General terms
 z.string.de.wire = 'Wire'
-z.string.de.wire_osx = 'Wire für macOS'
+z.string.de.wire_macos = 'Wire für macOS'
 z.string.de.wire_windows = 'Wire für Windows'
 z.string.de.wire_linux = 'Wire für Linux'
 z.string.de.truncation = '…'
@@ -36,7 +36,7 @@ z.string.de.alert_gif_too_large = 'Das GIF ist zu groß. Die maximale Größe be
 z.string.de.auth_account_country_code = 'Landesvorwahl'
 z.string.de.auth_account_create = 'Erstellen'
 z.string.de.auth_account_create_account = 'Konto erstellen'
-z.string.de.auth_account_expiration = 'Du wurdest abgemeldet, da deine Session abgelaufen ist. Bitte logge dich erneut ein.'
+z.string.de.auth_account_expiration = 'Du wurdest abgemeldet, da deine Session abgelaufen ist. Bitte melde dich erneut an.'
 z.string.de.auth_account_get_wire = 'Ein moderner und sicherer Messenger für Unterhaltungen, Anrufe, Bilder, Musik, Videos, GIFs und mehr.'
 z.string.de.auth_account_password_forgot = 'Passwort vergessen'
 z.string.de.auth_account_remember_me = 'Angemeldet bleiben'
@@ -52,7 +52,7 @@ z.string.de.auth_verify_account_detail = 'Hiermit kannst du Wire auf mehreren Ge
 z.string.de.auth_verify_account_headline = 'E-Mail-Adresse und Passwort hinzufügen.'
 z.string.de.auth_verify_account_logout = 'Abmelden'
 z.string.de.auth_verify_code_description = 'Gib den Code ein, den wir an \n%@number gesendet haben.'
-z.string.de.auth_verify_code_resend = 'Keinen Code bekommen?'
+z.string.de.auth_verify_code_resend = 'Keinen Code erhalten?'
 z.string.de.auth_verify_code_resend_detail = 'Erneut senden'
 z.string.de.auth_verify_code_resend_timer = 'Du kannst %expiration einen neuen Code anfordern.'
 z.string.de.auth_verify_code_change_phone = 'Telefonnummer ändern'
@@ -105,7 +105,7 @@ z.string.de.auth_error_name_short = 'Gib deinen Namen mit mindestens zwei Zeiche
 z.string.de.auth_error_offline = 'Keine Internetverbindung'
 z.string.de.auth_error_password_short = 'Wähle ein Passwort mit mindestens acht Zeichen.'
 z.string.de.auth_error_password_wrong = 'Falsches Passwort. Bitte versuche es erneut.'
-z.string.de.auth_error_phone_number_forbidden = 'Es tut uns leid. Diese Telefonnummer ist verboten.'
+z.string.de.auth_error_phone_number_forbidden = 'Diese Telefonnummer ist leider nicht nutzbar.'
 z.string.de.auth_error_phone_number_invalid = 'Ungültige Telefonnummer'
 z.string.de.auth_error_phone_number_unknown = 'Unbekannte Telefonnummer'
 z.string.de.auth_error_sign_in = 'Überprüfe deine Eingaben und versuche es erneut.'
@@ -395,7 +395,7 @@ z.string.de.preferences_about_terms_of_use = 'Nutzungsbedingungen'
 z.string.de.preferences_about_version = 'Version %version'
 z.string.de.preferences_about_website = 'Wire-Webseite'
 
-z.string.de.preferences_account_change_password = 'Passwort ändern'
+z.string.de.preferences_account_reset_password = 'Passwort zurücksetzen'
 z.string.de.preferences_account_delete = 'Benutzerkonto löschen'
 z.string.de.preferences_account_log_out = 'Abmelden'
 z.string.de.preferences_account_username_placeholder = 'Dein vollständiger Name'
@@ -403,13 +403,14 @@ z.string.de.preferences_account_username_placeholder = 'Dein vollständiger Name
 z.string.de.preferences_devices_activated_in = 'in %location'
 z.string.de.preferences_devices_activated_on = 'Aktiviert am %time'
 z.string.de.preferences_devices_active = 'Aktiv'
+z.string.de.preferences_devices_active_detail = 'Falls du eines dieser Geräte nicht erkennst, entferne es und setze dein Passwort zurück.'
 z.string.de.preferences_devices_current = 'Dieses Gerät'
 z.string.de.preferences_devices_fingerprint = 'Schlüssel-Fingerabdruck'
 z.string.de.preferences_devices_fingerprint_detail = 'Wire gibt jedem Gerät einen einzigartigen Fingerabdruck. Vergleiche diese und verifiziere deine Geräte und Unterhaltungen.'
 z.string.de.preferences_devices_id = 'ID: '
 z.string.de.preferences_devices_remove = 'Entfernen'
 z.string.de.preferences_devices_remove_cancel = 'Abbrechen'
-z.string.de.preferences_devices_remove_detail = 'Entferne das Gerät, wenn du es nicht mehr nutzt. Der Nachrichtenverlauf wird gelöscht werden und du wirst abgemeldet.'
+z.string.de.preferences_devices_remove_detail = 'Entferne das Gerät, wenn du es nicht mehr nutzt. Der Nachrichtenverlauf wird auf diesem Gerät gelöscht und du wirst abgemeldet.'
 z.string.de.preferences_devices_session_confirmation = 'Die Session wurde zurückgesetzt.'
 z.string.de.preferences_devices_session_detail = 'Falls die Fingerabdrücke nicht übereinstimmen, setze die Session zurück um neue Verschlüsselungs-Schlüssel auf beiden Seiten zu erstellen.'
 z.string.de.preferences_devices_session_reset = 'Session zurücksetzen'
@@ -418,11 +419,11 @@ z.string.de.preferences_devices_verification = 'Verifiziert'
 
 z.string.de.preferences_options_contacts = 'Kontakte'
 z.string.de.preferences_options_contacts_gmail = 'Aus Gmail importieren'
-z.string.de.preferences_options_contacts_osx = 'Aus Kontakte importieren'
+z.string.de.preferences_options_contacts_macos = 'Aus Kontakte importieren'
 z.string.de.preferences_options_contacts_detail = 'Wir verwenden deine Daten, um Kontakte für dich zu erstellen. Wir anonymisieren alle Informationen und teilen sie mit niemand anderem.'
 z.string.de.preferences_options_data = 'Nutzungs- und Fehlerberichte'
 z.string.de.preferences_options_data_checkbox = 'Nutzungs- und Fehlerberichte'
-z.string.de.preferences_options_data_detail = 'Hilf uns Wire durch das Senden anonymisierter Informationen zu verbessern.'
+z.string.de.preferences_options_data_detail = 'Hilf uns, Wire durch das Senden anonymisierter Informationen zu verbessern.'
 z.string.de.preferences_options_sound = 'Benachrichtigungen'
 z.string.de.preferences_options_sound_all = 'Alle'
 z.string.de.preferences_options_sound_all_detail = 'Alle Sounds'
@@ -507,6 +508,8 @@ z.string.de.system_notification_connection_accepted = 'Hat deine Kontaktanfrage
 z.string.de.system_notification_connection_request = 'Möchte dich als Kontakt hinzufügen'
 z.string.de.system_notification_conversation_create = '%s.first_name hat eine Unterhaltung begonnen'
 z.string.de.system_notification_conversation_rename = '%s.first_name hat die Unterhaltung in %name umbenannt'
+z.string.de.system_notification_ephemeral = 'Hat dir eine Nachricht gesendet'
+z.string.de.system_notification_ephemeral_title = 'Jemand'
 z.string.de.system_notification_member_join_many = '%s.first_name hat %no Kontakte zur Unterhaltung hinzugefügt'
 z.string.de.system_notification_member_join_one = '%s.first_name hat %@.first_name zur Unterhaltung hinzugefügt'
 z.string.de.system_notification_member_leave_left = '%s.first_name hat die Unterhaltung verlassen'
@@ -522,14 +525,15 @@ z.string.de.system_notification_voice_channel_activate = 'Ruft an'
 z.string.de.system_notification_voice_channel_deactivate = 'Hat versucht anzurufen'
 
 # Tooltips
+z.string.de.tooltip_conversation_all_verified = 'Alle Fingerabdrücke sind überprüft'
 z.string.de.tooltip_conversation_call = 'Anruf'
-z.string.de.tooltip_conversation_video_call = 'Videoanruf'
+z.string.de.tooltip_conversation_ephemeral = 'Temporäre Nachricht'
 z.string.de.tooltip_conversation_file = 'Datei senden'
+z.string.de.tooltip_conversation_input_placeholder = 'Schreibe eine Nachricht'
 z.string.de.tooltip_conversation_people = 'Unterhaltungsübersicht (%shortcut)'
 z.string.de.tooltip_conversation_picture = 'Bild senden'
 z.string.de.tooltip_conversation_ping = 'Ping (%shortcut)'
-z.string.de.tooltip_conversation_all_verified = 'Alle Fingerabdrücke sind überprüft'
-z.string.de.tooltip_conversation_input_placeholder = 'Schreibe eine Nachricht'
+z.string.de.tooltip_conversation_video_call = 'Videoanruf'
 
 z.string.de.tooltip_conversations_archive = 'Archivieren (%shortcut)'
 z.string.de.tooltip_conversations_archived = 'Archiv anzeigen (%no)'
@@ -549,7 +553,8 @@ z.string.de.tooltip_people_rename = 'Unterhaltung umbenennen'
 z.string.de.tooltip_people_remove = 'Aus Unterhaltung entfernen'
 z.string.de.tooltip_people_unblock = 'Freigeben'
 
-z.string.de.tooltip_preferences_contacts = 'Logge dich in dein Gmail-Konto ein, um deine Kontakte zu teilen'
+z.string.de.tooltip_preferences_contacts_gmail = 'Melde dich an deinem Gmail-Konto an, um deine Kontakte zu teilen'
+z.string.de.tooltip_preferences_contacts_macos = 'Teile alle deine Kontakte aus der macOS Kontakte-App'
 z.string.de.tooltip_preferences_password = 'Öffne eine andere Website, um dein Passwort zurückzusetzen'
 z.string.de.tooltip_preferences_picture = 'Ändere dein Bild…'
 z.string.de.tooltip_preferences_rename = 'Ändere deinen Namen'
@@ -571,3 +576,13 @@ z.string.de.init_events_expectation_long = 'Lade %events neue Events'
 z.string.de.init_events_progress = 'Lade Events - %progress von %total'
 z.string.de.init_updated_from_notifications = 'Fast geschafft'
 z.string.de.init_app_pre_loaded = 'Viel Spaß mit Wire'
+
+z.string.de.ephememal_units_none = 'Aus'
+z.string.de.ephememal_units_second = 'Sekunde'
+z.string.de.ephememal_units_seconds = 'Sekunden'
+z.string.de.ephememal_units_minute = 'Minute'
+z.string.de.ephememal_units_minutes = 'Minuten'
+z.string.de.ephememal_units_hour = 'Stunde'
+z.string.de.ephememal_units_hours = 'Stunden'
+z.string.de.ephememal_units_day = 'Tag'
+z.string.de.ephememal_units_days = 'Tage'
diff --git a/app/script/localization/strings-es.coffee b/app/script/localization/strings-es.coffee
new file mode 100644
index 00000000000..edaede90cc4
--- /dev/null
+++ b/app/script/localization/strings-es.coffee
@@ -0,0 +1,581 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+#General terms
+z.string.es.wire_macos = 'Wire para macOS'
+z.string.es.wire_windows = 'Wire para Windows'
+z.string.es.wire_linux = 'Wire para Linux'
+z.string.es.nonexistent_user = 'Usuario Borrado'
+z.string.es.and = 'y'
+
+# Alert view when trying to set a profile image that's too small
+z.string.es.alert_upload_file_format = 'No se puede utilizar esta foto.\nPor favor, elija un archivo PNG o JPEG.'
+z.string.es.alert_upload_too_small = 'No se puede utilizar esta foto.\nPor favor, elija una imagen de al menos 320 x 320 px.'
+z.string.es.alert_upload_too_large = 'Esta imagen es demasiado grande. \nPuedes subir archivos de hasta %no MB.'
+z.string.es.alert_gif_too_large = 'La animación es demasiado grande.\nEl tamaño máximo es de %no MB.'
+
+# Auth
+# Authentication: ACCOUNT section
+z.string.es.auth_account_country_code = 'Código de País'
+z.string.es.auth_account_create = 'Crear'
+z.string.es.auth_account_create_account = 'Crear una Cuenta'
+z.string.es.auth_account_expiration = 'Su sesión ha vencido. Entrar nuevamente.'
+z.string.es.auth_account_get_wire = 'Un messenger sencillo, privado y seguro para chat y llamadas, y para compartir fotos, música, videos, GIFs y mas.'
+z.string.es.auth_account_password_forgot = 'Contraseña Olvidada'
+z.string.es.auth_account_remember_me = 'Mantener sesión iniciada'
+z.string.es.auth_account_sign_in = 'Iniciar sesión'
+z.string.es.auth_account_sign_in_email = 'Correo'
+z.string.es.auth_account_sign_in_phone = 'Teléfono'
+z.string.es.auth_account_terms_of_use = 'Términos de Uso'
+z.string.es.auth_account_terms_of_use_detail = 'Acepto'
+
+# Authentication: VERIFY section
+z.string.es.auth_verify_account_add = 'Agregar'
+z.string.es.auth_verify_account_detail = 'Esto le permite usar Wire en múltiples dispositivos.'
+z.string.es.auth_verify_account_headline = 'Agregar dirección de correo electrónico y contraseña.'
+z.string.es.auth_verify_account_logout = 'Cerrar sesión'
+z.string.es.auth_verify_code_description = 'Ingresa el código de verificación\nque hemos enviado a %@number.'
+z.string.es.auth_verify_code_resend = '¿No ha recibido ningún código?'
+z.string.es.auth_verify_code_resend_detail = 'Reenviar'
+z.string.es.auth_verify_code_resend_timer = 'Puede solicitar un nuevo código en %expiration.'
+z.string.es.auth_verify_code_change_phone = 'Cambiar número de teléfono'
+z.string.es.auth_verify_password_headline = 'Introduzca su contraseña'
+
+# Authentication: limit section
+z.string.es.auth_limit_devices_headline = 'Dispositivos'
+z.string.es.auth_limit_description = 'Quite uno de los dispositivos para comenzar a usar Wire en este dispositivo.'
+z.string.es.auth_limit_button_manage = 'Administrar dispositivos'
+z.string.es.auth_limit_button_sign_out = 'Cerrar sesión'
+z.string.es.auth_limit_devices_current = '(Actual)'
+
+# Authentication: limit section
+z.string.es.auth_history_headline = 'Es la primera vez que usas Wire en este dispositivo.'
+z.string.es.auth_history_description = 'Por motivos de privacidad, tu historial de conversación no aparecerá aquí.'
+z.string.es.auth_history_button = 'OK'
+
+# Authentication: POSTED section
+z.string.es.auth_posted_change_email = 'Modificar correo'
+z.string.es.auth_posted_offline_detail = 'Compruebe su conexión de Internet e inténtelo otra vez.'
+z.string.es.auth_posted_offline_headline = 'Wire es mejor cuando tenga conexción.'
+z.string.es.auth_posted_pending_detail = 'Revise su buzón de correo electrónico o reenviar activación.'
+z.string.es.auth_posted_pending_headline = 'La cuenta ya está pendiente'
+z.string.es.auth_posted_resend = 'Reenviar a %email'
+z.string.es.auth_posted_resend_action = '¿No aparece ningún correo electrónico?'
+z.string.es.auth_posted_resend_detail = 'Revise su buzón de correo electrónico y siga las instrucciones.'
+z.string.es.auth_posted_resend_headline = 'Tiene un correo electrónico.'
+z.string.es.auth_posted_retry = 'Volver a intentar y enviar correo a %email'
+z.string.es.auth_posted_retry_action = '¿Intentar nuevamente?'
+z.string.es.auth_posted_retry_detail = 'Por favor inténtalo de nuevo.'
+z.string.es.auth_posted_retry_headline = 'Algo salió mal'
+z.string.es.auth_posted_verify_later = 'Verifica más tarde'
+
+#Authentication: Misc
+z.string.es.auth_placeholder_email = 'Correo'
+z.string.es.auth_placeholder_name = 'Nombre'
+z.string.es.auth_placeholder_password_put = 'Contraseña'
+z.string.es.auth_placeholder_password_set = 'Contraseña (mínimo 8 caracteres)'
+z.string.es.auth_placeholder_phone = 'Número de teléfono'
+
+# Authentication: Validation errors
+z.string.es.auth_error_code = 'Código no válido'
+z.string.es.auth_error_country_code_invalid = 'Código de país no válido'
+z.string.es.auth_error_email_exists = 'Este correo electrónico ya está registrado'
+z.string.es.auth_error_email_forbidden = 'Lo sentimos. Esta dirección de correo electrónico está prohibida.'
+z.string.es.auth_error_email_malformed = 'Por favor, introduce una dirección de correo electrónico válida.'
+z.string.es.auth_error_email_missing = 'Por favor, introduce una dirección de correo electrónico.'
+z.string.es.auth_error_misc = 'Problemas con la conexión. Por favor, inténtelo de nuevo.'
+z.string.es.auth_error_name_short = 'Introduzca un nombre con al menos 2 caracteres'
+z.string.es.auth_error_offline = 'No hay conexión a Internet'
+z.string.es.auth_error_password_short = 'Elija una contraseña con al menos 8 caracteres.'
+z.string.es.auth_error_password_wrong = 'Contraseña incorrecta. Por favor, inténtelo de nuevo.'
+z.string.es.auth_error_phone_number_forbidden = 'Lo sentimos. Este número de teléfono está prohibido.'
+z.string.es.auth_error_phone_number_invalid = 'Número de teléfono no válido'
+z.string.es.auth_error_phone_number_unknown = 'Número de Teléfono Desconocido'
+z.string.es.auth_error_sign_in = 'Por favor, verifique sus datos y vuelva a intentarlo.'
+
+# Call stuff
+z.string.es.call_state_outgoing = 'Sonando…'
+z.string.es.call_state_connecting = 'Conectando…'
+z.string.es.call_state_incoming = 'Llamando…'
+z.string.es.call_decline = 'Rechazar'
+z.string.es.call_accept = 'Aceptar'
+z.string.es.call_join = 'Entrar'
+z.string.es.call_choose_shared_screen = 'Elige una pantalla para compartir'
+
+# Warnings
+z.string.es.modal_button_cancel = 'Cancelar'
+z.string.es.modal_button_ok = 'OK'
+z.string.es.modal_button_send = 'Enviar'
+
+# Block a user
+z.string.es.modal_block_conversation_headline = '¿Bloquear a %@.name?'
+z.string.es.modal_block_conversation_message = '%@.name no podrá ponerse en contacto con usted o invitarlo a una conversación de grupo.'
+z.string.es.modal_block_conversation_button = 'Bloquear'
+# Cannot create the call because there is nobody to call (conversation_empty)
+z.string.es.modal_call_conversation_empty_headline = 'Nadie para llamar'
+z.string.es.modal_call_conversation_empty_message = 'No hay nadie aqui.'
+# Cannot create the call because there are too many participants (conversation_full)
+z.string.es.modal_call_conversation_full_headline = 'Demasiadas personas para llamar'
+z.string.es.modal_call_conversation_full_message = 'Las llamadas funcionan en conversaciones con hasta %n personas.'
+# Cannot video call in group conversations
+z.string.es.modal_call_no_video_in_group_headline = 'No hay videollamadas en grupos'
+z.string.es.modal_call_no_video_in_group_message = 'Video llamadas no están disponibles en conversaciones de grupo.'
+# Second incoming call
+z.string.es.modal_call_second_incoming_headline = '¿Contestar llamada?'
+z.string.es.modal_call_second_incoming_message = 'Su llamada en curso terminara.'
+z.string.es.modal_call_second_incoming_action = 'Contestar'
+# Second ongoing call
+z.string.es.modal_call_second_ongoing_headline = '¿Colgar llamada en otro dispositivo?'
+z.string.es.modal_call_second_ongoing_message = 'Solo puedes estar en una llamada a la vez.'
+z.string.es.modal_call_second_ongoing_action = 'Colgar'
+# Second outgoing call
+z.string.es.modal_call_second_outgoing_headline = '¿Colgar llamada actual?'
+z.string.es.modal_call_second_outgoing_message = 'Solo puedes estar en una llamada a la vez.'
+z.string.es.modal_call_second_outgoing_action = 'Colgar'
+# Cannot join the call because there are too many participants (voice_channel_full)
+z.string.es.modal_call_voice_channel_full_headline = 'Llamada llena'
+z.string.es.modal_call_voice_channel_full_message = 'Sólo hay espacio en esta llamada para %no personas.'
+# Clear a conversation
+z.string.es.modal_clear_conversation_headline = '¿Borrar contenido de "%@.name"?'
+z.string.es.modal_clear_conversation_message = 'Se borrará el historial de la conversación y la eliminará de la lista.'
+z.string.es.modal_clear_conversation_option = 'También abandonar la conversación'
+z.string.es.modal_clear_conversation_button = 'Eliminar'
+# Connected device
+z.string.es.modal_connected_device_headline = 'Tu cuenta fue usada en:'
+z.string.es.modal_connected_device_from = 'Desde:'
+z.string.es.modal_connected_device_message = 'Si usted no hizo esto, retire el dispositivo y restablecer la contraseña.'
+z.string.es.modal_connected_device_manage_devices = 'administrar dispositivos'
+# Delete account
+z.string.es.modal_delete_account_action = 'Eliminar'
+z.string.es.modal_delete_account_headline = 'Eliminar cuenta'
+z.string.es.modal_delete_account_message = 'Enviaremos un mensaje por correo electrónico o SMS. Sigue el enlace para borrar permanentemente tu cuenta.'
+# Delete message
+z.string.es.modal_delete_button = 'Eliminar'
+z.string.es.modal_delete_headline = '¿Eliminar sólo para mí?'
+z.string.es.modal_delete_message = 'Esto no se puede deshacer.'
+# Delete message
+z.string.es.modal_delete_everyone_button = 'Eliminar'
+z.string.es.modal_delete_everyone_headline = '¿Eliminar para todos?'
+z.string.es.modal_delete_everyone_message = 'Esto no se puede deshacer.'
+# Too long message
+z.string.es.modal_too_long_headline = 'El mensaje es demasiado largo'
+z.string.es.modal_too_long_message = 'Puede enviar mensajes de hasta %no caracteres.'
+# Leave a conversation
+z.string.es.modal_leave_conversation_headline = '¿Abandonar la conversación "%@.name"?'
+z.string.es.modal_leave_conversation_message = 'Los participantes serán notificados y se eliminará la conversación de la lista.'
+z.string.es.modal_leave_conversation_button = 'Abandonar'
+# Logout
+z.string.es.modal_logout_headline = '¿Borrar los Datos?'
+z.string.es.modal_logout_message = 'Borrar todos sus datos personales y las conversaciones en este dispositivo.'
+z.string.es.modal_logout_button = 'Cerrar sesión'
+# New device
+z.string.es.modal_new_device_headline = '"%@.name" comenzó a usar un nuevo dispositivo'
+z.string.es.modal_new_device_message = '¿Desea enviar su mensaje?'
+z.string.es.modal_new_device_show_device = 'mostrar dispositivo'
+z.string.es.modal_new_device_send_anyway = 'enviar de todos modos'
+# Remove device
+z.string.es.modal_remove_device_button = 'Eliminar dispositivo'
+z.string.es.modal_remove_device_headline = 'Eliminar "%device_name"'
+z.string.es.modal_remove_device_message = 'Se requiere tu contraseña para eliminar el dispositivo.'
+# Session Reset
+z.string.es.modal_session_reset_headline = 'La sesión ha sido restablecida'
+z.string.es.modal_session_reset_message_1 = 'Si no se resuelva el problema,'
+z.string.es.modal_session_reset_message_link = 'comunicarse con'
+z.string.es.modal_session_reset_message_2 = 'nosotros.'
+# Too many members in conversation
+z.string.es.modal_too_many_members_headline = 'Llamada llena'
+z.string.es.modal_too_many_members_message = 'Hasta %max personas pueden unirse a una conversación. Hay espacio para %no más personas aquí.'
+# Whitelist screensharing
+z.string.es.modal_whitelist_screensharing_headline = 'Wire necesita permiso para compartir su pantalla'
+z.string.es.modal_whitelist_screensharing_message_1 = 'Abrir about:config y agregar *.wire.com a la lista de dominios que pueden compartir la pantalla. Ver'
+z.string.es.modal_whitelist_screensharing_message_link = 'Preguntas más Frecuentes'
+z.string.es.modal_whitelist_screensharing_message_2 = 'para mayor detalle.'
+# Parallel uploads
+z.string.es.modal_uploads_parallel = 'Puede enviar hasta %no archivos a la vez.'
+
+# Connection requests
+z.string.es.connection_request_connect = 'Conectar'
+z.string.es.connection_request_ignore = 'Ignorar'
+z.string.es.connection_request_message = 'Hola %@.first_name,\nHablemos por Wire.\n%s.first_name'
+
+# Conversation
+z.string.es.conversation_you_nominative = 'tú'
+z.string.es.conversation_you_dative = 'tú'
+z.string.es.conversation_you_accusative = 'tú'
+
+z.string.es.conversation_connection_accepted = 'Conectado'
+z.string.es.conversation_connection_blocked = 'Bloqueado'
+z.string.es.conversation_connection_cancel_request = 'Cancelar solicitud de conexión'
+z.string.es.conversation_create = ' inició una conversación con %@names'
+z.string.es.conversation_create_you = ' inició una conversación con %@names'
+z.string.es.conversation_device_started_using = ' comenzaste a utilizar'
+z.string.es.conversation_device_started_using_you = ' comenzaste a utilizar'
+z.string.es.conversation_device_unverified = ' uno no verificado de'
+z.string.es.conversation_device_your_devices = ' tus dispositivos'
+z.string.es.conversation_device_user_devices = ' %@dispositivos nombre s'
+z.string.es.conversation_device_a_new_device = ' un nuevo dispositivo'
+z.string.es.conversation_just_now = 'Justo ahora'
+z.string.es.conversation_location_link = 'Abrir Mapa'
+z.string.es.conversation_member_join = ' %@nombres añadidos'
+z.string.es.conversation_member_join_you = ' %@nombres añadidos'
+z.string.es.conversation_member_leave_left = ' abandonó'
+z.string.es.conversation_member_leave_left_you = ' abandonó'
+z.string.es.conversation_member_leave_removed = ' %@nombres eliminados'
+z.string.es.conversation_member_leave_removed_you = ' eliminados %@nombres'
+z.string.es.conversation_message_delivered = 'Entregado'
+z.string.es.conversation_rename = ' renombró la conversación'
+z.string.es.conversation_rename_you = ' renombró la conversación'
+z.string.es.conversation_resume = 'Iniciar una conversación con %@nombres'
+z.string.es.conversation_ping = ' ping'
+z.string.es.conversation_ping_you = ' ping'
+z.string.es.conversation_today = 'hoy'
+z.string.es.conversation_verified = 'Verificado'
+z.string.es.conversation_voice_channel_deactivate = ' llamó'
+z.string.es.conversation_voice_channel_deactivate_you = ' llamaste'
+z.string.es.conversation_yesterday = 'Ayer'
+z.string.es.conversation_unable_to_decrypt_1 = 'un mensaje de %@name no se recibió'
+z.string.es.conversation_unable_to_decrypt_2 = '%@name´s identidad de dispositivo cambiada. Mensaje no entregado.'
+z.string.es.conversation_unable_to_decrypt_link = '¿Por qué?'
+z.string.es.conversation_unable_to_decrypt_error_message = 'Error'
+z.string.es.conversation_unable_to_decrypt_reset_session = 'Restablecer sesión'
+z.string.es.conversation_asset_uploading = 'Subiendo…'
+z.string.es.conversation_asset_downloading = 'Descargando…'
+z.string.es.conversation_asset_upload_failed = 'Error al subir la información'
+z.string.es.conversation_asset_upload_too_large = 'Puedes enviar archivos de hasta %no'
+z.string.es.conversation_playback_error = 'Incapaz de reproducir'
+z.string.es.conversation_context_menu_edit = 'Editar'
+z.string.es.conversation_context_menu_delete = 'Eliminar para mi'
+z.string.es.conversation_context_menu_delete_everyone = 'Eliminar para todos'
+z.string.es.conversation_context_menu_download = 'Descargar'
+z.string.es.conversation_context_menu_like = 'Me gusta'
+z.string.es.conversation_context_menu_unlike = 'No me gusta'
+z.string.es.conversation_delete_timestamp = 'Eliminados en %@fecha y hora'
+z.string.es.conversation_edit_timestamp = 'Editado %@fecha y hora'
+z.string.es.conversation_likes_caption = '%@numbero de personas'
+
+# Archive
+z.string.es.archive_header = 'Archivar'
+
+# Conversations
+z.string.es.conversations_all_archived = 'Todo archivado'
+z.string.es.conversations_contacts = 'Contactos'
+z.string.es.conversations_connection_request_many = '%no personas en espera'
+z.string.es.conversations_connection_request_one = '1 persona en espera'
+z.string.es.conversations_empty_conversation = 'Conversación vacía'
+z.string.es.conversations_no_conversations = 'Iniciar una conversación o invitar personas a unirse.'
+z.string.es.conversations_popover_archive = 'Archivar'
+z.string.es.conversations_popover_block = 'Bloquear'
+z.string.es.conversations_popover_cancel = 'Cancelar solicitud'
+z.string.es.conversations_popover_clear = 'Eliminar'
+z.string.es.conversations_popover_leave = 'Abandonar'
+z.string.es.conversations_popover_notify = 'Sonido'
+z.string.es.conversations_popover_silence = 'Silenciar'
+z.string.es.conversations_popover_unarchive = 'Desarchivar'
+
+# Invites
+z.string.es.invite_meta_key_mac = 'Cmd'
+z.string.es.invite_meta_key_pc = 'Ctrl'
+z.string.es.invite_hint_selected = 'Pulse %meta_key + C para copiar'
+z.string.es.invite_hint_unselected = 'Seleccione y pulse %meta_key + C'
+z.string.es.invite_detail = 'El enlace será válido para 2 semanas.'
+z.string.es.invite_headline = 'Invitar amigos a Wire'
+z.string.es.invite_message = 'Estoy en Wire. Busca por %@email o visita https://get.wire.com para conectar conmigo.'
+z.string.es.invite_message_no_email = 'Estoy en Wire. Visita https://get.wire.com para conectar conmigo.'
+
+# Extensions
+z.string.es.extensions_bubble_button_gif = 'Gif'
+
+# Extensions Giphy
+z.string.es.extensions_giphy_button_ok = 'Enviar'
+z.string.es.extensions_giphy_button_more = 'Buscar otro'
+z.string.es.extensions_giphy_message = '%tag · vía giphy.com'
+z.string.es.extensions_giphy_no_gifs = 'Uups, no hay gifs'
+z.string.es.extensions_giphy_random = 'Aleatorio'
+
+# People View
+z.string.es.search_open = 'Abrir'
+z.string.es.search_open_group = 'Crear Grupo'
+z.string.es.people_confirm_label = 'Agregar a la conversación'
+z.string.es.people_common_contacts = 'Ambos conocen a'
+z.string.es.people_people = '%no Personas'
+z.string.es.people_search_placeholder = 'Buscar por nombre'
+z.string.es.people_everyone_participates = 'Todas las personas con quien estás conectado ya se encuentran en esta conversación.'
+z.string.es.people_no_matches = 'No hay resultados coincidentes. Intente con un nombre diferente.'
+z.string.es.people_invite = 'Invitar gente'
+z.string.es.people_share = 'Compartir contactos'
+z.string.es.people_bring_your_friends = 'Invita a tus amigos a Wire'
+z.string.es.people_invite_detail = 'Compartir tus contactos le ayuda a conectarse con otros. Toda la información es anónima y no será compartida con nadie más.'
+z.string.es.people_invite_button_contacts = 'Desde los contactos'
+z.string.es.people_invite_button_gmail = 'Desde Gmail'
+z.string.es.people_invite_headline = 'Tráete a tus amigos'
+z.string.es.people_tabs_details = 'Detalles'
+z.string.es.people_tabs_devices = 'Dispositivos'
+z.string.es.people_tabs_devices_headline = 'Wire proporciona a cada dispositivo una huella digital única. Comparala con %@.name y verifica tu conversación.'
+z.string.es.people_tabs_devices_why_verify = '¿Por qué verificar la conversación?'
+z.string.es.people_tabs_no_devices_headline = '%@.name está utilizando una versión antigua de Wire. No se muestran dispositivos aquí.'
+z.string.es.people_tabs_device_detail_all_my_devices = 'Mostrar todos mis dispositivos'
+z.string.es.people_tabs_device_detail_device_fingerprint = 'Huella digital de tu dispositivo'
+z.string.es.people_tabs_device_detail_headline = 'Verifica que esta coincida con la huella digital que se muestra en el dispositivo de %bold%@.name’s%end.'
+z.string.es.people_tabs_device_detail_how_to = '¿Cómo lo hago?'
+z.string.es.people_tabs_device_detail_reset_session = 'Restablecer sesión'
+z.string.es.people_tabs_device_detail_show_my_device = 'Mostrar la huella digital de mi dispositivo'
+z.string.es.people_tabs_device_detail_verified = 'Verificado'
+
+# Block user
+z.string.es.people_block_headline = '¿Bloquear?'
+z.string.es.people_block_message = '%@.first_name no podrá encontrarte o entrar en contacto contigo por Wire.'
+
+# Accept a pending connection dialogue
+z.string.es.people_connect_headline = '¿Aceptar?'
+z.string.es.people_connect_message = 'Esto los conectará y abrirá la conversación con %@.first_name.'
+
+# Cancel a pending request
+z.string.es.people_cancel_request_headline = '¿Cancelar solicitud?'
+z.string.es.people_cancel_request_message = 'Eliminar la solicitud de conexión con %@.first_name.'
+
+# Leave the conversation dialogue
+z.string.es.people_leave_headline = '¿Abandonar la conversación?'
+z.string.es.people_leave_message = 'No podrá enviar o recibir mensajes en esta conversación.'
+
+# Remove from conversation dialogue
+z.string.es.people_remove_headline = '¿Quitar?'
+z.string.es.people_remove_message = '%@.first_name no podrá enviar o recibir mensajes en esta conversación.'
+
+# Unblock user
+z.string.es.people_unblock_headline = '¿Desbloquear?'
+z.string.es.people_unblock_message = '%@.first_name será capaz de encontrarte y entrar en contacto contigo por Wire otra vez. También recibirás mensajes de ellos mientras estén bloqueados.'
+
+# Button labels for the actions
+z.string.es.people_button_add = 'Agregar personas'
+z.string.es.people_button_block = 'Bloquear'
+z.string.es.people_button_cancel = 'Cancelar'
+z.string.es.people_button_connect = 'Conectar'
+z.string.es.people_button_create = 'Crear grupo'
+z.string.es.people_button_ignore = 'Ignorar'
+z.string.es.people_button_leave = 'Abandonar'
+z.string.es.people_button_open = 'Abrir conversación'
+z.string.es.people_button_pending = 'Pendiente'
+z.string.es.people_button_profile = 'Perfil'
+z.string.es.people_button_remove = 'Eliminar'
+z.string.es.people_button_unblock = 'Desbloquear'
+z.string.es.people_button_no = 'No'
+z.string.es.people_button_yes = 'Si'
+
+# Settings
+z.string.es.preferences_about = 'Acerca de'
+z.string.es.preferences_account = 'Cuenta'
+z.string.es.preferences_device_details = 'Detalles del dispositivo'
+z.string.es.preferences_devices = 'Dispositivos'
+z.string.es.preferences_headline = 'Preferencias'
+z.string.es.preferences_options = 'Opciones'
+
+z.string.es.preferences_about_copyright = '© Wire Swiss GmbH'
+z.string.es.preferences_about_privacy_policy = 'Política de Privacidad'
+z.string.es.preferences_about_support = 'Soporte'
+z.string.es.preferences_about_support_website = 'Sitio web de Soporte'
+z.string.es.preferences_about_support_contact = 'Contactar con Soporte'
+z.string.es.preferences_about_terms_of_use = 'Términos de uso'
+z.string.es.preferences_about_version = 'Versión %version'
+z.string.es.preferences_about_website = 'Página web de Wire'
+
+z.string.es.preferences_account_reset_password = 'Restablecer constraseña'
+z.string.es.preferences_account_delete = 'Eliminar cuenta'
+z.string.es.preferences_account_log_out = 'Cerrar sesión'
+z.string.es.preferences_account_username_placeholder = 'Tu nombre completo'
+
+z.string.es.preferences_devices_activated_in = 'en %location'
+z.string.es.preferences_devices_activated_on = 'Activado %time'
+z.string.es.preferences_devices_active = 'Activo'
+z.string.es.preferences_devices_active_detail = 'Si no reconoces un dispositivo anterior, elimínalo y restablece tu contraseña.'
+z.string.es.preferences_devices_current = 'Actual'
+z.string.es.preferences_devices_fingerprint = 'Huella digital'
+z.string.es.preferences_devices_fingerprint_detail = 'Wire proporciona a cada dispositivo una huella digital única. Compare las huellas dactilares para verificar su dispositivos y conversaciones.'
+z.string.es.preferences_devices_id = 'ID: '
+z.string.es.preferences_devices_remove = 'Eliminar'
+z.string.es.preferences_devices_remove_cancel = 'Cancelar'
+z.string.es.preferences_devices_remove_detail = 'Eliminar este dispositivo si ha dejado de usarlo. Se borrará el historial de mensajes y será desconectado.'
+z.string.es.preferences_devices_session_confirmation = 'La sesión ha sido restablecida.'
+z.string.es.preferences_devices_session_detail = 'Si no coinciden las huellas digitales, reiniciar la sesión para generar nuevas claves de cifrado en ambos lados.'
+z.string.es.preferences_devices_session_reset = 'Restablecer sesión'
+z.string.es.preferences_devices_session_ongoing = 'Restableciendo sesión…'
+z.string.es.preferences_devices_verification = 'Verificado'
+
+z.string.es.preferences_options_contacts = 'Contactos'
+z.string.es.preferences_options_contacts_gmail = 'Importar desde Gmail'
+z.string.es.preferences_options_contacts_macos = 'Importar desde Contactos'
+z.string.es.preferences_options_contacts_detail = 'Compartir tus contactos te ayuda a conectarte con otros. Toda la información es anónima y no será compartida con nadie más.'
+z.string.es.preferences_options_data = 'Reportes de uso y fallas'
+z.string.es.preferences_options_data_checkbox = 'Reportes de uso y fallas'
+z.string.es.preferences_options_data_detail = 'Ayudar a mejorar Wire enviando información anónima.'
+z.string.es.preferences_options_sound = 'Alertas de sonido'
+z.string.es.preferences_options_sound_all = 'Todo'
+z.string.es.preferences_options_sound_all_detail = 'Todos los sonidos'
+z.string.es.preferences_options_sound_none = 'Ninguno'
+z.string.es.preferences_options_sound_none_detail = 'Sshhh!'
+z.string.es.preferences_options_sound_some = 'Algunos'
+z.string.es.preferences_options_sound_some_detail = 'Pings y llamadas'
+
+# Search
+z.string.es.search_group_hint = 'Seguir intentando o elegir más personas para crear un grupo'
+z.string.es.search_connect = 'Conectar'
+z.string.es.search_connections = 'Conexiones'
+z.string.es.search_groups = 'Grupos'
+z.string.es.search_placeholder = 'Buscar por nombre o correo electrónico'
+z.string.es.search_top_people = 'Personas más importantes'
+z.string.es.search_try_search = 'Encuentra personas por nombre o dirección de email'
+z.string.es.search_no_contacts_on_wire = 'No tienes ningún contacto en Wire. Trata de encontrar personas por nombre o dirección de correo electronico'
+z.string.es.search_others = 'Conectar'
+z.string.es.search_suggestion_one = 'Conoce a %@.first_name'
+z.string.es.search_suggestion_two = 'Conoce a %@.first_name y %@.other_name'
+z.string.es.search_suggestion_many = 'Conoce a %@.first_name y %no más personas'
+
+# Picture upload
+z.string.es.upload_welcome = 'Wire es mucho mejor con una foto.'
+z.string.es.upload_welcome_keep = 'conservar esta'
+z.string.es.upload_welcome_choose = 'eligir la tuya'
+
+# Google contacts upload
+z.string.es.upload_google_headline = 'Buscar con quien hablar.'
+z.string.es.upload_google_message = 'Compartir tus contactos te ayuda a conectarte con otros. Toda la información es anónima y no será compartida con nadie más.'
+z.string.es.upload_google_headline_error = 'Algo salió mal.'
+z.string.es.upload_google_message_error = 'No recibimos tu información. Por favor, intenta importar tus contactos otra vez.'
+z.string.es.upload_google_button_again = 'Vuelve a intentarlo'
+
+# URLs
+z.string.es.url_password_reset = 'https://wire.com/forgot/'
+z.string.es.url_legal = 'https://wire.com/legal/'
+z.string.es.url_privacy = 'https://wire.com/privacy/'
+z.string.es.url_privacy_why = 'https://wire.com/privacy/why/'
+z.string.es.url_support = 'https://support.wire.com'
+z.string.es.url_terms_of_use = 'https://wire.com/legal/terms/'
+z.string.es.url_wire = 'https://wire.com'
+z.string.es.url_wire_for_web = 'https://app.wire.com'
+z.string.es.url_support_calling = 'https://support.wire.com/hc/en-us/articles/202969412'
+z.string.es.url_support_camera_access_denied = 'https://support.wire.com/hc/en-us/articles/202935412'
+z.string.es.url_support_contact = 'https://support.wire.com/hc/en-us/requests/new'
+z.string.es.url_support_contact_bug = 'https://support.wire.com/hc/en-us/requests/new?ticket_form_id=101615'
+z.string.es.url_support_history = 'https://support.wire.com/hc/en-us/articles/207834645'
+z.string.es.url_support_mic_access_denied = 'https://support.wire.com/hc/en-us/articles/202590081'
+z.string.es.url_support_mic_not_found = 'https://support.wire.com/hc/en-us/articles/202970662'
+z.string.es.url_support_screen_access_denied = 'https://support.wire.com/hc/en-us/articles/202935412'
+z.string.es.url_support_screen_whitelist = 'https://support.wire.com/hc/en-us/articles/209423889'
+z.string.es.url_decrypt_error_1 = 'https://wire.com/privacy/error-1'
+z.string.es.url_decrypt_error_2 = 'https://wire.com/privacy/error-2'
+
+# Warnings: Permission requests & permission callbacks
+z.string.es.warning_call_detail = 'Para hablar, tu navegador necesita permiso de usar el micrófono.'
+z.string.es.warning_call_headline = 'No se puede llamar sin micrófono'
+z.string.es.warning_call_unsupported_incoming = '%s.first_name está llamando. Tu navegador no está configurada para llamadas.'
+z.string.es.warning_call_unsupported_outgoing = 'No puedes llamar porque tu navegador no está configurada para llamadas.'
+z.string.es.warning_call_issues = 'Esta versión de Wire no puede participar en la llamada. Por favor, usa'
+z.string.es.warning_call_upgrade_browser = 'Para llamar se necesita una versión reciente de Google Chrome.'
+z.string.es.warning_learn_more = 'Aprender más'
+z.string.es.warning_not_found_camera = 'No puedes llamar porque tu máquina no tiene cámera.'
+z.string.es.warning_not_found_microphone = 'No puedes llamar porque tu máquina no tiene micrófono.'
+z.string.es.warning_permission_denied_camera = 'No puedes llamar porque tu máquina no tiene accesso a la cámera.'
+z.string.es.warning_permission_denied_microphone = 'No puedes llamar porque tu máquina no tiene acceso al micrófono.'
+z.string.es.warning_permission_denied_screen = 'No puedes compartir tu pantalla porque el navegador no tiene acceso.'
+z.string.es.warning_permission_request_camera = '%icon Permitir acceso a la cámara'
+z.string.es.warning_permission_request_microphone = '%icon Permitir acceso al micrófono'
+z.string.es.warning_permission_request_notification = '%icon Permitir notificaciones'
+z.string.es.warning_permission_request_screen = '%icon Permitir acceso a la pantalla'
+z.string.es.warning_tell_me_how = 'Explíqueme cómo'
+
+# Warnings: Connectivity
+z.string.es.warning_connectivity_connection_lost = 'Intentando conectar. Es posible que Wire no podrá entregar mensajes.'
+z.string.es.warning_connectivity_no_internet = 'No hay Internet. No podrás enviar o recibir mensajes.'
+
+# Browser notifications
+z.string.es.system_notification_asset_add = 'Compartió una foto'
+z.string.es.system_notification_connection_accepted = 'Aceptó tu solicitud de conexión'
+z.string.es.system_notification_connection_request = 'Quiere conectar'
+z.string.es.system_notification_conversation_create = '%s.first_name inició una conversación'
+z.string.es.system_notification_conversation_rename = '%s.first_name renombró la conversación a %name'
+z.string.es.system_notification_member_join_many = '%s.first_name agregó a %no personas a la conversación'
+z.string.es.system_notification_member_join_one = '%s.first_name agregó a %@.first_name a la conversación'
+z.string.es.system_notification_member_leave_left = '%s.first_name ha dejado la conversación'
+z.string.es.system_notification_member_leave_removed_many = '%s.first_name eliminó a %no personas de la conversación'
+z.string.es.system_notification_member_leave_removed_one = '%@.first_name eliminó a %s.first_name de la conversación'
+z.string.es.system_notification_ping = 'Hizo ping'
+z.string.es.system_notification_reaction = '%reaction su mensaje'
+z.string.es.system_notification_shared_audio = 'Compartió un mensaje de audio'
+z.string.es.system_notification_shared_file = 'Compartió un archivo'
+z.string.es.system_notification_shared_location = 'Compartió una ubicación'
+z.string.es.system_notification_shared_video = 'Compartió un video'
+z.string.es.system_notification_voice_channel_activate = 'Llamando'
+z.string.es.system_notification_voice_channel_deactivate = 'Llamó'
+
+# Tooltips
+z.string.es.tooltip_conversation_all_verified = 'Todas las huellas digitales están verificadas'
+z.string.es.tooltip_conversation_call = 'Llamar'
+z.string.es.tooltip_conversation_ephemeral = 'Mensaje temporizado'
+z.string.es.tooltip_conversation_file = 'Añadir archivo'
+z.string.es.tooltip_conversation_input_placeholder = 'Escriba un mensaje'
+z.string.es.tooltip_conversation_people = 'Personas (%shortcut)'
+z.string.es.tooltip_conversation_picture = 'Añadir imagen'
+z.string.es.tooltip_conversation_ping = 'Ping (%shortcut)'
+z.string.es.tooltip_conversation_video_call = 'Videollamada'
+
+z.string.es.tooltip_conversations_archive = 'Archivo (%shortcut)'
+z.string.es.tooltip_conversations_archived = 'Mostrar archivo (%no)'
+z.string.es.tooltip_conversations_more = 'Más'
+z.string.es.tooltip_conversations_notify = 'Activar sónido (%shortcut)'
+z.string.es.tooltip_conversations_silence = 'Silenciar (%shortcut)'
+z.string.es.tooltip_conversations_tooltip_start = 'Empezar una conversación (%shortcut)'
+
+z.string.es.tooltip_people_add = 'Añadir personas a la conversación (%shortcut)'
+z.string.es.tooltip_people_back = 'Atrás'
+z.string.es.tooltip_people_block = 'Bloquear'
+z.string.es.tooltip_people_connect = 'Conectar'
+z.string.es.tooltip_people_leave = 'Dejar la conversación'
+z.string.es.tooltip_people_open = 'Abrir conversación'
+z.string.es.tooltip_people_profile = 'Abrir tu perfil'
+z.string.es.tooltip_people_rename = 'Cambiar nombre de la conversación'
+z.string.es.tooltip_people_remove = 'Eliminar de la conversación'
+z.string.es.tooltip_people_unblock = 'Desbloquear'
+
+z.string.es.tooltip_preferences_contacts_gmail = 'Iniciar sesión en tu cuenta de Gmail para compartir los contactos'
+z.string.es.tooltip_preferences_contacts_macos = 'Compartir todos tus contactos desde la aplicación de Contactos de macOS'
+z.string.es.tooltip_preferences_password = 'Abrir otra página web para restablecer su contraseña'
+z.string.es.tooltip_preferences_picture = 'Cambiar tu foto…'
+z.string.es.tooltip_preferences_rename = 'Cambiar tu nombre'
+
+z.string.es.tooltip_search_close = 'Cerrar (Esc)'
+
+# App loading
+z.string.es.init_received_access_token = 'Acceso permitido'
+z.string.es.init_received_self_user = 'Hola, %name.'
+z.string.es.init_sessions_expectation = 'Tenemos que iniciar %sessions sesiones'
+z.string.es.init_sessions_expectation_long = 'Tenemos que iniciar %sessions sesiones'
+z.string.es.init_sessions_progress = 'Iniciando sesiones - %progreso %total'
+z.string.es.init_initialized_storage = 'Sesiones cargadas'
+z.string.es.init_initialized_cryptography = 'La criptografía ha sido completamente establecida'
+z.string.es.init_validated_client = 'Cargando tus conexiones y tus conversaciones'
+z.string.es.init_received_user_data = 'Buscando mensajes nuevos'
+z.string.es.init_events_expectation = 'Tienes %events mensajes nuevos'
+z.string.es.init_events_expectation_long = 'Cargando %events nuevos mensajes'
+z.string.es.init_events_progress = 'Cargando mensajes - %progreso %total'
+z.string.es.init_updated_from_notifications = 'Ya casi terminamos'
+z.string.es.init_app_pre_loaded = 'Disfruta de Wire'
+
+z.string.es.ephememal_units_second = 'segundo'
+z.string.es.ephememal_units_seconds = 'segundos'
+z.string.es.ephememal_units_minute = 'minuto'
+z.string.es.ephememal_units_minutes = 'minutos'
+z.string.es.ephememal_units_day = 'día'
+z.string.es.ephememal_units_days = 'días'
diff --git a/app/script/localization/strings-fi.coffee b/app/script/localization/strings-fi.coffee
new file mode 100644
index 00000000000..cdfdfbdb62a
--- /dev/null
+++ b/app/script/localization/strings-fi.coffee
@@ -0,0 +1,581 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+#General terms
+z.string.fi.wire_macos = 'Wire macOS: lle'
+z.string.fi.wire_windows = 'Wire Windowsille'
+z.string.fi.wire_linux = 'Wire Linuxille'
+z.string.fi.nonexistent_user = 'Poistettu käyttäjä'
+z.string.fi.and = 'ja'
+
+# Alert view when trying to set a profile image that's too small
+z.string.fi.alert_upload_file_format = 'Kuvaa ei voi käyttää. Valitse PNG- tai JPEG-tiedosto.'
+z.string.fi.alert_upload_too_small = 'Kuvaa ei voi käyttää. Valitse kuva, jonka koko on vähintään 320 X 320 pikseliä.'
+z.string.fi.alert_upload_too_large = 'Kuva on liian suuri. Voit ladata maksimissaan %no MB kokoisia kuvia.'
+z.string.fi.alert_gif_too_large = 'Animaatio on liian suuri. Maksimi koko on %no MB.'
+
+# Auth
+# Authentication: ACCOUNT section
+z.string.fi.auth_account_country_code = 'Maakoodi'
+z.string.fi.auth_account_create = 'Luo'
+z.string.fi.auth_account_create_account = 'Luo käyttäjätili'
+z.string.fi.auth_account_expiration = 'Sinut kirjattiin ulos, koska istuntosi päättyi. Kirjaudu sisään uudelleen.'
+z.string.fi.auth_account_get_wire = 'Yksinkertainen, privaatti ja turvallinen pikaviestin chattailuun, puheluihin sekä muun muassa kuvien, videoiden ja animaatioiden jakamiseen.'
+z.string.fi.auth_account_password_forgot = 'Unohdin salasanani'
+z.string.fi.auth_account_remember_me = 'Muista minut'
+z.string.fi.auth_account_sign_in = 'Kirjaudu sisään'
+z.string.fi.auth_account_sign_in_email = 'Sähköposti'
+z.string.fi.auth_account_sign_in_phone = 'Puhelinnumero'
+z.string.fi.auth_account_terms_of_use = 'Käyttöehdot'
+z.string.fi.auth_account_terms_of_use_detail = 'Hyväksyn'
+
+# Authentication: VERIFY section
+z.string.fi.auth_verify_account_add = 'Lisää'
+z.string.fi.auth_verify_account_detail = 'Tämä mahdollistaa Wiren käytön useilla laitteilla.'
+z.string.fi.auth_verify_account_headline = 'Lisää sähköpostiosoitteesi ja salasanasi.'
+z.string.fi.auth_verify_account_logout = 'Kirjaudu ulos'
+z.string.fi.auth_verify_code_description = 'Syötä vahvistuskoodi jonka lähetimme numeroon %@.'
+z.string.fi.auth_verify_code_resend = 'Eikö koodi ole tullut perille?'
+z.string.fi.auth_verify_code_resend_detail = 'Lähetä uudelleen'
+z.string.fi.auth_verify_code_resend_timer = 'Voit pyytää uuden koodin %expiration kuluttua.'
+z.string.fi.auth_verify_code_change_phone = 'Vaihda puhelinnumero'
+z.string.fi.auth_verify_password_headline = 'Kirjoita salasanasi'
+
+# Authentication: limit section
+z.string.fi.auth_limit_devices_headline = 'Laitteet'
+z.string.fi.auth_limit_description = 'Poista yksi laitteistasi aloittaaksesi Wiren käytön tässä laiteessa.'
+z.string.fi.auth_limit_button_manage = 'Hallitse laitteita'
+z.string.fi.auth_limit_button_sign_out = 'Kirjaudu ulos'
+z.string.fi.auth_limit_devices_current = '(Nykyinen)'
+
+# Authentication: limit section
+z.string.fi.auth_history_headline = 'Käytät Wireä ensimmäistä kertaa tällä laitteella.'
+z.string.fi.auth_history_description = 'Tietosuojasyistä keskusteluhistoriasi ei näy täällä.'
+z.string.fi.auth_history_button = 'OK'
+
+# Authentication: POSTED section
+z.string.fi.auth_posted_change_email = 'Vaihda sähköpostiosoite'
+z.string.fi.auth_posted_offline_detail = 'Tarkista internet-yhteytesi ja yritä uudelleen.'
+z.string.fi.auth_posted_offline_headline = 'Wire on mukavampi internettiin kytkettynä.'
+z.string.fi.auth_posted_pending_detail = 'Tarkista sähköpostisi saapuneet-kansio tai lähetä aktivointiviesti uudelleen.'
+z.string.fi.auth_posted_pending_headline = 'Tili on jo vireillä'
+z.string.fi.auth_posted_resend = 'Lähetä uudelleen sähköpostiosoitteeseen: %email'
+z.string.fi.auth_posted_resend_action = 'Eikö sähköposti saavu perille?'
+z.string.fi.auth_posted_resend_detail = 'Tarkista sähköpostisi saapuneet-kansio ja seuraa ohjeita.'
+z.string.fi.auth_posted_resend_headline = 'Sinulle on sähköpostia.'
+z.string.fi.auth_posted_retry = 'Yritä uudelleen ja lähetä sähköpostia osoitteeseen %email'
+z.string.fi.auth_posted_retry_action = 'Yritä uudelleen?'
+z.string.fi.auth_posted_retry_detail = 'Ole hyvä ja yritä uudelleen.'
+z.string.fi.auth_posted_retry_headline = 'Jokin meni pieleen'
+z.string.fi.auth_posted_verify_later = 'Vahvista myöhemmin'
+
+#Authentication: Misc
+z.string.fi.auth_placeholder_email = 'Sähköposti'
+z.string.fi.auth_placeholder_name = 'Nimi'
+z.string.fi.auth_placeholder_password_put = 'Salasana'
+z.string.fi.auth_placeholder_password_set = 'Salasana (vähintään 8 merkkiä pitkä)'
+z.string.fi.auth_placeholder_phone = 'Puhelinnumero'
+
+# Authentication: Validation errors
+z.string.fi.auth_error_code = 'Virheellinen koodi'
+z.string.fi.auth_error_country_code_invalid = 'Maakoodi ei kelpaa'
+z.string.fi.auth_error_email_exists = 'Tälle sähköpostille on jo luotu tunnus'
+z.string.fi.auth_error_email_forbidden = 'Valitettavasti tämä sähköpostiosoite on kielletty.'
+z.string.fi.auth_error_email_malformed = 'Kirjoita voimassa oleva sähköpostiosoite.'
+z.string.fi.auth_error_email_missing = 'Kirjoita sähköpostiosoite.'
+z.string.fi.auth_error_misc = 'Ongelmia yhteyden kanssa. Yritä uudelleen.'
+z.string.fi.auth_error_name_short = 'Kirjoita nimi, jossa on vähintään 2 merkkiä'
+z.string.fi.auth_error_offline = 'Ei internet-yhteyttä'
+z.string.fi.auth_error_password_short = 'Valitse salasana, jossa on vähintään 8 merkkiä.'
+z.string.fi.auth_error_password_wrong = 'Väärä salasana. Yritä uudelleen.'
+z.string.fi.auth_error_phone_number_forbidden = 'Valitettavasti tämä puhelinnumero on kielletty.'
+z.string.fi.auth_error_phone_number_invalid = 'Virheellinen puhelinnumero'
+z.string.fi.auth_error_phone_number_unknown = 'Tuntematon puhelinnumero'
+z.string.fi.auth_error_sign_in = 'Vahvista tietosi ja yritä uudelleen.'
+
+# Call stuff
+z.string.fi.call_state_outgoing = 'Soi…'
+z.string.fi.call_state_connecting = 'Yhdistetään…'
+z.string.fi.call_state_incoming = 'Soitetaan…'
+z.string.fi.call_decline = 'Kieltäydy'
+z.string.fi.call_accept = 'Hyväksy'
+z.string.fi.call_join = 'Liity'
+z.string.fi.call_choose_shared_screen = 'Valitse näyttö jonka haluat jakaa'
+
+# Warnings
+z.string.fi.modal_button_cancel = 'Peruuta'
+z.string.fi.modal_button_ok = 'Ok'
+z.string.fi.modal_button_send = 'Lähetä'
+
+# Block a user
+z.string.fi.modal_block_conversation_headline = 'Estä %@.name?'
+z.string.fi.modal_block_conversation_message = '%@.name ei pysty ottamaan sinuun yhteyttä tai kutsumaan sinua ryhmäkeskusteluihin.'
+z.string.fi.modal_block_conversation_button = 'Estä'
+# Cannot create the call because there is nobody to call (conversation_empty)
+z.string.fi.modal_call_conversation_empty_headline = 'Ei ketään kelle soittaa'
+z.string.fi.modal_call_conversation_empty_message = 'Täällä ei ole ketään jäljellä.'
+# Cannot create the call because there are too many participants (conversation_full)
+z.string.fi.modal_call_conversation_full_headline = 'Liian monta ihmistä puheluun'
+z.string.fi.modal_call_conversation_full_message = 'Puhelut toimivat maksimissaan %no keskustelussa.'
+# Cannot video call in group conversations
+z.string.fi.modal_call_no_video_in_group_headline = 'Ei videopuheluja ryhmissä'
+z.string.fi.modal_call_no_video_in_group_message = 'Videopuhelut eivät ole saatavilla ryhmäkeskusteluissa.'
+# Second incoming call
+z.string.fi.modal_call_second_incoming_headline = 'Vastaatko puheluun?'
+z.string.fi.modal_call_second_incoming_message = 'Sinun tämänhetkinen puhelu päättyy.'
+z.string.fi.modal_call_second_incoming_action = 'Vastaa'
+# Second ongoing call
+z.string.fi.modal_call_second_ongoing_headline = 'Katkaise puhelu toisessa laitteessa?'
+z.string.fi.modal_call_second_ongoing_message = 'Voit olla vain yhdessä puhelussa kerrallaan.'
+z.string.fi.modal_call_second_ongoing_action = 'Katkaise puhelu'
+# Second outgoing call
+z.string.fi.modal_call_second_outgoing_headline = 'Katkaise nykyinen puhelu?'
+z.string.fi.modal_call_second_outgoing_message = 'Voit olla vain yhdessä puhelussa kerrallaan.'
+z.string.fi.modal_call_second_outgoing_action = 'Katkaise puhelu'
+# Cannot join the call because there are too many participants (voice_channel_full)
+z.string.fi.modal_call_voice_channel_full_headline = 'Kaikki puhelukanavat varattuja'
+z.string.fi.modal_call_voice_channel_full_message = 'Täällä on tilaa vain %no ihmiselle.'
+# Clear a conversation
+z.string.fi.modal_clear_conversation_headline = 'Poista "%@.name":n sisältö?'
+z.string.fi.modal_clear_conversation_message = 'Tämä tyhjentää keskusteluhistorian ja poistaa sen luettelostasi.'
+z.string.fi.modal_clear_conversation_option = 'Poistu myös keskustelusta'
+z.string.fi.modal_clear_conversation_button = 'Poista'
+# Connected device
+z.string.fi.modal_connected_device_headline = 'Tiliäsi käytettiin:'
+z.string.fi.modal_connected_device_from = 'Laite:'
+z.string.fi.modal_connected_device_message = 'Jos et tehnyt tätä, poista laite ja vaihda salasanasi.'
+z.string.fi.modal_connected_device_manage_devices = 'hallitse laitteita'
+# Delete account
+z.string.fi.modal_delete_account_action = 'Poista'
+z.string.fi.modal_delete_account_headline = 'Poista tili'
+z.string.fi.modal_delete_account_message = 'Lähetämme viestin sähköpostina tai tekstiviestinä. Paina viestissä olevaa linkkiä poistaaksesi tilisi lopullisesti.'
+# Delete message
+z.string.fi.modal_delete_button = 'Poista'
+z.string.fi.modal_delete_headline = 'Poista ainoastaan minulta?'
+z.string.fi.modal_delete_message = 'Tätä ei voi perua.'
+# Delete message
+z.string.fi.modal_delete_everyone_button = 'Poista'
+z.string.fi.modal_delete_everyone_headline = 'Poista kaikilta?'
+z.string.fi.modal_delete_everyone_message = 'Tätä ei voi perua.'
+# Too long message
+z.string.fi.modal_too_long_headline = 'Viesti on liian pitkä'
+z.string.fi.modal_too_long_message = 'Voit lähettää viestejä joissa on maksimissaan %no merkkiä.'
+# Leave a conversation
+z.string.fi.modal_leave_conversation_headline = 'Poistu "%@.name" -keskustelusta?'
+z.string.fi.modal_leave_conversation_message = 'Osallistujille ilmoitetaan ja keskustelu poistetaan listastasi.'
+z.string.fi.modal_leave_conversation_button = 'Poistu'
+# Logout
+z.string.fi.modal_logout_headline = 'Tyhjennä tiedot?'
+z.string.fi.modal_logout_message = 'Poista kaikki henkilökohtaiset tiedot ja keskustelut tästä laitteesta.'
+z.string.fi.modal_logout_button = 'Kirjaudu ulos'
+# New device
+z.string.fi.modal_new_device_headline = '"%@.name" aloitti käyttämään uutta laitetta'
+z.string.fi.modal_new_device_message = 'Haluatko vielä silti lähettää viestisi?'
+z.string.fi.modal_new_device_show_device = 'näytä laite'
+z.string.fi.modal_new_device_send_anyway = 'lähetä siitä huolimatta'
+# Remove device
+z.string.fi.modal_remove_device_button = 'Poista laite'
+z.string.fi.modal_remove_device_headline = 'Poista "%device_name"'
+z.string.fi.modal_remove_device_message = 'Sinun täytyy kirjoittaa salasanasi poistaaksesi laitteen.'
+# Session Reset
+z.string.fi.modal_session_reset_headline = 'Istunto on nollattu'
+z.string.fi.modal_session_reset_message_1 = 'Jos ongelma ei ole ratkennut'
+z.string.fi.modal_session_reset_message_link = 'ota yhteys'
+z.string.fi.modal_session_reset_message_2 = 'meihin.'
+# Too many members in conversation
+z.string.fi.modal_too_many_members_headline = 'Talo täynnä'
+z.string.fi.modal_too_many_members_message = 'Maksimissaan %max henkilöä voi liittyä keskusteluun. Tässä keskustelussa on tilaa %no hengelle.'
+# Whitelist screensharing
+z.string.fi.modal_whitelist_screensharing_headline = 'Wire tarvitsee luvan jakaa näyttösi'
+z.string.fi.modal_whitelist_screensharing_message_1 = 'Avaa about:config ja lisää *.wire.com näytön jakamisen sallivaan verkkotunnus-listaan'
+z.string.fi.modal_whitelist_screensharing_message_link = 'UKK'
+z.string.fi.modal_whitelist_screensharing_message_2 = 'lisätiedoille.'
+# Parallel uploads
+z.string.fi.modal_uploads_parallel = 'Voit lähettää jopa %no tiedostoa samaan aikaan.'
+
+# Connection requests
+z.string.fi.connection_request_connect = 'Yhdistä'
+z.string.fi.connection_request_ignore = 'Hylkää'
+z.string.fi.connection_request_message = 'Hei %@.first_name, Lisää minut kontakteihisi Wire:ssä. %s.first_name'
+
+# Conversation
+z.string.fi.conversation_you_nominative = 'sinä'
+z.string.fi.conversation_you_dative = 'sinä'
+z.string.fi.conversation_you_accusative = 'sinä'
+
+z.string.fi.conversation_connection_accepted = 'Yhdistetty'
+z.string.fi.conversation_connection_blocked = 'Estetty'
+z.string.fi.conversation_connection_cancel_request = 'Peruuta yhteyspyyntö'
+z.string.fi.conversation_create = ' aloitti keskustelun %@names kanssa'
+z.string.fi.conversation_create_you = ' aloitti keskustelun %@names kanssa'
+z.string.fi.conversation_device_started_using = ' aloitettiin käyttämään'
+z.string.fi.conversation_device_started_using_you = ' aloitettiin käyttämään'
+z.string.fi.conversation_device_unverified = ' vahvistamattomia yksi'
+z.string.fi.conversation_device_your_devices = ' sinun laitteet'
+z.string.fi.conversation_device_user_devices = ' %@name n laitteet'
+z.string.fi.conversation_device_a_new_device = ' uusi laite'
+z.string.fi.conversation_just_now = 'Juuri nyt'
+z.string.fi.conversation_location_link = 'Avaa kartta'
+z.string.fi.conversation_member_join = ' lisättiin %@names'
+z.string.fi.conversation_member_join_you = ' lisätty %@names'
+z.string.fi.conversation_member_leave_left = ' on lähtenyt'
+z.string.fi.conversation_member_leave_left_you = ' on lähtenyt'
+z.string.fi.conversation_member_leave_removed = ' poistettu %@names'
+z.string.fi.conversation_member_leave_removed_you = ' poistit %@names'
+z.string.fi.conversation_message_delivered = 'Toimitettu'
+z.string.fi.conversation_rename = ' keskustelun nimi vaihdettu'
+z.string.fi.conversation_rename_you = ' keskustelun nimi vaihdettu'
+z.string.fi.conversation_resume = 'Aloita keskustelu %@names n kanssa'
+z.string.fi.conversation_ping = ' pinggasi'
+z.string.fi.conversation_ping_you = ' pinggasit'
+z.string.fi.conversation_today = 'tänään'
+z.string.fi.conversation_verified = 'Vahvistettu'
+z.string.fi.conversation_voice_channel_deactivate = ' soitti'
+z.string.fi.conversation_voice_channel_deactivate_you = ' soitti'
+z.string.fi.conversation_yesterday = 'Eilen'
+z.string.fi.conversation_unable_to_decrypt_1 = '%@name n viesti ei tullut perille.'
+z.string.fi.conversation_unable_to_decrypt_2 = '%@name n laitteen identiteetti muuttui. Perilletoimittamaton viesti.'
+z.string.fi.conversation_unable_to_decrypt_link = 'Miksi?'
+z.string.fi.conversation_unable_to_decrypt_error_message = 'Virhe'
+z.string.fi.conversation_unable_to_decrypt_reset_session = 'Nollaa istunto'
+z.string.fi.conversation_asset_uploading = 'Lähetetään…'
+z.string.fi.conversation_asset_downloading = 'Ladataan…'
+z.string.fi.conversation_asset_upload_failed = 'Lähetys epäonnistui'
+z.string.fi.conversation_asset_upload_too_large = 'Voit lähettää maksimissaan %no kokoisia tiedostoja'
+z.string.fi.conversation_playback_error = 'Toisto epäonnistui'
+z.string.fi.conversation_context_menu_edit = 'Muokkaa'
+z.string.fi.conversation_context_menu_delete = 'Poista minulta'
+z.string.fi.conversation_context_menu_delete_everyone = 'Poista kaikilta'
+z.string.fi.conversation_context_menu_download = 'Lataa'
+z.string.fi.conversation_context_menu_like = 'Tykkää'
+z.string.fi.conversation_context_menu_unlike = 'Poista tykkäys'
+z.string.fi.conversation_delete_timestamp = 'Poistettu %@timestamp'
+z.string.fi.conversation_edit_timestamp = 'Muokattu %@timestamp'
+z.string.fi.conversation_likes_caption = '%@number henkeä'
+
+# Archive
+z.string.fi.archive_header = 'Arkistoi'
+
+# Conversations
+z.string.fi.conversations_all_archived = 'Kaikki arkistoitu'
+z.string.fi.conversations_contacts = 'Yhteystiedot'
+z.string.fi.conversations_connection_request_many = '%no ihmisiä odottaa'
+z.string.fi.conversations_connection_request_one = '1 ihminen odottaa'
+z.string.fi.conversations_empty_conversation = 'Tyhjä keskustelu'
+z.string.fi.conversations_no_conversations = 'Aloita keskustelu tai kutsu ihmisiä liittymään keskusteluun.'
+z.string.fi.conversations_popover_archive = 'Arkistoi'
+z.string.fi.conversations_popover_block = 'Estä'
+z.string.fi.conversations_popover_cancel = 'Peru pyyntö'
+z.string.fi.conversations_popover_clear = 'Poista'
+z.string.fi.conversations_popover_leave = 'Poistu'
+z.string.fi.conversations_popover_notify = 'Poista mykistys'
+z.string.fi.conversations_popover_silence = 'Mykistä'
+z.string.fi.conversations_popover_unarchive = 'Palauta arkistosta'
+
+# Invites
+z.string.fi.invite_meta_key_mac = 'Cmd'
+z.string.fi.invite_meta_key_pc = 'Ctrl'
+z.string.fi.invite_hint_selected = 'Paina %meta_key + C kopioidaksesi'
+z.string.fi.invite_hint_unselected = 'Valitse ja paina %meta_key + C'
+z.string.fi.invite_detail = 'Linkkiä voidaan käyttää 2 viikkoa.'
+z.string.fi.invite_headline = 'Kutsu ihmisiä Wireen'
+z.string.fi.invite_message = 'Olen Wiressä. Etsi %mail tai mene osoitteeseen https://get.wire.com ottaaksesi yhteyden minuun.'
+z.string.fi.invite_message_no_email = 'Olen Wiressä. Mene osoitteeseen https://get.wire.com ottaaksesi yhteyttä minuun.'
+
+# Extensions
+z.string.fi.extensions_bubble_button_gif = 'Gif'
+
+# Extensions Giphy
+z.string.fi.extensions_giphy_button_ok = 'Lähetä'
+z.string.fi.extensions_giphy_button_more = 'Kokeile toista'
+z.string.fi.extensions_giphy_message = '%tag • giphy.com:in kautta'
+z.string.fi.extensions_giphy_no_gifs = 'Upsista, ei giffejä'
+z.string.fi.extensions_giphy_random = 'Satunnainen'
+
+# People View
+z.string.fi.search_open = 'Avaa'
+z.string.fi.search_open_group = 'Luo Ryhmä'
+z.string.fi.people_confirm_label = 'Lisää keskusteluun'
+z.string.fi.people_common_contacts = 'Te molemmat tunnette'
+z.string.fi.people_people = '%no Ihmistä'
+z.string.fi.people_search_placeholder = 'Hae nimellä'
+z.string.fi.people_everyone_participates = 'Jokainen jonka kanssa olet yhdistetty on jo tässä keskustelussa.'
+z.string.fi.people_no_matches = 'Ei vastaavia tuloksia. Yritä toisella nimellä.'
+z.string.fi.people_invite = 'Kutsu ihmisiä'
+z.string.fi.people_share = 'Jaa yhteystietoja'
+z.string.fi.people_bring_your_friends = 'Tuo ystäväsi Wireen'
+z.string.fi.people_invite_detail = 'Yhteystietojesi jakaminen auttaa sinua löytämään uusia kontakteja. Anonymisoimme kaiken tiedon ja emme jaa sitä ulkopuolisille.'
+z.string.fi.people_invite_button_contacts = 'Kontakteista'
+z.string.fi.people_invite_button_gmail = 'Gmailista'
+z.string.fi.people_invite_headline = 'Kutsu kavereitasi'
+z.string.fi.people_tabs_details = 'Lisätietoja'
+z.string.fi.people_tabs_devices = 'Laitteet'
+z.string.fi.people_tabs_devices_headline = 'Wire antaa jokaiselle laitteelle yksilöllisen sormenjäljen. Vertaa niitä %@.name kanssa ja vahvista keskustelusi.'
+z.string.fi.people_tabs_devices_why_verify = 'Miksi vahvistaa keskustelu?'
+z.string.fi.people_tabs_no_devices_headline = '%@.name käyttää vanhaa Wire-versiota. Laitteita ei näytetä täällä.'
+z.string.fi.people_tabs_device_detail_all_my_devices = 'Näytä kaikki laitteeni'
+z.string.fi.people_tabs_device_detail_device_fingerprint = 'Laitteen sormenjälki'
+z.string.fi.people_tabs_device_detail_headline = 'Vahvista että tämä vastaa sormenjälkeä joka näkyy %bold%@.name’s n laitteella%end.'
+z.string.fi.people_tabs_device_detail_how_to = 'Miten teen sen?'
+z.string.fi.people_tabs_device_detail_reset_session = 'Nollaa istunto'
+z.string.fi.people_tabs_device_detail_show_my_device = 'Näytä laitteeni sormenjälki'
+z.string.fi.people_tabs_device_detail_verified = 'Vahvistettu'
+
+# Block user
+z.string.fi.people_block_headline = 'Estä?'
+z.string.fi.people_block_message = '%@.first_name ei voi löytää sinua tai ottaa sinuun yhteyttä Wiressä.'
+
+# Accept a pending connection dialogue
+z.string.fi.people_connect_headline = 'Hyväksy?'
+z.string.fi.people_connect_message = 'Tämä yhdistää teidät ja avaa keskustelun %@.first_name kanssa.'
+
+# Cancel a pending request
+z.string.fi.people_cancel_request_headline = 'Peruuta pyyntö?'
+z.string.fi.people_cancel_request_message = 'Poista yhteyspyyntö %@.first_name:lle.'
+
+# Leave the conversation dialogue
+z.string.fi.people_leave_headline = 'Poistu keskustelusta?'
+z.string.fi.people_leave_message = 'Et pysty lähettämään tai vastaanottamaan viestejä tässä keskustelussa.'
+
+# Remove from conversation dialogue
+z.string.fi.people_remove_headline = 'Poista?'
+z.string.fi.people_remove_message = '%@.first_name ei pysty lähettämään tai vastaanottamaan viestejä tässä keskustelussa.'
+
+# Unblock user
+z.string.fi.people_unblock_headline = 'Poista esto?'
+z.string.fi.people_unblock_message = '%@.first_name pystyy taas etsimään ja ottamaan sinuun yheyttä Wiressä. Tulet myös vastaanottamaan viestit jotka hän lähetti ollessaan estettynä.'
+
+# Button labels for the actions
+z.string.fi.people_button_add = 'Lisää ihmisiä'
+z.string.fi.people_button_block = 'Estä'
+z.string.fi.people_button_cancel = 'Peruuta'
+z.string.fi.people_button_connect = 'Yhdistä'
+z.string.fi.people_button_create = 'Luo ryhmä'
+z.string.fi.people_button_ignore = 'Hylkää'
+z.string.fi.people_button_leave = 'Poistu'
+z.string.fi.people_button_open = 'Avaa keskustelu'
+z.string.fi.people_button_pending = 'Odottaa'
+z.string.fi.people_button_profile = 'Profiili'
+z.string.fi.people_button_remove = 'Poista'
+z.string.fi.people_button_unblock = 'Poista esto'
+z.string.fi.people_button_no = 'Ei'
+z.string.fi.people_button_yes = 'Kyllä'
+
+# Settings
+z.string.fi.preferences_about = 'Tietoja meistä'
+z.string.fi.preferences_account = 'Tili'
+z.string.fi.preferences_device_details = 'Laitteen yksityiskohdat'
+z.string.fi.preferences_devices = 'Laitteet'
+z.string.fi.preferences_headline = 'Asetukset'
+z.string.fi.preferences_options = 'Valinnat'
+
+z.string.fi.preferences_about_copyright = '© Wire Swiss GmbH'
+z.string.fi.preferences_about_privacy_policy = 'Yksityisyyskäytännöt'
+z.string.fi.preferences_about_support = 'Tuki'
+z.string.fi.preferences_about_support_website = 'Tuki sivusto'
+z.string.fi.preferences_about_support_contact = 'Ota yhteyttä tukeen'
+z.string.fi.preferences_about_terms_of_use = 'Käyttöehdot'
+z.string.fi.preferences_about_version = 'Versio %version'
+z.string.fi.preferences_about_website = 'Wiren verkkosivu'
+
+z.string.fi.preferences_account_reset_password = 'Vaihda salasana'
+z.string.fi.preferences_account_delete = 'Poista tili'
+z.string.fi.preferences_account_log_out = 'Kirjaudu ulos'
+z.string.fi.preferences_account_username_placeholder = 'Koko nimesi'
+
+z.string.fi.preferences_devices_activated_in = '%location: ssa'
+z.string.fi.preferences_devices_activated_on = 'Aktivoitu %time: ssa'
+z.string.fi.preferences_devices_active = 'Aktiivinen'
+z.string.fi.preferences_devices_active_detail = 'Jos et tunnista yllä olevaa laitetta, poista se ja vaihda salasanasi.'
+z.string.fi.preferences_devices_current = 'Nykyinen'
+z.string.fi.preferences_devices_fingerprint = 'Sormenjälki avain'
+z.string.fi.preferences_devices_fingerprint_detail = 'Wire antaa jokaiselle laitteelle yksilöllisen sormenjäljen. Vertaa niitä ja varmenna laitteesi ja keskustelusi.'
+z.string.fi.preferences_devices_id = 'ID: '
+z.string.fi.preferences_devices_remove = 'Poista'
+z.string.fi.preferences_devices_remove_cancel = 'Peruuta'
+z.string.fi.preferences_devices_remove_detail = 'Poista tämä laite jos olet lopettanut sen käyttämisen. Viestihistoriasi poistetaan siitä laitteesta ja sinut kirjataan ulos.'
+z.string.fi.preferences_devices_session_confirmation = 'Istunto on nollattu.'
+z.string.fi.preferences_devices_session_detail = 'Jos sormenjäljet eivät täsmää, nollaa istunto luodaksesi uudet salausavaimet molemmille osapuolille.'
+z.string.fi.preferences_devices_session_reset = 'Nollaa istunto'
+z.string.fi.preferences_devices_session_ongoing = 'Nollataan istuntoa…'
+z.string.fi.preferences_devices_verification = 'Vahvistettu'
+
+z.string.fi.preferences_options_contacts = 'Yhteystiedot'
+z.string.fi.preferences_options_contacts_gmail = 'Tuo Gmailista'
+z.string.fi.preferences_options_contacts_macos = 'Tuo Yhteystiedoista'
+z.string.fi.preferences_options_contacts_detail = 'Käytämme sinun kontaktitietoja yhdistääksemme sinut muiden kanssa. Anonymisoimme kaiken tiedon ja emme jaa sitä ulkopuolisille.'
+z.string.fi.preferences_options_data = 'Käyttö- ja vikaraportit'
+z.string.fi.preferences_options_data_checkbox = 'Käyttö- ja vikaraportit'
+z.string.fi.preferences_options_data_detail = 'Tee Wirestä parempi lähetämällä anonyymiä tietoa.'
+z.string.fi.preferences_options_sound = 'Äänimerkit'
+z.string.fi.preferences_options_sound_all = 'Kaikki'
+z.string.fi.preferences_options_sound_all_detail = 'Kaikki äänet'
+z.string.fi.preferences_options_sound_none = 'Ei mitään'
+z.string.fi.preferences_options_sound_none_detail = 'Sshhh!'
+z.string.fi.preferences_options_sound_some = 'Jotain'
+z.string.fi.preferences_options_sound_some_detail = 'Pingit ja puhelut'
+
+# Search
+z.string.fi.search_group_hint = 'Jatka kirjoittamista tai valitse lisää ihmisiä luodaksesi ryhmän'
+z.string.fi.search_connect = 'Yhdistä'
+z.string.fi.search_connections = 'Yhteydet'
+z.string.fi.search_groups = 'Ryhmät'
+z.string.fi.search_placeholder = 'Etsi nimellä tai sähköpostiosoitteella'
+z.string.fi.search_top_people = 'Eniten käytetyt kontaktit'
+z.string.fi.search_try_search = 'Etsi ihmisiä nimellä tai sähköpostiosoitteella'
+z.string.fi.search_no_contacts_on_wire = 'Sinulla ei ole kontakteja Wiressä. Yritä etsiä ihmisiä nimellä tai sähköpostiosoitteella'
+z.string.fi.search_others = 'Yhdistä'
+z.string.fi.search_suggestion_one = 'Tuntee %@.first_name'
+z.string.fi.search_suggestion_two = 'Tuntee %@.first_name ja %@.other_name'
+z.string.fi.search_suggestion_many = 'Tuntee %@.first_name ja %no muita'
+
+# Picture upload
+z.string.fi.upload_welcome = 'Wire on niin paljon mukavampi kuvalla.'
+z.string.fi.upload_welcome_keep = 'pidä tämä'
+z.string.fi.upload_welcome_choose = 'valitse omasi'
+
+# Google contacts upload
+z.string.fi.upload_google_headline = 'Etsi ihmisiä joiden kanssa jutella.'
+z.string.fi.upload_google_message = 'Käytämme sinun kontaktitietoja yhdistääksemme sinut muiden kanssa. Anonymisoimme kaiken tiedon ja emme jaa sitä ulkopuolisille.'
+z.string.fi.upload_google_headline_error = 'Jotain meni pieleen.'
+z.string.fi.upload_google_message_error = 'Emme vastaanottaneet tietojasi. Ole hyvä ja yritä tuoda kontaktisi uudelleen.'
+z.string.fi.upload_google_button_again = 'Yritä uudelleen'
+
+# URLs
+z.string.fi.url_password_reset = 'https://wire.com/forgot/'
+z.string.fi.url_legal = 'https://wire.com/legal/'
+z.string.fi.url_privacy = 'https://wire.com/privacy/'
+z.string.fi.url_privacy_why = 'https://wire.com/privacy/why/'
+z.string.fi.url_support = 'https://support.wire.com'
+z.string.fi.url_terms_of_use = 'https://wire.com/legal/terms/'
+z.string.fi.url_wire = 'https://wire.com'
+z.string.fi.url_wire_for_web = 'https://app.wire.com'
+z.string.fi.url_support_calling = 'https://support.wire.com/hc/en-us/articles/202969412'
+z.string.fi.url_support_camera_access_denied = 'https://support.wire.com/hc/en-us/articles/202935412'
+z.string.fi.url_support_contact = 'https://support.wire.com/hc/en-us/requests/new'
+z.string.fi.url_support_contact_bug = 'https://support.wire.com/hc/en-us/requests/new?ticket_form_id=101615'
+z.string.fi.url_support_history = 'https://support.wire.com/hc/en-us/articles/207834645'
+z.string.fi.url_support_mic_access_denied = 'https://support.wire.com/hc/en-us/articles/202590081'
+z.string.fi.url_support_mic_not_found = 'https://support.wire.com/hc/en-us/articles/202970662'
+z.string.fi.url_support_screen_access_denied = 'https://support.wire.com/hc/en-us/articles/202935412'
+z.string.fi.url_support_screen_whitelist = 'https://support.wire.com/hc/en-us/articles/209423889'
+z.string.fi.url_decrypt_error_1 = 'https://wire.com/privacy/error-1'
+z.string.fi.url_decrypt_error_2 = 'https://wire.com/privacy/error-2'
+
+# Warnings: Permission requests & permission callbacks
+z.string.fi.warning_call_detail = 'Selaimellasi täytyy olla käyttöoikeus mikrofoniisi voidaksesi käydä puhelinkeskusteluja.'
+z.string.fi.warning_call_headline = 'Et voi käydä puhelinkeskusteluja ilman mikrofonia'
+z.string.fi.warning_call_unsupported_incoming = '%s.first_name soittaa. Selaimesi ei tue puheluja.'
+z.string.fi.warning_call_unsupported_outgoing = 'Et voi soittaa puhelua koska selaimesi ei tue puheluja.'
+z.string.fi.warning_call_issues = 'Tämä versio Wirestä ei pysty osallistumaan puheluun. Käytä'
+z.string.fi.warning_call_upgrade_browser = 'Soittaaksesi puhelun, päivitä Google Chrome.'
+z.string.fi.warning_learn_more = 'Lue lisää'
+z.string.fi.warning_not_found_camera = 'Et voi soittaa puhelua koska tietokoneessasi ei ole kameraa.'
+z.string.fi.warning_not_found_microphone = 'Et voi soittaa puhelua koska tietokoneessasi ei ole mikrofonia.'
+z.string.fi.warning_permission_denied_camera = 'Et voi soittaa puhelua koska selaimellasi ei ole oikeutta käyttä kameraa.'
+z.string.fi.warning_permission_denied_microphone = 'Et voi soittaa puhelua koska selaimellasi ei ole oikeuta käyttää mikrofonia.'
+z.string.fi.warning_permission_denied_screen = 'Et voi jakaa näyttöäsi koska selaimella ei ole oikeutta siihen.'
+z.string.fi.warning_permission_request_camera = '%icon Anna käyttöoikeus kameraan'
+z.string.fi.warning_permission_request_microphone = '%icon Anna käyttöoikeus mikrofoniin'
+z.string.fi.warning_permission_request_notification = '%icon Salli ilmoitukset'
+z.string.fi.warning_permission_request_screen = '%icon Salli näytön käyttö'
+z.string.fi.warning_tell_me_how = 'Kerro miten'
+
+# Warnings: Connectivity
+z.string.fi.warning_connectivity_connection_lost = 'Yritetään yhdistää. Wire ei mahdollisesti pysty toimitttamaan viestejä perille.'
+z.string.fi.warning_connectivity_no_internet = 'Ei Internetiä. Et pysty lähettämään tai vastaanottamaan viestejä.'
+
+# Browser notifications
+z.string.fi.system_notification_asset_add = 'Jakoi kuvan'
+z.string.fi.system_notification_connection_accepted = 'Hyväksyi yhteyspyyntösi'
+z.string.fi.system_notification_connection_request = 'Haluaa luoda kontaktin'
+z.string.fi.system_notification_conversation_create = '%s.first_name aloitti keskustelun'
+z.string.fi.system_notification_conversation_rename = '%s.first_name nimesi keskustelun uudelleen %nameksi'
+z.string.fi.system_notification_member_join_many = '%s.first_name lisäsi %no ihmistä keskusteluun'
+z.string.fi.system_notification_member_join_one = '%s.first_name lisäsi %@.first_namen keskusteluun'
+z.string.fi.system_notification_member_leave_left = '%s.first_name poistui keskustelusta'
+z.string.fi.system_notification_member_leave_removed_many = '%s.first_name poisti %no ihmistä keskustelusta'
+z.string.fi.system_notification_member_leave_removed_one = '%s.first_name poisti %@.first_namen keskustelusta'
+z.string.fi.system_notification_ping = 'Pinggasi'
+z.string.fi.system_notification_reaction = '%reaction sinun viesti'
+z.string.fi.system_notification_shared_audio = 'Jakoi ääniviestin'
+z.string.fi.system_notification_shared_file = 'Jakoi tiedoston'
+z.string.fi.system_notification_shared_location = 'Jakoi sijainnin'
+z.string.fi.system_notification_shared_video = 'Jakoi videon'
+z.string.fi.system_notification_voice_channel_activate = 'Soittaa'
+z.string.fi.system_notification_voice_channel_deactivate = 'Soitti'
+
+# Tooltips
+z.string.fi.tooltip_conversation_all_verified = 'Kaikki sormenjäljet on vahvistettu'
+z.string.fi.tooltip_conversation_call = 'Puhelu'
+z.string.fi.tooltip_conversation_ephemeral = 'Ajoitettu viesti'
+z.string.fi.tooltip_conversation_file = 'Lisää tiedosto'
+z.string.fi.tooltip_conversation_input_placeholder = 'Kirjoita viesti'
+z.string.fi.tooltip_conversation_people = 'Ihmiset (%shortcut)'
+z.string.fi.tooltip_conversation_picture = 'Lisää kuva'
+z.string.fi.tooltip_conversation_ping = 'Pingaa (%shortcut)'
+z.string.fi.tooltip_conversation_video_call = 'Videopuhelu'
+
+z.string.fi.tooltip_conversations_archive = 'Arkisto (%shortcut)'
+z.string.fi.tooltip_conversations_archived = 'Näytä arkisto (%no)'
+z.string.fi.tooltip_conversations_more = 'Lisää'
+z.string.fi.tooltip_conversations_notify = 'Poist mykistys (%shortcut)'
+z.string.fi.tooltip_conversations_silence = 'Mykistä (%shortcut)'
+z.string.fi.tooltip_conversations_tooltip_start = 'Aloita keskustelu (%shortcut)'
+
+z.string.fi.tooltip_people_add = 'Lisää ihmisiä keskusteluun (%shortcut)'
+z.string.fi.tooltip_people_back = 'Takaisin'
+z.string.fi.tooltip_people_block = 'Estä'
+z.string.fi.tooltip_people_connect = 'Yhdistä'
+z.string.fi.tooltip_people_leave = 'Poistu keskustelusta'
+z.string.fi.tooltip_people_open = 'Avaa keskustelu'
+z.string.fi.tooltip_people_profile = 'Avaa profiilisi'
+z.string.fi.tooltip_people_rename = 'Muuta keskustelun nimeä'
+z.string.fi.tooltip_people_remove = 'Poista keskustelusta'
+z.string.fi.tooltip_people_unblock = 'Poista esto'
+
+z.string.fi.tooltip_preferences_contacts_gmail = 'Kirjaudu gmail-tilillesi jakaaksesi kontakteja'
+z.string.fi.tooltip_preferences_contacts_macos = 'Jaa kaikki yhteystietosi macOs Yhteystieto sovelluksesta'
+z.string.fi.tooltip_preferences_password = 'Avaa toinen nettisivu vaihtaaksesi salasanasi'
+z.string.fi.tooltip_preferences_picture = 'Vaihda kuvasi…'
+z.string.fi.tooltip_preferences_rename = 'Vaihda nimesi'
+
+z.string.fi.tooltip_search_close = 'Sulje (Esc)'
+
+# App loading
+z.string.fi.init_received_access_token = 'Pääsy sallittu'
+z.string.fi.init_received_self_user = 'He, %name.'
+z.string.fi.init_sessions_expectation = 'Meidän täytyy alustaa %sessions istuntoja'
+z.string.fi.init_sessions_expectation_long = 'Meidän täytyy alustaa %sessions istuntoja'
+z.string.fi.init_sessions_progress = 'Alustetaan istuntoja - %progress %total'
+z.string.fi.init_initialized_storage = 'Istunnot ladattu'
+z.string.fi.init_initialized_cryptography = 'Salaus on täysin määritetty'
+z.string.fi.init_validated_client = 'Ladataan yhteyksiäsi ja keskustelujasi'
+z.string.fi.init_received_user_data = 'Tarkistetaan uusia viestejä'
+z.string.fi.init_events_expectation = 'Sinulle on %events uutta viestiä'
+z.string.fi.init_events_expectation_long = 'Ladataan %events uutta viestiä'
+z.string.fi.init_events_progress = 'Ladataan viestejä: %progress %total'
+z.string.fi.init_updated_from_notifications = 'Olemme melkein perillä'
+z.string.fi.init_app_pre_loaded = 'Nauti Wirestä'
+
+z.string.fi.ephememal_units_second = 'sekunti'
+z.string.fi.ephememal_units_seconds = 'sekuntia'
+z.string.fi.ephememal_units_minute = 'minuutti'
+z.string.fi.ephememal_units_minutes = 'minuutia'
+z.string.fi.ephememal_units_day = 'päivä'
+z.string.fi.ephememal_units_days = 'päivää'
diff --git a/app/script/localization/strings-hr.coffee b/app/script/localization/strings-hr.coffee
new file mode 100644
index 00000000000..4c8efeb8706
--- /dev/null
+++ b/app/script/localization/strings-hr.coffee
@@ -0,0 +1,579 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+#General terms
+z.string.hr.wire_macos = 'Wire za macOS'
+z.string.hr.wire_windows = 'Wire za Windows'
+z.string.hr.wire_linux = 'Wire za Linux'
+z.string.hr.truncation = '…'
+z.string.hr.nonexistent_user = 'Izbrisani korisnik'
+z.string.hr.and = 'i'
+
+# Alert view when trying to set a profile image that's too small
+z.string.hr.alert_upload_file_format = 'Ne možete koristiti ovu sliku. Molimo izaberite PNG ili JPEG datoteku.'
+z.string.hr.alert_upload_too_small = 'Ne možete koristiti ovu sliku. Odaberite sliku koja je barem 320 x 320 px.'
+z.string.hr.alert_upload_too_large = 'Ova slika je prevelika. Možete učitati datoteke do %no MB.'
+z.string.hr.alert_gif_too_large = 'Animacija je prevelika. Maksimalne veličine je %no MB.'
+
+# Auth
+# Authentication: ACCOUNT section
+z.string.hr.auth_account_country_code = 'Pozivni broj'
+z.string.hr.auth_account_create = 'Stvori'
+z.string.hr.auth_account_create_account = 'Stvaranje računa'
+z.string.hr.auth_account_expiration = 'Odjavljeni ste jer je vaša sesija istekla. Molimo prijavite se ponovno.'
+z.string.hr.auth_account_get_wire = 'Jednostavan, privatan i siguran klijent za razgovor, pozive, dijeljenje slika, glazbe, videa, animacija i više.'
+z.string.hr.auth_account_password_forgot = 'Zaboravljena lozinka'
+z.string.hr.auth_account_remember_me = 'Zapamti me'
+z.string.hr.auth_account_sign_in = 'Prijava'
+z.string.hr.auth_account_sign_in_email = 'Email'
+z.string.hr.auth_account_sign_in_phone = 'Telefon'
+z.string.hr.auth_account_terms_of_use = 'Uvjeti korištenja'
+z.string.hr.auth_account_terms_of_use_detail = 'Prihvaćam'
+
+# Authentication: VERIFY section
+z.string.hr.auth_verify_account_add = 'Dodaj'
+z.string.hr.auth_verify_account_detail = 'Ovo Vam omogućuje da koristite Wire na više uređaja.'
+z.string.hr.auth_verify_account_headline = 'Dodajte email adresu i lozinku.'
+z.string.hr.auth_verify_account_logout = 'Odjava'
+z.string.hr.auth_verify_code_description = 'Unesite kontrolni kod koji smo poslali na %@number.'
+z.string.hr.auth_verify_code_resend = 'Kod se ne pojavljuje?'
+z.string.hr.auth_verify_code_resend_detail = 'Ponovno pošalji'
+z.string.hr.auth_verify_code_resend_timer = 'Možete zatražiti novi kod %expiration.'
+z.string.hr.auth_verify_code_change_phone = 'Promjeni broj telefona'
+z.string.hr.auth_verify_password_headline = 'Upišite Vašu šifru'
+
+# Authentication: limit section
+z.string.hr.auth_limit_devices_headline = 'Uređaji'
+z.string.hr.auth_limit_description = 'Uklonite jedan od Vaših ostalih uređaja kako bi ste počeli koristiti Wire na ovom.'
+z.string.hr.auth_limit_button_manage = 'Upravljanje uređajima'
+z.string.hr.auth_limit_button_sign_out = 'Odjava'
+z.string.hr.auth_limit_devices_current = '(Trenutno)'
+
+# Authentication: limit section
+z.string.hr.auth_history_headline = 'Ovo je prvi put da koristite Wire na ovom uređaju.'
+z.string.hr.auth_history_description = 'Iz sigurnosnih razloga, povijest razgovora se neće pojaviti ovdje.'
+z.string.hr.auth_history_button = 'U redu'
+
+# Authentication: POSTED section
+z.string.hr.auth_posted_change_email = 'Promijeni e-mail'
+z.string.hr.auth_posted_offline_detail = 'Provjerite internetsku vezu i pokušajte ponovno.'
+z.string.hr.auth_posted_offline_headline = 'Wire je ljepši sa internet vezom.'
+z.string.hr.auth_posted_pending_detail = 'Provjerite svoj poštanski sandučić, ili ponovite postupak aktivacije.'
+z.string.hr.auth_posted_pending_headline = 'Izrada računa još u tijeku'
+z.string.hr.auth_posted_resend = 'Ponovno pošalji na %email'
+z.string.hr.auth_posted_resend_action = 'Email se ne pojavljuje?'
+z.string.hr.auth_posted_resend_detail = 'Provjerite svoj email sandučić i slijedite upute.'
+z.string.hr.auth_posted_resend_headline = 'Imate poštu.'
+z.string.hr.auth_posted_retry = 'Ponovno pokušaj i pošalji mail na %email'
+z.string.hr.auth_posted_retry_action = 'Pokušaj ponovno?'
+z.string.hr.auth_posted_retry_detail = 'Molimo Vas da pokušate ponovno.'
+z.string.hr.auth_posted_retry_headline = 'Nešto je pošlo po zlu'
+z.string.hr.auth_posted_verify_later = 'Verificiraj kasnije'
+
+#Authentication: Misc
+z.string.hr.auth_placeholder_email = 'Email'
+z.string.hr.auth_placeholder_name = 'Ime'
+z.string.hr.auth_placeholder_password_put = 'Lozinka'
+z.string.hr.auth_placeholder_password_set = 'Lozinka (najmanje 8 znakova)'
+z.string.hr.auth_placeholder_phone = 'Telefonski broj'
+
+# Authentication: Validation errors
+z.string.hr.auth_error_code = 'Neispravan kod'
+z.string.hr.auth_error_country_code_invalid = 'Nevažeći kod države'
+z.string.hr.auth_error_email_exists = 'Email adresa je već u upotrebi'
+z.string.hr.auth_error_email_forbidden = 'Ova email adresa je zabranjena.'
+z.string.hr.auth_error_email_malformed = 'Molimo unesite ispravnu e-mail adresu.'
+z.string.hr.auth_error_email_missing = 'Molimo unesite email adresu.'
+z.string.hr.auth_error_misc = 'Problemi s vezom. Molimo pokušajte ponovo.'
+z.string.hr.auth_error_name_short = 'Unesite naziv s najmanje 2 znaka'
+z.string.hr.auth_error_offline = 'Nema internetske veze'
+z.string.hr.auth_error_password_short = 'Odaberite lozinku s najmanje 8 znakova.'
+z.string.hr.auth_error_password_wrong = 'Pogrešna lozinka, molimo pokušajte ponovno.'
+z.string.hr.auth_error_phone_number_forbidden = 'Ova email adresa je zabranjena.'
+z.string.hr.auth_error_phone_number_invalid = 'Nevažeći broj'
+z.string.hr.auth_error_phone_number_unknown = 'Nepoznat broj'
+z.string.hr.auth_error_sign_in = 'Molimo provjerite vaše podatke i pokušajte ponovno.'
+
+# Call stuff
+z.string.hr.call_state_outgoing = 'Zvoni...'
+z.string.hr.call_state_connecting = 'Povezivanje…'
+z.string.hr.call_state_incoming = 'Pozivanje…'
+z.string.hr.call_decline = 'Odbij'
+z.string.hr.call_accept = 'Prihvati'
+z.string.hr.call_join = 'Pridruži se'
+z.string.hr.call_choose_shared_screen = 'Odaberite zaslon za zajedničko korištenje'
+
+# Warnings
+z.string.hr.modal_button_cancel = 'Poništi'
+z.string.hr.modal_button_ok = 'Ok'
+z.string.hr.modal_button_send = 'Pošalji'
+
+# Block a user
+z.string.hr.modal_block_conversation_headline = 'Blokiraj %@.name?'
+z.string.hr.modal_block_conversation_message = '%@.name neće biti u mogućnosti kontaktirati vas ili vas pozvati u grupnu konverzaciju.'
+z.string.hr.modal_block_conversation_button = 'Blokiraj'
+# Cannot create the call because there is nobody to call (conversation_empty)
+z.string.hr.modal_call_conversation_empty_headline = 'Nemam koga zvati'
+z.string.hr.modal_call_conversation_empty_message = 'Nema osoba u konverzaciji.'
+# Cannot create the call because there are too many participants (conversation_full)
+z.string.hr.modal_call_conversation_full_headline = 'Previše ljudi za poziv'
+z.string.hr.modal_call_conversation_full_message = 'Pozive radi u razgovorima s %no ljudi.'
+# Cannot video call in group conversations
+z.string.hr.modal_call_no_video_in_group_headline = 'Nema video poziva u grupama'
+z.string.hr.modal_call_no_video_in_group_message = 'Video pozivi nisu dostupni u grupnim razgovorima.'
+# Second incoming call
+z.string.hr.modal_call_second_incoming_headline = 'Odgovoriti na poziv?'
+z.string.hr.modal_call_second_incoming_message = 'Vaš trenutni poziv će završiti.'
+z.string.hr.modal_call_second_incoming_action = 'Odgovori'
+# Second ongoing call
+z.string.hr.modal_call_second_ongoing_headline = 'Prekini poziv na drugom uređaju?'
+z.string.hr.modal_call_second_ongoing_message = 'Možete biti u samo jednom pozivu u isto vrijeme.'
+z.string.hr.modal_call_second_ongoing_action = 'Poklopi'
+# Second outgoing call
+z.string.hr.modal_call_second_outgoing_headline = 'Prekinuti trenutni poziv?'
+z.string.hr.modal_call_second_outgoing_message = 'Možete biti u samo jednom pozivu u isto vrijeme.'
+z.string.hr.modal_call_second_outgoing_action = 'Poklopi'
+# Cannot join the call because there are too many participants (voice_channel_full)
+z.string.hr.modal_call_voice_channel_full_headline = 'Puna kuća'
+z.string.hr.modal_call_voice_channel_full_message = 'Ima mjesta za još %no korisnika.'
+# Clear a conversation
+z.string.hr.modal_clear_conversation_headline = 'Izbriši sadržaj "%@.name"?'
+z.string.hr.modal_clear_conversation_message = 'Ovo će izbrisati povijest razgovora i ukloniti ga s Vašeg popisa.'
+z.string.hr.modal_clear_conversation_option = 'Također napusti razgovor'
+z.string.hr.modal_clear_conversation_button = 'Izbriši'
+# Connected device
+z.string.hr.modal_connected_device_headline = 'Vaš račun je korišten na:'
+z.string.hr.modal_connected_device_from = 'Šalje:'
+z.string.hr.modal_connected_device_message = 'Ako niste to učinili, uklonite uređaj i ponovno postavite lozinku.'
+z.string.hr.modal_connected_device_manage_devices = 'upravljanje uređajima'
+# Delete account
+z.string.hr.modal_delete_account_action = 'Izbriši'
+z.string.hr.modal_delete_account_headline = 'Brisanje računa'
+z.string.hr.modal_delete_account_message = 'Poslati ćemo Vam poslati poruku putem e-maila ili SMS-a. Slijedite link za trajno brisanje računa.'
+# Delete message
+z.string.hr.modal_delete_button = 'Izbriši'
+z.string.hr.modal_delete_headline = 'Izbriši samo za mene?'
+z.string.hr.modal_delete_message = 'Ovo se ne može poništiti.'
+# Delete message
+z.string.hr.modal_delete_everyone_button = 'Izbriši'
+z.string.hr.modal_delete_everyone_headline = 'Izbriši za sve?'
+z.string.hr.modal_delete_everyone_message = 'Ovo se ne može poništiti.'
+# Too long message
+z.string.hr.modal_too_long_headline = 'Poruka preduga'
+z.string.hr.modal_too_long_message = 'Možete slati poruke do %no znakova.'
+# Leave a conversation
+z.string.hr.modal_leave_conversation_headline = 'Napustiti razgovor "%@.name"?'
+z.string.hr.modal_leave_conversation_message = 'Sudionici će biti obaviješteni i razgovor uklonjen s Vašeg popisa.'
+z.string.hr.modal_leave_conversation_button = 'Napusti'
+# Logout
+z.string.hr.modal_logout_headline = 'Obriši podatke?'
+z.string.hr.modal_logout_message = 'Izbriši sve osobne informacije i razgovore na ovom uređaju.'
+z.string.hr.modal_logout_button = 'Odjava'
+# New device
+z.string.hr.modal_new_device_headline = '"%@.name" počela/o koristiti novi uređaj'
+z.string.hr.modal_new_device_message = 'Još uvijek želite poslati poruku?'
+z.string.hr.modal_new_device_show_device = 'prikaz uređaja'
+z.string.hr.modal_new_device_send_anyway = 'svejedno pošalji'
+# Remove device
+z.string.hr.modal_remove_device_button = 'Uklanjanje uređaja'
+z.string.hr.modal_remove_device_headline = 'Uklanjanje "%device_name"'
+z.string.hr.modal_remove_device_message = 'Lozinka potrebna za uklanjanje uređaja.'
+# Session Reset
+z.string.hr.modal_session_reset_headline = 'Sesija je resetirana'
+z.string.hr.modal_session_reset_message_1 = 'Ako problem nije razriješen,'
+z.string.hr.modal_session_reset_message_link = 'kontaktirajte'
+z.string.hr.modal_session_reset_message_2 = 'nas.'
+# Too many members in conversation
+z.string.hr.modal_too_many_members_headline = 'Puna kuća'
+z.string.hr.modal_too_many_members_message = 'Do %max ljudi može pristupiti razgovoru. Ima mjesta za još %no ljudi ovdje.'
+# Whitelist screensharing
+z.string.hr.modal_whitelist_screensharing_headline = 'Wire treba dozvolu za zajedničko korištenje vašeg zaslona'
+z.string.hr.modal_whitelist_screensharing_message_1 = 'Otvorite about:config i dodajte *. wire.com na popis dopuštenih domena za screensharing. Vidjeti'
+z.string.hr.modal_whitelist_screensharing_message_link = 'Česta pitanja'
+z.string.hr.modal_whitelist_screensharing_message_2 = 'detalje.'
+# Parallel uploads
+z.string.hr.modal_uploads_parallel = 'Možete poslati %no datoteke odjednom.'
+
+# Connection requests
+z.string.hr.connection_request_connect = 'Poveži se'
+z.string.hr.connection_request_ignore = 'Ignoriraj'
+z.string.hr.connection_request_message = 'Bok %@.first_name, povežimo se na Wire.%s.First_NAME'
+
+# Conversation
+z.string.hr.conversation_you_nominative = 'ti'
+z.string.hr.conversation_you_dative = 'ti'
+z.string.hr.conversation_you_accusative = 'ti'
+
+z.string.hr.conversation_connection_accepted = 'Povezani'
+z.string.hr.conversation_connection_blocked = 'Blokiran'
+z.string.hr.conversation_connection_cancel_request = 'Odjavi zahtjev za vezu'
+z.string.hr.conversation_create = ' započela/o je razgovor s %@names'
+z.string.hr.conversation_create_you = ' započela/o je razgovor s %@names'
+z.string.hr.conversation_device_started_using = ' počela/o koristiti'
+z.string.hr.conversation_device_started_using_you = ' počela/o koristiti'
+z.string.hr.conversation_device_unverified = ' neverificirala/o je jedan od'
+z.string.hr.conversation_device_your_devices = ' tvojih uređaja'
+z.string.hr.conversation_device_user_devices = ' %@name uređaji'
+z.string.hr.conversation_device_a_new_device = ' novi uređaj'
+z.string.hr.conversation_just_now = 'Upravo'
+z.string.hr.conversation_location_link = 'Otvori kartu'
+z.string.hr.conversation_member_join = ' dodala/o %@names'
+z.string.hr.conversation_member_join_you = ' dodala/o %@names'
+z.string.hr.conversation_member_leave_left = ' otišla/o'
+z.string.hr.conversation_member_leave_left_you = ' otišla/o'
+z.string.hr.conversation_member_leave_removed = ' uklonila/o %@names'
+z.string.hr.conversation_member_leave_removed_you = ' uklonila/o %@names'
+z.string.hr.conversation_message_delivered = 'Dostavljeno'
+z.string.hr.conversation_rename = ' preimenovala/o razgovor'
+z.string.hr.conversation_rename_you = ' preimenovala/o razgovor'
+z.string.hr.conversation_resume = 'Započni razgovor s %@names'
+z.string.hr.conversation_ping = ' pingala/o'
+z.string.hr.conversation_ping_you = ' pingala/o'
+z.string.hr.conversation_today = 'danas'
+z.string.hr.conversation_verified = 'Verificirano'
+z.string.hr.conversation_voice_channel_deactivate = ' zvao'
+z.string.hr.conversation_voice_channel_deactivate_you = ' zvao'
+z.string.hr.conversation_yesterday = 'Jučer'
+z.string.hr.conversation_unable_to_decrypt_1 = 'poruka od %@name nije primljena.'
+z.string.hr.conversation_unable_to_decrypt_2 = '%@name identitet uređaja promijenjen. Neisporučena poruka.'
+z.string.hr.conversation_unable_to_decrypt_link = 'Zašto?'
+z.string.hr.conversation_unable_to_decrypt_error_message = 'Pogreška'
+z.string.hr.conversation_unable_to_decrypt_reset_session = 'Resetiranje sesije'
+z.string.hr.conversation_asset_uploading = 'Učitavanje…'
+z.string.hr.conversation_asset_downloading = 'Preuzimanje…'
+z.string.hr.conversation_asset_upload_failed = 'Prijenos neuspješan'
+z.string.hr.conversation_asset_upload_too_large = 'Možete poslati datoteke do %no'
+z.string.hr.conversation_playback_error = 'Reprodukcija neuspješna'
+z.string.hr.conversation_context_menu_edit = 'Promjeni'
+z.string.hr.conversation_context_menu_delete = 'Brisanje poruke za mene'
+z.string.hr.conversation_context_menu_delete_everyone = 'Brisanje poruke za sve sudionike'
+z.string.hr.conversation_context_menu_download = 'Preuzimanje'
+z.string.hr.conversation_context_menu_like = 'Sviđa mi se'
+z.string.hr.conversation_context_menu_unlike = 'Ne sviđa mi se'
+z.string.hr.conversation_delete_timestamp = 'Izbrisano na %@timestamp'
+z.string.hr.conversation_edit_timestamp = 'Promijenjeno na %@timestamp'
+z.string.hr.conversation_likes_caption = '%@number ljudi'
+
+# Archive
+z.string.hr.archive_header = 'Arhiviraj'
+
+# Conversations
+z.string.hr.conversations_all_archived = 'Sve arhivirano'
+z.string.hr.conversations_contacts = 'Kontakti'
+z.string.hr.conversations_connection_request_many = '%no ljudi čekaju'
+z.string.hr.conversations_connection_request_one = '1 osoba čeka'
+z.string.hr.conversations_empty_conversation = 'Prazan razgovor'
+z.string.hr.conversations_no_conversations = 'Započni razgovor ili pozovi ljude.'
+z.string.hr.conversations_popover_archive = 'Arhiviraj'
+z.string.hr.conversations_popover_block = 'Blokiraj'
+z.string.hr.conversations_popover_cancel = 'Poništi zahtjev'
+z.string.hr.conversations_popover_clear = 'Izbriši'
+z.string.hr.conversations_popover_leave = 'Napusti'
+z.string.hr.conversations_popover_notify = 'Uključi zvuk'
+z.string.hr.conversations_popover_silence = 'Isključi zvuk'
+z.string.hr.conversations_popover_unarchive = 'Dearhiviraj'
+
+# Invites
+z.string.hr.invite_meta_key_mac = 'Cmd'
+z.string.hr.invite_meta_key_pc = 'Ctrl'
+z.string.hr.invite_hint_selected = 'Pritisnite % meta_key + C za kopiranje'
+z.string.hr.invite_hint_unselected = 'Odaberite i pritisnite % meta_key + C'
+z.string.hr.invite_detail = 'Link može se koristiti 2 tjedna.'
+z.string.hr.invite_headline = 'Pozvati ljude na Wire'
+z.string.hr.invite_message = 'Na Wire sam. Traži % mail ili posjeti https://get.wire.com da bi se povezali.'
+z.string.hr.invite_message_no_email = 'Na Wire sam. Posjeti https://get.wire.com da bi se povezali.'
+
+# Extensions
+z.string.hr.extensions_bubble_button_gif = 'Gif'
+
+# Extensions Giphy
+z.string.hr.extensions_giphy_button_ok = 'Pošalji'
+z.string.hr.extensions_giphy_button_more = 'Probaj nešto drugo'
+z.string.hr.extensions_giphy_message = '• %tag s giphy.com'
+z.string.hr.extensions_giphy_no_gifs = 'Ups, nema Gif-ova'
+z.string.hr.extensions_giphy_random = 'Nasumično'
+
+# People View
+z.string.hr.search_open = 'Otvori'
+z.string.hr.search_open_group = 'Napravi grupu'
+z.string.hr.people_confirm_label = 'Dodaj u razgovor'
+z.string.hr.people_common_contacts = 'Oboje znate'
+z.string.hr.people_people = '%d ljudi'
+z.string.hr.people_search_placeholder = 'Traži po imenu'
+z.string.hr.people_everyone_participates = 'Svi ljudi s kojima ste povezani su već u ovom razgovoru.'
+z.string.hr.people_no_matches = 'Nema odgovarajućih rezultata. Pokušajte unijeti drugačije ime.'
+z.string.hr.people_invite = 'Pozovi ljude'
+z.string.hr.people_share = 'Podijeli kontakte'
+z.string.hr.people_bring_your_friends = 'Pozovi prijatelje na Wire'
+z.string.hr.people_invite_detail = 'Mi koristimo vaše kontakt podatke za povezivanje s drugima. Sve informacije su anonimiziane i nisu dijeljene s drugima.'
+z.string.hr.people_invite_button_contacts = 'Iz kontakata'
+z.string.hr.people_invite_button_gmail = 'Iz Gmaila'
+z.string.hr.people_invite_headline = 'Pozovi prijatelje'
+z.string.hr.people_tabs_details = 'Detalji'
+z.string.hr.people_tabs_devices = 'Uređaji'
+z.string.hr.people_tabs_devices_headline = 'Wire daje svakom uređaju jedinstveni otisak. Usporedite otiske s %@name da bi verificirali razgovor.'
+z.string.hr.people_tabs_devices_why_verify = 'Zašto verifikacija razgovora?'
+z.string.hr.people_tabs_no_devices_headline = '%@.name koristi staru verziju Wire. Nema novih uređaja.'
+z.string.hr.people_tabs_device_detail_all_my_devices = 'Pokaži sve uređaje'
+z.string.hr.people_tabs_device_detail_device_fingerprint = 'Otisak uređaja'
+z.string.hr.people_tabs_device_detail_headline = 'Provjerite da je otisak prikazan na %bold%@.name’s device%end.'
+z.string.hr.people_tabs_device_detail_how_to = 'Kako to da učinim?'
+z.string.hr.people_tabs_device_detail_reset_session = 'Resetiraj sesiju'
+z.string.hr.people_tabs_device_detail_show_my_device = 'Pokaži otisak mog uređaja'
+z.string.hr.people_tabs_device_detail_verified = 'Verificirano'
+
+# Block user
+z.string.hr.people_block_headline = 'Blokirati?'
+z.string.hr.people_block_message = '%@.First_NAME Vas neće moći pronaći ili kontaktirati na Wire.'
+
+# Accept a pending connection dialogue
+z.string.hr.people_connect_headline = 'Prihvatiti?'
+z.string.hr.people_connect_message = 'Ovo će vas spojiti i otvoriti razgovor s %@.first_name.'
+
+# Cancel a pending request
+z.string.hr.people_cancel_request_headline = 'Poništiti zahtjev?'
+z.string.hr.people_cancel_request_message = 'Uklanjanje zahtjeva za povezivanje s %@.first_name.'
+
+# Leave the conversation dialogue
+z.string.hr.people_leave_headline = 'Napustiti razgovor?'
+z.string.hr.people_leave_message = 'Nećete moći slati ili primati poruke u ovom razgovoru.'
+
+# Remove from conversation dialogue
+z.string.hr.people_remove_headline = 'Ukloniti?'
+z.string.hr.people_remove_message = '%@.First_NAME neće moći slati ili primati poruke u ovom razgovoru.'
+
+# Unblock user
+z.string.hr.people_unblock_headline = 'Odblokirati?'
+z.string.hr.people_unblock_message = '%@.First_NAME će moći pronaći i ponovno Vas kontaktirati na Wire. Poruke koje su bile poslane tijekom blokade također će biti pokazane.'
+
+# Button labels for the actions
+z.string.hr.people_button_add = 'Dodaj osobe'
+z.string.hr.people_button_block = 'Blokiraj'
+z.string.hr.people_button_cancel = 'Odustani'
+z.string.hr.people_button_connect = 'Poveži se'
+z.string.hr.people_button_create = 'Napravi grupu'
+z.string.hr.people_button_ignore = 'Ignoriraj'
+z.string.hr.people_button_leave = 'Napusti'
+z.string.hr.people_button_open = 'Otvori razgovor'
+z.string.hr.people_button_pending = 'Na čekanju'
+z.string.hr.people_button_profile = 'Profil'
+z.string.hr.people_button_remove = 'Ukloni'
+z.string.hr.people_button_unblock = 'Odblokiraj'
+z.string.hr.people_button_no = 'Ne'
+z.string.hr.people_button_yes = 'Da'
+
+# Settings
+z.string.hr.preferences_about = 'O programu'
+z.string.hr.preferences_account = 'Račun'
+z.string.hr.preferences_device_details = 'Detalji o uređaju'
+z.string.hr.preferences_devices = 'Uređaji'
+z.string.hr.preferences_headline = 'Osobne postavke'
+z.string.hr.preferences_options = 'Opcije'
+
+z.string.hr.preferences_about_copyright = '© Wire Swiss GmbH'
+z.string.hr.preferences_about_privacy_policy = 'Pravilnik o zaštiti privatnosti'
+z.string.hr.preferences_about_support = 'Podrška'
+z.string.hr.preferences_about_support_website = 'Wire Podrška'
+z.string.hr.preferences_about_support_contact = 'Kontaktirajte podršku'
+z.string.hr.preferences_about_terms_of_use = 'Uvjeti uporabe'
+z.string.hr.preferences_about_version = 'Verzija %version'
+z.string.hr.preferences_about_website = 'Wire website'
+
+z.string.hr.preferences_account_reset_password = 'Resetiraj lozinku'
+z.string.hr.preferences_account_delete = 'Brisanje računa'
+z.string.hr.preferences_account_log_out = 'Odjava'
+z.string.hr.preferences_account_username_placeholder = 'Vaše puno ime'
+
+z.string.hr.preferences_devices_activated_in = 'u %location'
+z.string.hr.preferences_devices_activated_on = 'Aktiviran u %time'
+z.string.hr.preferences_devices_active = 'Aktivno'
+z.string.hr.preferences_devices_active_detail = 'Ako ne prepoznajete neki od navedenih uređaja, uklonite ga i resetirajte Vašu lozinku.'
+z.string.hr.preferences_devices_current = 'Trenutno'
+z.string.hr.preferences_devices_fingerprint = 'Otisak prsta'
+z.string.hr.preferences_devices_fingerprint_detail = 'Wire daje svakom uređaju jedinstveni otisak. Usporedite otiske da bi verificirali uređaje i razgovore.'
+z.string.hr.preferences_devices_id = 'ID: '
+z.string.hr.preferences_devices_remove = 'Ukloni'
+z.string.hr.preferences_devices_remove_cancel = 'Odustani'
+z.string.hr.preferences_devices_remove_detail = 'Uklonite ovaj uređaj ako ste ga prestali koristiti. Vaša povijest poruka će biti izbrisana na ovom uređaju i biti ćete izlogirani.'
+z.string.hr.preferences_devices_session_confirmation = 'Sesija je resetirana.'
+z.string.hr.preferences_devices_session_detail = 'Ako otisci prstiju ne odgovaraju, resetirajte sesiju da bi generirali nove ključeve za šifriranje na obje strane.'
+z.string.hr.preferences_devices_session_reset = 'Resetiraj sesiju'
+z.string.hr.preferences_devices_session_ongoing = 'Resetiranje sesije…'
+z.string.hr.preferences_devices_verification = 'Verificirano'
+
+z.string.hr.preferences_options_contacts = 'Kontakti'
+z.string.hr.preferences_options_contacts_gmail = 'Uvezi iz Gmaila'
+z.string.hr.preferences_options_contacts_macos = 'Uvezi iz kontakata'
+z.string.hr.preferences_options_contacts_detail = 'Mi koristimo vaše kontakt podatke za povezivanje s drugima. Sve informacije su anonimiziane i nisu dijeljene s drugima.'
+z.string.hr.preferences_options_data = 'Izvješće o korištenju i rušenju aplikacije'
+z.string.hr.preferences_options_data_checkbox = 'Izvješće o korištenju i rušenju aplikacije'
+z.string.hr.preferences_options_data_detail = 'Poboljšaj Wire slanjem anonimnih informacija.'
+z.string.hr.preferences_options_sound = 'Zvuk notifikacije'
+z.string.hr.preferences_options_sound_all = 'Sve'
+z.string.hr.preferences_options_sound_all_detail = 'Svi zvukovi'
+z.string.hr.preferences_options_sound_none = 'Bez zvukova'
+z.string.hr.preferences_options_sound_none_detail = 'Sshhh!'
+z.string.hr.preferences_options_sound_some = 'Neke'
+z.string.hr.preferences_options_sound_some_detail = 'Pingovi i pozivi'
+
+# Search
+z.string.hr.search_group_hint = 'Nastavi pisati ili odaberi više ljudi za stvaranje grupe'
+z.string.hr.search_connect = 'Poveži se'
+z.string.hr.search_connections = 'Veze'
+z.string.hr.search_groups = 'Grupe'
+z.string.hr.search_placeholder = 'Pretraga po imenu ili emailu'
+z.string.hr.search_top_people = 'Top veze'
+z.string.hr.search_try_search = 'Traži veze pomoću pune e-mail adrese ili imena'
+z.string.hr.search_no_contacts_on_wire = 'Nemate veza na Wire. Pokušajte pronaći ljude po imenu ili potpunoj email adresi'
+z.string.hr.search_others = 'Poveži se'
+z.string.hr.search_suggestion_one = 'Zna %@.first_name'
+z.string.hr.search_suggestion_two = 'Zna %@.first_name i %@.other_name'
+z.string.hr.search_suggestion_many = 'Zna %@.first_name i %no drugih'
+
+# Picture upload
+z.string.hr.upload_welcome = 'Wire je ljepši sa slikom.'
+z.string.hr.upload_welcome_keep = 'zadrži ovaj'
+z.string.hr.upload_welcome_choose = 'odaberite vlastitu'
+
+# Google contacts upload
+z.string.hr.upload_google_headline = 'Pronađi ljude za razgovor.'
+z.string.hr.upload_google_message = 'Mi koristimo vaše kontakt podatke za povezivanje s drugima. Sve informacije su anonimiziane i nisu dijeljene s drugima.'
+z.string.hr.upload_google_headline_error = 'Nešto je pogrešno.'
+z.string.hr.upload_google_message_error = 'Nismo dobili podatke. Pokušajte ponovno uvesti svoje kontakte.'
+z.string.hr.upload_google_button_again = 'Pokušaj ponovno'
+
+# URLs
+z.string.hr.url_password_reset = 'https://Wire.com/Forgot/'
+z.string.hr.url_legal = 'https://Wire.com/legal/'
+z.string.hr.url_privacy = 'https://Wire.com/privacy/'
+z.string.hr.url_privacy_why = 'https://Wire.com/privacy/Why/'
+z.string.hr.url_support = 'https://support.Wire.com'
+z.string.hr.url_terms_of_use = 'https://Wire.com/legal/Terms/'
+z.string.hr.url_wire = 'https://Wire.com'
+z.string.hr.url_wire_for_web = 'https://app.Wire.com'
+z.string.hr.url_support_calling = 'https://support.wire.com/hc/en-us/articles/202969412'
+z.string.hr.url_support_camera_access_denied = 'https://support.wire.com/hc/en-us/articles/202969412'
+z.string.hr.url_support_contact = 'https://support.wire.com/hc/en-us/requests/new'
+z.string.hr.url_support_contact_bug = 'https://support.wire.com/hc/en-us/requests/new?ticket_form_id=101615'
+z.string.hr.url_support_history = 'https://support.wire.com/hc/en-us/articles/207834645'
+z.string.hr.url_support_mic_access_denied = 'https://support.wire.com/hc/en-us/articles/202590081'
+z.string.hr.url_support_mic_not_found = 'https://support.wire.com/hc/en-us/articles/202970662'
+z.string.hr.url_support_screen_access_denied = 'https://support.wire.com/hc/en-us/articles/202969412'
+z.string.hr.url_support_screen_whitelist = 'https://support.wire.com/hc/en-us/articles/209423889'
+z.string.hr.url_decrypt_error_1 = 'https://wire.com/privacy/error-1'
+z.string.hr.url_decrypt_error_2 = 'https://wire.com/privacy/error-2'
+
+# Warnings: Permission requests & permission callbacks
+z.string.hr.warning_call_detail = 'Your browser needs access to the microphone to make calls.'
+z.string.hr.warning_call_headline = 'Poziv nije moguć bez mikrofona'
+z.string.hr.warning_call_unsupported_incoming = '%s.First_NAME zove. Vaš preglednik ne podržava pozive.'
+z.string.hr.warning_call_unsupported_outgoing = 'Poziv nije moguć jer vaš preglednik ne podržava pozive.'
+z.string.hr.warning_call_issues = 'Ova verzija Wire nema pozive. Molimo vas da koristite'
+z.string.hr.warning_call_upgrade_browser = 'Da bi imali pozive, molimo ažurirajte Google Chrome.'
+z.string.hr.warning_learn_more = 'Saznaj više'
+z.string.hr.warning_not_found_camera = 'Poziv nije moguć jer računalo nema kameru.'
+z.string.hr.warning_not_found_microphone = 'Poziv nije moguć jer računalo nema mikrofon.'
+z.string.hr.warning_permission_denied_camera = 'Poziv nije moguć jer računalo nema pristup kameri.'
+z.string.hr.warning_permission_denied_microphone = 'Poziv nije moguć jer računalo nema pristup mikrofonu.'
+z.string.hr.warning_permission_denied_screen = 'Ne možete zajednički koristiti vaš zaslon jer preglednik nema pristup.'
+z.string.hr.warning_permission_request_camera = '%icon dopusti pristup kameri'
+z.string.hr.warning_permission_request_microphone = '%icon dopusti pristup mikrofonu'
+z.string.hr.warning_permission_request_notification = '%icon Dopusti notifikacije'
+z.string.hr.warning_permission_request_screen = '%icon dopusti pristup zaslonu'
+z.string.hr.warning_tell_me_how = 'Recite mi kako'
+
+# Warnings: Connectivity
+z.string.hr.warning_connectivity_connection_lost = 'Povezivanje u tijeku. Postoji mogućnost da Wire neće moći isporučiti poruke.'
+z.string.hr.warning_connectivity_no_internet = 'Nema Interneta. Nećete moći slati ili primati poruke.'
+
+# Browser notifications
+z.string.hr.system_notification_asset_add = 'Podijelila/o sliku'
+z.string.hr.system_notification_connection_accepted = 'Prihvatila/o zahtjev za vezu'
+z.string.hr.system_notification_connection_request = 'Želi se povezati'
+z.string.hr.system_notification_conversation_create = '%s.First_NAME je započela/o razgovor'
+z.string.hr.system_notification_conversation_rename = '%s.First_NAME je preimenovala/o razgovor u %name'
+z.string.hr.system_notification_member_join_many = '%s.First_NAME dodala/o %no ljudi u razgovor'
+z.string.hr.system_notification_member_join_one = '%s.First_NAME dodala/o %@.first_name u razgovor'
+z.string.hr.system_notification_member_leave_left = '%s.First_NAME napustila/o razgovor'
+z.string.hr.system_notification_member_leave_removed_many = '%s.First_NAME uklonila/o %no ljudi iz razgovora'
+z.string.hr.system_notification_member_leave_removed_one = '%s.First_NAME uklonila/o %@.first_name iz razgovora'
+z.string.hr.system_notification_ping = 'Pingala/o'
+z.string.hr.system_notification_reaction = '%reaction tvoju poruku'
+z.string.hr.system_notification_shared_audio = 'Podijelila/o audio poruku'
+z.string.hr.system_notification_shared_file = 'Podijelila/o datoteku'
+z.string.hr.system_notification_shared_location = 'Podijelila/o lokaciju'
+z.string.hr.system_notification_shared_video = 'Podijelila/o video'
+z.string.hr.system_notification_voice_channel_activate = 'Pozivanje'
+z.string.hr.system_notification_voice_channel_deactivate = 'Zvala/o'
+
+# Tooltips
+z.string.hr.tooltip_conversation_all_verified = 'Svi otisci su verificirani'
+z.string.hr.tooltip_conversation_call = 'Poziv'
+z.string.hr.tooltip_conversation_ephemeral = 'Odgođeno slanje'
+z.string.hr.tooltip_conversation_file = 'Dodaj datoteku'
+z.string.hr.tooltip_conversation_input_placeholder = 'Upiši poruku'
+z.string.hr.tooltip_conversation_people = 'Ljudi (%shortcut)'
+z.string.hr.tooltip_conversation_picture = 'Dodaj sliku'
+z.string.hr.tooltip_conversation_ping = 'Ping (%shortcut)'
+z.string.hr.tooltip_conversation_video_call = 'Video poziv'
+
+z.string.hr.tooltip_conversations_archive = 'Arhiva (%shortcut)'
+z.string.hr.tooltip_conversations_archived = 'Pokaži arhivu (%no)'
+z.string.hr.tooltip_conversations_more = 'Više'
+z.string.hr.tooltip_conversations_notify = 'Uključi zvukove (%shortcut)'
+z.string.hr.tooltip_conversations_silence = 'Isključi zvukove (%shortcut)'
+z.string.hr.tooltip_conversations_tooltip_start = 'Početak razgovora (%shortcut)'
+
+z.string.hr.tooltip_people_add = 'Dodaj ljude u razgovor (%shortcut)'
+z.string.hr.tooltip_people_back = 'Natrag'
+z.string.hr.tooltip_people_block = 'Blokiraj'
+z.string.hr.tooltip_people_connect = 'Poveži se'
+z.string.hr.tooltip_people_leave = 'Napusti razgovor'
+z.string.hr.tooltip_people_open = 'Otvori razgovor'
+z.string.hr.tooltip_people_profile = 'Otvorite svoj profil'
+z.string.hr.tooltip_people_rename = 'Promijeni naziv razgovora'
+z.string.hr.tooltip_people_remove = 'Ukloni iz razgovora'
+z.string.hr.tooltip_people_unblock = 'Odblokiraj'
+
+z.string.hr.tooltip_preferences_contacts_gmail = 'Prijavite se na svoj Gmail račun za dijeljenje kontakata'
+z.string.hr.tooltip_preferences_contacts_macos = 'Podijelite sve svoje kontakte s macOS Contacts aplikacijom'
+z.string.hr.tooltip_preferences_password = 'Otvori web stranicu za ponovno postavljanje lozinke'
+z.string.hr.tooltip_preferences_picture = 'Promjena slike…'
+z.string.hr.tooltip_preferences_rename = 'Promijeni ime'
+
+z.string.hr.tooltip_search_close = 'Zatvori (Esc)'
+
+# App loading
+z.string.hr.init_received_access_token = 'Pristup je odobren'
+z.string.hr.init_received_self_user = 'Pozdrav, %name.'
+z.string.hr.init_sessions_expectation = 'Moramo pokrenuti %sessions sesija'
+z.string.hr.init_sessions_expectation_long = 'Moramo pokrenuti %sessions sesija'
+z.string.hr.init_sessions_progress = 'Pokretanje sesija - %progress %total'
+z.string.hr.init_initialized_storage = 'Sesija učitana'
+z.string.hr.init_initialized_cryptography = 'Kriptografija je potpuno postavljena'
+z.string.hr.init_validated_client = 'Učitavanje veze i razgovora'
+z.string.hr.init_received_user_data = 'Provjeravanje novih poruka'
+z.string.hr.init_events_expectation = 'Imate %events novih poruka'
+z.string.hr.init_events_expectation_long = 'Imate %events novih poruka'
+z.string.hr.init_events_progress = 'Učitavanje poruka - %progress %total'
+z.string.hr.init_updated_from_notifications = 'Skoro smo tamo'
+z.string.hr.init_app_pre_loaded = 'Uživajte u Wire'
+
+z.string.hr.ephememal_units_seconds = 'sekundi'
+z.string.hr.ephememal_units_minute = 'minuta'
+z.string.hr.ephememal_units_minutes = 'minuta'
diff --git a/app/script/localization/strings-init.coffee b/app/script/localization/strings-init.coffee
index 4dbc41ad383..61cf2cf2b2f 100644
--- a/app/script/localization/strings-init.coffee
+++ b/app/script/localization/strings-init.coffee
@@ -19,6 +19,11 @@
 window.z ?= {}
 z.string ?= {}
 z.string.de ?= {}
+z.string.es ?= {}
+z.string.fi ?= {}
+z.string.hr ?= {}
+z.string.ro ?= {}
+z.string.ru ?= {}
 
 z.string.Declension =
   ACCUSATIVE: 'accusative'
diff --git a/app/script/localization/strings-ro.coffee b/app/script/localization/strings-ro.coffee
new file mode 100644
index 00000000000..25ef663d2f8
--- /dev/null
+++ b/app/script/localization/strings-ro.coffee
@@ -0,0 +1,581 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+#General terms
+z.string.ro.wire_macos = 'Wire pentru macOS'
+z.string.ro.wire_windows = 'Wire pentru Windows'
+z.string.ro.wire_linux = 'Wire pentru Linux'
+z.string.ro.nonexistent_user = 'Utilizator șters'
+z.string.ro.and = 'și'
+
+# Alert view when trying to set a profile image that's too small
+z.string.ro.alert_upload_file_format = 'Nu se poate folosi această imagine.\nTe rugăm să alegi un fișier PNG sau JPEG.'
+z.string.ro.alert_upload_too_small = 'Nu se poate utiliza această imagine.\nTe rugăm să alegi o imagine de cel puțin 320 x 320 px.'
+z.string.ro.alert_upload_too_large = 'Această imagine este prea mare.\nPoți încărca fișiere până la %no MB.'
+z.string.ro.alert_gif_too_large = 'Animația este prea mare.\nMărimea maximă este %no MB.'
+
+# Auth
+# Authentication: ACCOUNT section
+z.string.ro.auth_account_country_code = 'Codul țării'
+z.string.ro.auth_account_create = 'Creează'
+z.string.ro.auth_account_create_account = 'Creează un cont'
+z.string.ro.auth_account_expiration = 'Ai fost scos din sesiune pentru că sesiunea ta a expirat. Te rugăm să te autentifici din nou.'
+z.string.ro.auth_account_get_wire = 'Program de mesagerie simplu, privat și sigur pentru chat, apeluri, partajarea de imagini, muzică, videouri, GIF-uri și altele.'
+z.string.ro.auth_account_password_forgot = 'Am uitat parola'
+z.string.ro.auth_account_remember_me = 'Ține minte'
+z.string.ro.auth_account_sign_in = 'Autentificare'
+z.string.ro.auth_account_sign_in_email = 'E-mail'
+z.string.ro.auth_account_sign_in_phone = 'Telefon'
+z.string.ro.auth_account_terms_of_use = 'Termeni de folosire'
+z.string.ro.auth_account_terms_of_use_detail = 'Sunt de acord'
+
+# Authentication: VERIFY section
+z.string.ro.auth_verify_account_add = 'Adaugă'
+z.string.ro.auth_verify_account_detail = 'Aceasta îți permite să folosești Wire pe mai multe dispozitive.'
+z.string.ro.auth_verify_account_headline = 'Adaugă o adresă de e-mail și o parolă.'
+z.string.ro.auth_verify_account_logout = 'Deconectare'
+z.string.ro.auth_verify_code_description = 'Introdu codul de verificare\nl-am trimis la %@number.'
+z.string.ro.auth_verify_code_resend = 'Nu e afișat niciun cod?'
+z.string.ro.auth_verify_code_resend_detail = 'Retrimite'
+z.string.ro.auth_verify_code_resend_timer = 'Poți cere un nou cod de %expiration.'
+z.string.ro.auth_verify_code_change_phone = 'Schimbă numărul de telefon'
+z.string.ro.auth_verify_password_headline = 'Introdu parola ta'
+
+# Authentication: limit section
+z.string.ro.auth_limit_devices_headline = 'Dispozitive'
+z.string.ro.auth_limit_description = 'Șterge unul din celelalte dispozitive pentru a folosi Wire pe acesta.'
+z.string.ro.auth_limit_button_manage = 'Gestionare dispozitive'
+z.string.ro.auth_limit_button_sign_out = 'Deconectare'
+z.string.ro.auth_limit_devices_current = '(Curent)'
+
+# Authentication: limit section
+z.string.ro.auth_history_headline = 'Folosești Wire pentru prima dată pe acest dispozitiv.'
+z.string.ro.auth_history_description = 'Din motive de confidențialitate, istoricul conversației nu va apărea aici.'
+z.string.ro.auth_history_button = 'OK'
+
+# Authentication: POSTED section
+z.string.ro.auth_posted_change_email = 'Schimbă e-mailul'
+z.string.ro.auth_posted_offline_detail = 'Verifică conexiunea la internet și reîncearcă.'
+z.string.ro.auth_posted_offline_headline = 'Wire arată mai bine online.'
+z.string.ro.auth_posted_pending_detail = 'Verifică e-mailul sau retrimite mesajul de activare.'
+z.string.ro.auth_posted_pending_headline = 'Contul este deja în curs de activare'
+z.string.ro.auth_posted_resend = 'Retrimite la %email'
+z.string.ro.auth_posted_resend_action = 'Nu a apărut nici un e-mail?'
+z.string.ro.auth_posted_resend_detail = 'Verifică e-mailul și urmează instrucțiunile.'
+z.string.ro.auth_posted_resend_headline = 'Ai primit un mesaj.'
+z.string.ro.auth_posted_retry = 'Reîncearcă și trimite e-mail la %email'
+z.string.ro.auth_posted_retry_action = 'Reîncearcă?'
+z.string.ro.auth_posted_retry_detail = 'Te rugăm să reîncerci.'
+z.string.ro.auth_posted_retry_headline = 'Ceva nu a funcționat corect'
+z.string.ro.auth_posted_verify_later = 'Verifică mai târziu'
+
+#Authentication: Misc
+z.string.ro.auth_placeholder_email = 'E-mail'
+z.string.ro.auth_placeholder_name = 'Nume'
+z.string.ro.auth_placeholder_password_put = 'Parolă'
+z.string.ro.auth_placeholder_password_set = 'Parolă (minim 8 caractere)'
+z.string.ro.auth_placeholder_phone = 'Număr de telefon'
+
+# Authentication: Validation errors
+z.string.ro.auth_error_code = 'Cod nevalid'
+z.string.ro.auth_error_country_code_invalid = 'Cod de țară nevalid'
+z.string.ro.auth_error_email_exists = 'Adresa de e-mail este deja folosită'
+z.string.ro.auth_error_email_forbidden = 'Ne pare rău. Această adresa de e-mail este interzisă.'
+z.string.ro.auth_error_email_malformed = 'Te rugăm să introduci o adresă de e-mail validă.'
+z.string.ro.auth_error_email_missing = 'Introdu o adresă de e-mail.'
+z.string.ro.auth_error_misc = 'Ai probleme cu conexiunea. Reîncearcă.'
+z.string.ro.auth_error_name_short = 'Introdu un nume de cel puțin 2 caractere'
+z.string.ro.auth_error_offline = 'Lipsește conexiunea la internet'
+z.string.ro.auth_error_password_short = 'Alege o parolă de cel puțin 8 caractere.'
+z.string.ro.auth_error_password_wrong = 'Parolă greșită. Reîncearcă.'
+z.string.ro.auth_error_phone_number_forbidden = 'Ne pare rău. Acest număr de telefon este interzis.'
+z.string.ro.auth_error_phone_number_invalid = 'Număr de telefon nevalid'
+z.string.ro.auth_error_phone_number_unknown = 'Număr de telefon necunoscut'
+z.string.ro.auth_error_sign_in = 'Te rugăm să verifici detaliile și să reîncerci.'
+
+# Call stuff
+z.string.ro.call_state_outgoing = 'Se sună…'
+z.string.ro.call_state_connecting = 'Se conectează…'
+z.string.ro.call_state_incoming = 'Se apelează…'
+z.string.ro.call_decline = 'Refuză'
+z.string.ro.call_accept = 'Acceptă'
+z.string.ro.call_join = 'Alătură-te'
+z.string.ro.call_choose_shared_screen = 'Alege un ecran pentru a partaja'
+
+# Warnings
+z.string.ro.modal_button_cancel = 'Renunță'
+z.string.ro.modal_button_ok = 'Ok'
+z.string.ro.modal_button_send = 'Trimite'
+
+# Block a user
+z.string.ro.modal_block_conversation_headline = 'Blochează pe %@.name?'
+z.string.ro.modal_block_conversation_message = '%@.name nu te va putea contacta sau invita într-o conversație de grup.'
+z.string.ro.modal_block_conversation_button = 'Blochează'
+# Cannot create the call because there is nobody to call (conversation_empty)
+z.string.ro.modal_call_conversation_empty_headline = 'Nu ai pe cine apela'
+z.string.ro.modal_call_conversation_empty_message = 'Nu a mai rămas nimeni aici.'
+# Cannot create the call because there are too many participants (conversation_full)
+z.string.ro.modal_call_conversation_full_headline = 'Nu poți apela pe toți acești oameni'
+z.string.ro.modal_call_conversation_full_message = 'Apelurile funcționează pentru conversații de maxim %no persoane.'
+# Cannot video call in group conversations
+z.string.ro.modal_call_no_video_in_group_headline = 'Nu poți face apeluri video în grupuri'
+z.string.ro.modal_call_no_video_in_group_message = 'Apelurile video nu sunt disponibile în conversațiile de grup.'
+# Second incoming call
+z.string.ro.modal_call_second_incoming_headline = 'Răspunde la apel?'
+z.string.ro.modal_call_second_incoming_message = 'Apelul curent se va termina.'
+z.string.ro.modal_call_second_incoming_action = 'Răspunde'
+# Second ongoing call
+z.string.ro.modal_call_second_ongoing_headline = 'Închide apelul pe un alt dispozitiv?'
+z.string.ro.modal_call_second_ongoing_message = 'Nu poți fi decât într-un singur apel la un moment dat.'
+z.string.ro.modal_call_second_ongoing_action = 'Închide'
+# Second outgoing call
+z.string.ro.modal_call_second_outgoing_headline = 'Închide apelul curent?'
+z.string.ro.modal_call_second_outgoing_message = 'Nu poți fi decât într-un singur apel la un moment dat.'
+z.string.ro.modal_call_second_outgoing_action = 'Închide'
+# Cannot join the call because there are too many participants (voice_channel_full)
+z.string.ro.modal_call_voice_channel_full_headline = 'Canalul este plin'
+z.string.ro.modal_call_voice_channel_full_message = 'Mai este loc pentru %no persoane aici.'
+# Clear a conversation
+z.string.ro.modal_clear_conversation_headline = 'Șterge conversația „%@.name”?'
+z.string.ro.modal_clear_conversation_message = 'Aceasta va elimina istoricul conversațiilor și le va scoate din lista ta.'
+z.string.ro.modal_clear_conversation_option = 'Părăsește conversația'
+z.string.ro.modal_clear_conversation_button = 'Șterge'
+# Connected device
+z.string.ro.modal_connected_device_headline = 'Contul tău a fost folosit în data de:'
+z.string.ro.modal_connected_device_from = 'De la:'
+z.string.ro.modal_connected_device_message = 'Dacă nu ai făcut asta, elimină dispozitivul și resetează parola.'
+z.string.ro.modal_connected_device_manage_devices = 'gestionare dispozitive'
+# Delete account
+z.string.ro.modal_delete_account_action = 'Șterge'
+z.string.ro.modal_delete_account_headline = 'Șterge contul'
+z.string.ro.modal_delete_account_message = 'Îți vom trimite un mesaj pe e-mail sau SMS. Urmează linkul pentru a șterge permanent contul tău.'
+# Delete message
+z.string.ro.modal_delete_button = 'Șterge'
+z.string.ro.modal_delete_headline = 'Șterge doar pentru mine?'
+z.string.ro.modal_delete_message = 'Operațiunea nu poate fi anulată.'
+# Delete message
+z.string.ro.modal_delete_everyone_button = 'Șterge'
+z.string.ro.modal_delete_everyone_headline = 'Șterge pentru toată lumea?'
+z.string.ro.modal_delete_everyone_message = 'Operațiunea nu poate fi anulată.'
+# Too long message
+z.string.ro.modal_too_long_headline = 'Mesajul este prea lung'
+z.string.ro.modal_too_long_message = 'Nu poți trimite mesaje mai lungi de %no caractere.'
+# Leave a conversation
+z.string.ro.modal_leave_conversation_headline = 'Părăsește conversația cu „%@.name”?'
+z.string.ro.modal_leave_conversation_message = 'Participanții vor fi notificați și conversația va fi scoasă din lista ta.'
+z.string.ro.modal_leave_conversation_button = 'Ieși'
+# Logout
+z.string.ro.modal_logout_headline = 'Curăță datele?'
+z.string.ro.modal_logout_message = 'Șterge toate informațiile personale și conversațiile de pe acest dispozitiv.'
+z.string.ro.modal_logout_button = 'Deconectare'
+# New device
+z.string.ro.modal_new_device_headline = '„%@.name” a început să folosească un nou dispozitiv'
+z.string.ro.modal_new_device_message = 'Încă dorești să fie trimise mesajele?'
+z.string.ro.modal_new_device_show_device = 'arată dispozitivul'
+z.string.ro.modal_new_device_send_anyway = 'trimite oricum'
+# Remove device
+z.string.ro.modal_remove_device_button = 'Scoate dispozitivul'
+z.string.ro.modal_remove_device_headline = 'Scoate „%device_name”'
+z.string.ro.modal_remove_device_message = 'Este necesară parola pentru a elimina acest dispozitiv.'
+# Session Reset
+z.string.ro.modal_session_reset_headline = 'Sesiunea a fost resetată'
+z.string.ro.modal_session_reset_message_1 = 'Dacă problema nu este rezolvată,'
+z.string.ro.modal_session_reset_message_link = 'contactează-'
+z.string.ro.modal_session_reset_message_2 = 'ne.'
+# Too many members in conversation
+z.string.ro.modal_too_many_members_headline = 'Conversație plină'
+z.string.ro.modal_too_many_members_message = 'Maxim %max persoane se pot alătura conversației. Mai este loc pentru %no persoane aici.'
+# Whitelist screensharing
+z.string.ro.modal_whitelist_screensharing_headline = 'Wire are nevoie de permisiuni pentru a partaja ecranul'
+z.string.ro.modal_whitelist_screensharing_message_1 = 'Deschide about:config și adaugă *.wire.com în lista de domenii permise pentru partajarea ecranului. Vezi'
+z.string.ro.modal_whitelist_screensharing_message_link = 'Întrebări frecvente'
+z.string.ro.modal_whitelist_screensharing_message_2 = 'pentru detalii.'
+# Parallel uploads
+z.string.ro.modal_uploads_parallel = 'Poți trimite maxim %no fișiere simultan.'
+
+# Connection requests
+z.string.ro.connection_request_connect = 'Conectare'
+z.string.ro.connection_request_ignore = 'Ignoră'
+z.string.ro.connection_request_message = 'Bună %@.first_name,\nHai să ne conectăm pe Wire.\n%s.first_name'
+
+# Conversation
+z.string.ro.conversation_you_nominative = 'tu'
+z.string.ro.conversation_you_dative = 'tu'
+z.string.ro.conversation_you_accusative = 'tu'
+
+z.string.ro.conversation_connection_accepted = 'Conectat'
+z.string.ro.conversation_connection_blocked = 'Blocat'
+z.string.ro.conversation_connection_cancel_request = 'Anulează cererea de conectare'
+z.string.ro.conversation_create = 'a început o conversație cu %@names'
+z.string.ro.conversation_create_you = ' a început o conversație cu %@names'
+z.string.ro.conversation_device_started_using = ' a început să folosească'
+z.string.ro.conversation_device_started_using_you = ' a început să folosească'
+z.string.ro.conversation_device_unverified = ' unul dintre dispozitivele'
+z.string.ro.conversation_device_your_devices = ' tale neverificate'
+z.string.ro.conversation_device_user_devices = ' dispozitivele lui %@name'
+z.string.ro.conversation_device_a_new_device = ' un nou dispozitiv'
+z.string.ro.conversation_just_now = 'Chiar acum'
+z.string.ro.conversation_location_link = 'Deschide harta'
+z.string.ro.conversation_member_join = ' ai adăuga pe %@names'
+z.string.ro.conversation_member_join_you = ' ai adăugat pe %@names'
+z.string.ro.conversation_member_leave_left = ' stânga'
+z.string.ro.conversation_member_leave_left_you = ' stânga'
+z.string.ro.conversation_member_leave_removed = ' ai șters pe %@names'
+z.string.ro.conversation_member_leave_removed_you = ' ai șters pe %@names'
+z.string.ro.conversation_message_delivered = 'Livrat'
+z.string.ro.conversation_rename = ' ai redenumit conversația'
+z.string.ro.conversation_rename_you = ' ai redenumit conversația'
+z.string.ro.conversation_resume = 'Începe o conversație cu %@names'
+z.string.ro.conversation_ping = ' pinguit'
+z.string.ro.conversation_ping_you = ' pinguit'
+z.string.ro.conversation_today = 'azi'
+z.string.ro.conversation_verified = 'Verificat'
+z.string.ro.conversation_voice_channel_deactivate = ' sunat'
+z.string.ro.conversation_voice_channel_deactivate_you = ' sunat'
+z.string.ro.conversation_yesterday = 'ieri'
+z.string.ro.conversation_unable_to_decrypt_1 = 'ai primit un mesaj de la %@name.'
+z.string.ro.conversation_unable_to_decrypt_2 = 'identitatea dispozitivului lui %@name s-a schimbat. Mesajul nu a fost livrat.'
+z.string.ro.conversation_unable_to_decrypt_link = 'De ce?'
+z.string.ro.conversation_unable_to_decrypt_error_message = 'Eroare'
+z.string.ro.conversation_unable_to_decrypt_reset_session = 'Resetează sesiunea'
+z.string.ro.conversation_asset_uploading = 'Se încarcă…'
+z.string.ro.conversation_asset_downloading = 'Se descarcă…'
+z.string.ro.conversation_asset_upload_failed = 'Încărcarea a eșuat'
+z.string.ro.conversation_asset_upload_too_large = 'Poți trimite fișiere până la %no'
+z.string.ro.conversation_playback_error = 'Nu se poate reda'
+z.string.ro.conversation_context_menu_edit = 'Editare'
+z.string.ro.conversation_context_menu_delete = 'Șterge pentru mine'
+z.string.ro.conversation_context_menu_delete_everyone = 'Șterge pentru toată lumea'
+z.string.ro.conversation_context_menu_download = 'Descarcă'
+z.string.ro.conversation_context_menu_like = 'Apreciază'
+z.string.ro.conversation_context_menu_unlike = 'Nu-mi mai place'
+z.string.ro.conversation_delete_timestamp = 'A fost șters la %@timestamp'
+z.string.ro.conversation_edit_timestamp = 'A fost editat la %@timestamp'
+z.string.ro.conversation_likes_caption = '%@number persoane'
+
+# Archive
+z.string.ro.archive_header = 'Arhivă'
+
+# Conversations
+z.string.ro.conversations_all_archived = 'Totul a fost arhivat'
+z.string.ro.conversations_contacts = 'Contacte'
+z.string.ro.conversations_connection_request_many = '%no persoane așteaptă'
+z.string.ro.conversations_connection_request_one = '1 persoană așteaptă'
+z.string.ro.conversations_empty_conversation = 'Conversație goală'
+z.string.ro.conversations_no_conversations = 'Începe o conversație sau invită persoane să se alăture.'
+z.string.ro.conversations_popover_archive = 'Arhivă'
+z.string.ro.conversations_popover_block = 'Blochează'
+z.string.ro.conversations_popover_cancel = 'Anulează cererea'
+z.string.ro.conversations_popover_clear = 'Șterge'
+z.string.ro.conversations_popover_leave = 'Ieși'
+z.string.ro.conversations_popover_notify = 'Demutizează'
+z.string.ro.conversations_popover_silence = 'Mutizează'
+z.string.ro.conversations_popover_unarchive = 'Dezarhivează'
+
+# Invites
+z.string.ro.invite_meta_key_mac = 'Cmd'
+z.string.ro.invite_meta_key_pc = 'Ctrl'
+z.string.ro.invite_hint_selected = 'Apasă %meta_key + C pentru a copia'
+z.string.ro.invite_hint_unselected = 'Selectează și apasă %meta_key + C'
+z.string.ro.invite_detail = 'Linkul poate fi folosit timp de 2 săptămâni.'
+z.string.ro.invite_headline = 'Invită persoane pe Wire'
+z.string.ro.invite_message = 'Sunt pe Wire. Caută după %mail sau vizitează https://get.wire.com pentru a te conecta cu mine.'
+z.string.ro.invite_message_no_email = 'Sunt pe Wire. Vizitează https://get.wire.com pentru a te conecta cu mine.'
+
+# Extensions
+z.string.ro.extensions_bubble_button_gif = 'Gif'
+
+# Extensions Giphy
+z.string.ro.extensions_giphy_button_ok = 'Trimite'
+z.string.ro.extensions_giphy_button_more = 'Încearcă altul'
+z.string.ro.extensions_giphy_message = '%tag • via giphy.com'
+z.string.ro.extensions_giphy_no_gifs = 'Ups, nu sunt gif-uri'
+z.string.ro.extensions_giphy_random = 'La întâmplare'
+
+# People View
+z.string.ro.search_open = 'Deschide'
+z.string.ro.search_open_group = 'Creează grup'
+z.string.ro.people_confirm_label = 'Adaugă la conversație'
+z.string.ro.people_common_contacts = 'Amândoi cunoașteți'
+z.string.ro.people_people = '%no persoane'
+z.string.ro.people_search_placeholder = 'Caută după nume'
+z.string.ro.people_everyone_participates = 'Toată lumea cu care\nești conectat este deja\nîn această conversație.'
+z.string.ro.people_no_matches = 'Nu s-a găsit nimic.\nÎncearcă să scrii un alt nume.'
+z.string.ro.people_invite = 'Invită persoane'
+z.string.ro.people_share = 'Împărtășește contacte'
+z.string.ro.people_bring_your_friends = 'Invită prietenii pe Wire'
+z.string.ro.people_invite_detail = 'Împărtășirea contactelor ne ajută să te conectăm cu alții. Vom anonimiza toate informațiile și nu le vom împărtăși cu nimeni altcineva.'
+z.string.ro.people_invite_button_contacts = 'Din Contacte'
+z.string.ro.people_invite_button_gmail = 'Din Gmail'
+z.string.ro.people_invite_headline = 'Invită prietenii'
+z.string.ro.people_tabs_details = 'Detalii'
+z.string.ro.people_tabs_devices = 'Dispozitive'
+z.string.ro.people_tabs_devices_headline = 'Wire oferă fiecărui dispozitiv o amprentă unică. Compară amprentele cu %@.name și verifică conversația.'
+z.string.ro.people_tabs_devices_why_verify = 'De ce să verific această conversație?'
+z.string.ro.people_tabs_no_devices_headline = '%@.name folosește o versiune veche de Wire. Nu sunt afișate dispozitive.'
+z.string.ro.people_tabs_device_detail_all_my_devices = 'Arată toate dispozitivele mele'
+z.string.ro.people_tabs_device_detail_device_fingerprint = 'Amprentă dispozitiv'
+z.string.ro.people_tabs_device_detail_headline = 'Verifică dacă aceasta se potrivește cu amprenta arătată în dispozitivul %end al lui %bold%@.name.'
+z.string.ro.people_tabs_device_detail_how_to = 'Cum fac asta?'
+z.string.ro.people_tabs_device_detail_reset_session = 'Resetează sesiunea'
+z.string.ro.people_tabs_device_detail_show_my_device = 'Arată amprenta dispozitivului'
+z.string.ro.people_tabs_device_detail_verified = 'Verificat'
+
+# Block user
+z.string.ro.people_block_headline = 'Blochează?'
+z.string.ro.people_block_message = '%@.first_name nu te va putea găsi sau contacta pe Wire.'
+
+# Accept a pending connection dialogue
+z.string.ro.people_connect_headline = 'Acceptă?'
+z.string.ro.people_connect_message = 'Aceasta te va conecta și va deschide o conversație cu %@.first_name.'
+
+# Cancel a pending request
+z.string.ro.people_cancel_request_headline = 'Anulează solicitarea?'
+z.string.ro.people_cancel_request_message = 'Șterge solicitarea de conectare cu %@.first_name.'
+
+# Leave the conversation dialogue
+z.string.ro.people_leave_headline = 'Părăsește conversația?'
+z.string.ro.people_leave_message = 'Nu vei mai putea trimite sau primi mesaje în această conversație.'
+
+# Remove from conversation dialogue
+z.string.ro.people_remove_headline = 'Șterge?'
+z.string.ro.people_remove_message = '%@.first_name nu va mai putea trimite sau primi mesaje în această conversație.'
+
+# Unblock user
+z.string.ro.people_unblock_headline = 'Deblochează?'
+z.string.ro.people_unblock_message = '%@.first_name te va putea găsi și contacta din nou pe Wire. Vei putea primi și mesajele pe care le-a trimis atunci când era blocat.'
+
+# Button labels for the actions
+z.string.ro.people_button_add = 'Adaugă persoane'
+z.string.ro.people_button_block = 'Blochează'
+z.string.ro.people_button_cancel = 'Renunță'
+z.string.ro.people_button_connect = 'Conectare'
+z.string.ro.people_button_create = 'Creează grup'
+z.string.ro.people_button_ignore = 'Ignoră'
+z.string.ro.people_button_leave = 'Ieși'
+z.string.ro.people_button_open = 'Deschide conversația'
+z.string.ro.people_button_pending = 'În așteptare'
+z.string.ro.people_button_profile = 'Profil'
+z.string.ro.people_button_remove = 'Șterge'
+z.string.ro.people_button_unblock = 'Deblochează'
+z.string.ro.people_button_no = 'Nu'
+z.string.ro.people_button_yes = 'Da'
+
+# Settings
+z.string.ro.preferences_about = 'Despre'
+z.string.ro.preferences_account = 'Cont'
+z.string.ro.preferences_device_details = 'Detalii dispozitiv'
+z.string.ro.preferences_devices = 'Dispozitive'
+z.string.ro.preferences_headline = 'Preferințe'
+z.string.ro.preferences_options = 'Opțiuni'
+
+z.string.ro.preferences_about_copyright = '© Wire Swiss GmbH'
+z.string.ro.preferences_about_privacy_policy = 'Politică de confidențialitate'
+z.string.ro.preferences_about_support = 'Suport'
+z.string.ro.preferences_about_support_website = 'Site de suport'
+z.string.ro.preferences_about_support_contact = 'Contactează echipa de asistență'
+z.string.ro.preferences_about_terms_of_use = 'Termeni de folosire'
+z.string.ro.preferences_about_version = 'Versiune %version'
+z.string.ro.preferences_about_website = 'Site web Wire'
+
+z.string.ro.preferences_account_reset_password = 'Resetează parola'
+z.string.ro.preferences_account_delete = 'Șterge contul'
+z.string.ro.preferences_account_log_out = 'Deconectare'
+z.string.ro.preferences_account_username_placeholder = 'Numele tău complet'
+
+z.string.ro.preferences_devices_activated_in = 'în %location'
+z.string.ro.preferences_devices_activated_on = 'Activat la %time'
+z.string.ro.preferences_devices_active = 'Activ'
+z.string.ro.preferences_devices_active_detail = 'Dacă nu recunoști un dispozitiv de mai sus, elimină-l și resetează parola.'
+z.string.ro.preferences_devices_current = 'Curent'
+z.string.ro.preferences_devices_fingerprint = 'Amprentă cheie'
+z.string.ro.preferences_devices_fingerprint_detail = 'Wire generează câte o amprentă unică pentru fiecare dispozitiv. Compară-le și verifică dispozitivele și conversațiile tale.'
+z.string.ro.preferences_devices_id = 'ID: '
+z.string.ro.preferences_devices_remove = 'Șterge'
+z.string.ro.preferences_devices_remove_cancel = 'Renunță'
+z.string.ro.preferences_devices_remove_detail = 'Elimină acest dispozitiv dacă nu-l mai folosești. Istoricul mesajelor tale va fi șters de pe acest dispozitiv și vei fi deconectat.'
+z.string.ro.preferences_devices_session_confirmation = 'Sesiunea a fost resetată.'
+z.string.ro.preferences_devices_session_detail = 'Dacă amprentele nu se potrivesc, resetează sesiunea pentru a genera un nou set de chei de criptare pentru ambele părți.'
+z.string.ro.preferences_devices_session_reset = 'Resetează sesiunea'
+z.string.ro.preferences_devices_session_ongoing = 'Se resetează sesiunea…'
+z.string.ro.preferences_devices_verification = 'Verificat'
+
+z.string.ro.preferences_options_contacts = 'Contacte'
+z.string.ro.preferences_options_contacts_gmail = 'Importă din Gmail'
+z.string.ro.preferences_options_contacts_macos = 'Importă din contacte'
+z.string.ro.preferences_options_contacts_detail = 'Vom folosi datele tale de contact pentru a te conecta cu alții. Vom anonimiza toate informațiile și nu le vom împărtăși cu altcineva.'
+z.string.ro.preferences_options_data = 'Rapoarte de folosire și de avarie'
+z.string.ro.preferences_options_data_checkbox = 'Rapoarte de folosire și de avarie'
+z.string.ro.preferences_options_data_detail = 'Ajută la îmbunătățirea Wire prin trimiterea de informații anonime.'
+z.string.ro.preferences_options_sound = 'Alerte sonore'
+z.string.ro.preferences_options_sound_all = 'Toate'
+z.string.ro.preferences_options_sound_all_detail = 'Toate sunetele'
+z.string.ro.preferences_options_sound_none = 'Niciunul'
+z.string.ro.preferences_options_sound_none_detail = 'Psst!'
+z.string.ro.preferences_options_sound_some = 'Unele'
+z.string.ro.preferences_options_sound_some_detail = 'Pinguri și apeluri'
+
+# Search
+z.string.ro.search_group_hint = 'Mai încearcă sau alege persoanele cu care să creezi un grup'
+z.string.ro.search_connect = 'Conectare'
+z.string.ro.search_connections = 'Conexiuni'
+z.string.ro.search_groups = 'Grupuri'
+z.string.ro.search_placeholder = 'Caută după nume sau e-mail'
+z.string.ro.search_top_people = 'Top persoane'
+z.string.ro.search_try_search = 'Caută persoane după nule sau\ndupă adresa de e-mail completă'
+z.string.ro.search_no_contacts_on_wire = 'Nu ai contacte cu Wire.\nÎncearcă să găsești persoane după nume\nsau adresa de e-mail completă'
+z.string.ro.search_others = 'Conectare'
+z.string.ro.search_suggestion_one = 'Cunoaște pe %@.first_name'
+z.string.ro.search_suggestion_two = 'Cunoaște pe %@.first_name și %@.other_name'
+z.string.ro.search_suggestion_many = 'Cunoaște pe %@.first_name și %no alții'
+
+# Picture upload
+z.string.ro.upload_welcome = 'Wire arată mult mai bine cu o poză.'
+z.string.ro.upload_welcome_keep = 'păstrează poza aceasta'
+z.string.ro.upload_welcome_choose = 'alege poza proprie'
+
+# Google contacts upload
+z.string.ro.upload_google_headline = 'Caută persoane\ncu care să vorbești.'
+z.string.ro.upload_google_message = 'Vom folosi datele tale de contact pentru a te conecta cu alții. Vom anonimiza toate informațiile și nu le vom împărtăși cu altcineva.'
+z.string.ro.upload_google_headline_error = 'Ceva\na mers prost.'
+z.string.ro.upload_google_message_error = 'Nu am primit nicio informație. Încearcă importarea contactelor din nou.'
+z.string.ro.upload_google_button_again = 'Reîncearcă'
+
+# URLs
+z.string.ro.url_password_reset = 'https://wire.com/forgot/'
+z.string.ro.url_legal = 'https://wire.com/legal/'
+z.string.ro.url_privacy = 'https://wire.com/privacy/'
+z.string.ro.url_privacy_why = 'https://wire.com/privacy/why/'
+z.string.ro.url_support = 'https://support.wire.com'
+z.string.ro.url_terms_of_use = 'https://wire.com/legal/terms/'
+z.string.ro.url_wire = 'https://wire.com'
+z.string.ro.url_wire_for_web = 'https://app.wire.com'
+z.string.ro.url_support_calling = 'https://support.wire.com/hc/en-us/articles/202969412'
+z.string.ro.url_support_camera_access_denied = 'https://support.wire.com/hc/en-us/articles/202935412'
+z.string.ro.url_support_contact = 'https://support.wire.com/hc/en-us/requests/new'
+z.string.ro.url_support_contact_bug = 'https://support.wire.com/hc/en-us/requests/new?ticket_form_id=101615'
+z.string.ro.url_support_history = 'https://support.wire.com/hc/en-us/articles/207834645'
+z.string.ro.url_support_mic_access_denied = 'https://support.wire.com/hc/en-us/articles/202590081'
+z.string.ro.url_support_mic_not_found = 'https://support.wire.com/hc/en-us/articles/202970662'
+z.string.ro.url_support_screen_access_denied = 'https://support.wire.com/hc/en-us/articles/202935412'
+z.string.ro.url_support_screen_whitelist = 'https://support.wire.com/hc/en-us/articles/209423889'
+z.string.ro.url_decrypt_error_1 = 'https://wire.com/privacy/error-1'
+z.string.ro.url_decrypt_error_2 = 'https://wire.com/privacy/error-2'
+
+# Warnings: Permission requests & permission callbacks
+z.string.ro.warning_call_detail = 'Browserul tău are nevoie de acces la microfon pentru a face apeluri.'
+z.string.ro.warning_call_headline = 'Nu se poate apela fără microfon'
+z.string.ro.warning_call_unsupported_incoming = '%s.first_name te sună. Browserul tău nu suportă apelurile.'
+z.string.ro.warning_call_unsupported_outgoing = 'Nu poți suna pentru că browserul tău nu suportă apelurile.'
+z.string.ro.warning_call_issues = 'Această versiune de Wire nu poate participa într-un apel. Te rugăm să folosești'
+z.string.ro.warning_call_upgrade_browser = 'Pentru a suna, te rugăm să actualizezi Google Chrome.'
+z.string.ro.warning_learn_more = 'Află mai multe'
+z.string.ro.warning_not_found_camera = 'Nu poți suna pentru că acest dispozitiv nu are o cameră.'
+z.string.ro.warning_not_found_microphone = 'Nu poți suna pentru că acest dispozitiv nu are un microfon.'
+z.string.ro.warning_permission_denied_camera = 'Nu poți suna pentru că browserul tău nu are acces la cameră.'
+z.string.ro.warning_permission_denied_microphone = 'Nu poți suna pentru că browserul tău nu are acces la microfon.'
+z.string.ro.warning_permission_denied_screen = 'Nu poți împărtăși ecranul pentru că browserul nu-l poate accesa.'
+z.string.ro.warning_permission_request_camera = '%icon permite accesul la cameră'
+z.string.ro.warning_permission_request_microphone = '%icon permit accesul la microfon'
+z.string.ro.warning_permission_request_notification = '%icon permite notificările'
+z.string.ro.warning_permission_request_screen = '%icon permite accesul la ecran'
+z.string.ro.warning_tell_me_how = 'Spune-mi cum'
+
+# Warnings: Connectivity
+z.string.ro.warning_connectivity_connection_lost = 'Se încearcă conectarea. Wire ar putea să nu trimită mesaje în acest timp.'
+z.string.ro.warning_connectivity_no_internet = 'Nu este conexiune la internet. Nu vei putea trimite sau primi mesaje.'
+
+# Browser notifications
+z.string.ro.system_notification_asset_add = 'A împărtășit o imagine'
+z.string.ro.system_notification_connection_accepted = 'A acceptat cererea de conectare a ta'
+z.string.ro.system_notification_connection_request = 'Așteaptă conectarea'
+z.string.ro.system_notification_conversation_create = '%s.first_name a început o conversație'
+z.string.ro.system_notification_conversation_rename = '%s.first_name a redenumit conversația în %name'
+z.string.ro.system_notification_member_join_many = '%s.first_name a adăugat %no persoane la conversație'
+z.string.ro.system_notification_member_join_one = '%s.first_name a adăugat pe %@.first_name la conversație'
+z.string.ro.system_notification_member_leave_left = '%s.first_name a părăsit conversația'
+z.string.ro.system_notification_member_leave_removed_many = '%s.first_name a scos %no persoane din conversație'
+z.string.ro.system_notification_member_leave_removed_one = '%s.first_name a scos pe %@.first_name din conversație'
+z.string.ro.system_notification_ping = 'Pinguit'
+z.string.ro.system_notification_reaction = '%reacție la mesajul tău'
+z.string.ro.system_notification_shared_audio = 'A împărtășit un mesaj audio'
+z.string.ro.system_notification_shared_file = 'A distribuit un fișier'
+z.string.ro.system_notification_shared_location = 'A distribuit o locație'
+z.string.ro.system_notification_shared_video = 'A distribuit un video'
+z.string.ro.system_notification_voice_channel_activate = 'Se sună'
+z.string.ro.system_notification_voice_channel_deactivate = 'Apel în curs'
+
+# Tooltips
+z.string.ro.tooltip_conversation_all_verified = 'Toate amprentele sunt verificate'
+z.string.ro.tooltip_conversation_call = 'Sună'
+z.string.ro.tooltip_conversation_ephemeral = 'Mesaj temporizat'
+z.string.ro.tooltip_conversation_file = 'Adaugă fișier'
+z.string.ro.tooltip_conversation_input_placeholder = 'Scrie un mesaj'
+z.string.ro.tooltip_conversation_people = 'Persoane (%shortcut)'
+z.string.ro.tooltip_conversation_picture = 'Adaugă poză'
+z.string.ro.tooltip_conversation_ping = 'Ping (%shortcut)'
+z.string.ro.tooltip_conversation_video_call = 'Apel video'
+
+z.string.ro.tooltip_conversations_archive = 'Arhivează (%shortcut)'
+z.string.ro.tooltip_conversations_archived = 'Arată arhiva (%no)'
+z.string.ro.tooltip_conversations_more = 'Mai multe'
+z.string.ro.tooltip_conversations_notify = 'Demutizează (%shortcut)'
+z.string.ro.tooltip_conversations_silence = 'Mutizează (%shortcut)'
+z.string.ro.tooltip_conversations_tooltip_start = 'Începe conversația (%shortcut)'
+
+z.string.ro.tooltip_people_add = 'Adaugă persoane la conversație (%shortcut)'
+z.string.ro.tooltip_people_back = 'Înapoi'
+z.string.ro.tooltip_people_block = 'Blochează'
+z.string.ro.tooltip_people_connect = 'Conectare'
+z.string.ro.tooltip_people_leave = 'Părăsește conversația'
+z.string.ro.tooltip_people_open = 'Deschide conversația'
+z.string.ro.tooltip_people_profile = 'Deschide profilul tău'
+z.string.ro.tooltip_people_rename = 'Schimbă numele conversației'
+z.string.ro.tooltip_people_remove = 'Elimină din conversație'
+z.string.ro.tooltip_people_unblock = 'Deblochează'
+
+z.string.ro.tooltip_preferences_contacts_gmail = 'Autentifică-te în conturile Gmail pentru a partaja contacte'
+z.string.ro.tooltip_preferences_contacts_macos = 'Partajează toate contactele de pe aplicația Contacts din macOS'
+z.string.ro.tooltip_preferences_password = 'Deschide un alt site web pentru a reseta parola'
+z.string.ro.tooltip_preferences_picture = 'Schimbă poza de profil…'
+z.string.ro.tooltip_preferences_rename = 'Schimbă numele tău'
+
+z.string.ro.tooltip_search_close = 'Închide (Esc)'
+
+# App loading
+z.string.ro.init_received_access_token = 'Acces permis'
+z.string.ro.init_received_self_user = 'Bună, %name.'
+z.string.ro.init_sessions_expectation = 'Trebuie să inițializăm %sessions sesiuni'
+z.string.ro.init_sessions_expectation_long = 'Trebuie să inițializăm %sessions sesiuni'
+z.string.ro.init_sessions_progress = 'Se inițializează sesiunile - %progress din %total'
+z.string.ro.init_initialized_storage = 'Sesiunile s-au încărcat'
+z.string.ro.init_initialized_cryptography = 'Criptografia a fost configurată complet'
+z.string.ro.init_validated_client = 'Se încarcă conexiunile și conversațiile tale'
+z.string.ro.init_received_user_data = 'Verifică dacă sunt mesaje noi'
+z.string.ro.init_events_expectation = 'Ai %events noi mesaje'
+z.string.ro.init_events_expectation_long = 'Se încarcă %events noi mesaje'
+z.string.ro.init_events_progress = 'Se încacrcă mesajele - %progress din %total'
+z.string.ro.init_updated_from_notifications = 'Ești foarte aproape'
+z.string.ro.init_app_pre_loaded = 'Bucură-te de Wire'
+
+z.string.ro.ephememal_units_second = 'secundă'
+z.string.ro.ephememal_units_seconds = 'secunde'
+z.string.ro.ephememal_units_minute = 'minut'
+z.string.ro.ephememal_units_minutes = 'minute'
+z.string.ro.ephememal_units_day = 'zi'
+z.string.ro.ephememal_units_days = 'zile'
diff --git a/app/script/localization/strings-ru.coffee b/app/script/localization/strings-ru.coffee
new file mode 100644
index 00000000000..6aefd4feeb1
--- /dev/null
+++ b/app/script/localization/strings-ru.coffee
@@ -0,0 +1,581 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+#General terms
+z.string.ru.wire_macos = 'Wire для macOS'
+z.string.ru.wire_windows = 'Wire для Windows'
+z.string.ru.wire_linux = 'Wire для Linux'
+z.string.ru.nonexistent_user = 'Удалённый пользователь'
+z.string.ru.and = 'и'
+
+# Alert view when trying to set a profile image that's too small
+z.string.ru.alert_upload_file_format = 'Не удаётся использовать это изображение.\nПожалуйста, выберите изображение в формате PNG или JPEG.'
+z.string.ru.alert_upload_too_small = 'Не удаётся использовать это изображение.\nПожалуйста, выберите изображение размером не менее 320×320 пикселей.'
+z.string.ru.alert_upload_too_large = 'Это изображение слишком большое.\nВы можете загружать файлы размером до %no МБ.'
+z.string.ru.alert_gif_too_large = 'Анимация слишком большая. \nМаксимальный размер %no МБ.'
+
+# Auth
+# Authentication: ACCOUNT section
+z.string.ru.auth_account_country_code = 'Код страны'
+z.string.ru.auth_account_create = 'Создать'
+z.string.ru.auth_account_create_account = 'Создать аккаунт'
+z.string.ru.auth_account_expiration = 'Вы были отключены, потому что срок действия вашей сессии истёк. Пожалуйста, войдите снова.'
+z.string.ru.auth_account_get_wire = 'Простой, конфиденциальный и безопасный мессенджер для разговоров, звонков, обмена картинками, музыкой, видео, GIF-ками и многого другого.'
+z.string.ru.auth_account_password_forgot = 'Восстановление пароля'
+z.string.ru.auth_account_remember_me = 'Запомнить меня'
+z.string.ru.auth_account_sign_in = 'Вход'
+z.string.ru.auth_account_sign_in_email = 'Email'
+z.string.ru.auth_account_sign_in_phone = 'Телефон'
+z.string.ru.auth_account_terms_of_use = 'Условия использования'
+z.string.ru.auth_account_terms_of_use_detail = 'Я принимаю'
+
+# Authentication: VERIFY section
+z.string.ru.auth_verify_account_add = 'Добавить'
+z.string.ru.auth_verify_account_detail = 'Это позволит использовать Wire на нескольких устройствах.'
+z.string.ru.auth_verify_account_headline = 'Добавить email и пароль.'
+z.string.ru.auth_verify_account_logout = 'Выход'
+z.string.ru.auth_verify_code_description = 'Введите код подтверждения,\nкоторый мы отправили на %@.'
+z.string.ru.auth_verify_code_resend = 'Не приходит код?'
+z.string.ru.auth_verify_code_resend_detail = 'Отправить повторно'
+z.string.ru.auth_verify_code_resend_timer = 'Вы можете запросить новый код %expiration.'
+z.string.ru.auth_verify_code_change_phone = 'Изменить номер телефона'
+z.string.ru.auth_verify_password_headline = 'Введите свой пароль'
+
+# Authentication: limit section
+z.string.ru.auth_limit_devices_headline = 'Устройства'
+z.string.ru.auth_limit_description = 'Удалите одно из ваших устройств для того, чтобы начать использовать Wire на этом.'
+z.string.ru.auth_limit_button_manage = 'Управление устройствами'
+z.string.ru.auth_limit_button_sign_out = 'Выход'
+z.string.ru.auth_limit_devices_current = '(Текущее)'
+
+# Authentication: limit section
+z.string.ru.auth_history_headline = 'Вы впервые используете Wire на этом устройстве.'
+z.string.ru.auth_history_description = 'Из соображений конфиденциальности история ваших разговоров не будет показана здесь.'
+z.string.ru.auth_history_button = 'OK'
+
+# Authentication: POSTED section
+z.string.ru.auth_posted_change_email = 'Изменить адрес электронной почты'
+z.string.ru.auth_posted_offline_detail = 'Пожалуйста, проверьте подключение к интернету и повторите попытку.'
+z.string.ru.auth_posted_offline_headline = 'Wire лучше, когда в сети.'
+z.string.ru.auth_posted_pending_detail = 'Проверьте ваш почтовый ящик или повторите процедуру активации.'
+z.string.ru.auth_posted_pending_headline = 'Учетная запись уже ожидает верификации'
+z.string.ru.auth_posted_resend = 'Отправить снова на %email'
+z.string.ru.auth_posted_resend_action = 'Не приходит письмо?'
+z.string.ru.auth_posted_resend_detail = 'Проверьте свой почтовый ящик и следуйте инструкциям.'
+z.string.ru.auth_posted_resend_headline = 'Вам письмо.'
+z.string.ru.auth_posted_retry = 'Попробовать еще раз и отправить письмо на %email'
+z.string.ru.auth_posted_retry_action = 'Попробовать снова?'
+z.string.ru.auth_posted_retry_detail = 'Пожалуйста, попробуйте еще раз.'
+z.string.ru.auth_posted_retry_headline = 'Что-то пошло не так'
+z.string.ru.auth_posted_verify_later = 'Верифицировать позже'
+
+#Authentication: Misc
+z.string.ru.auth_placeholder_email = 'Email'
+z.string.ru.auth_placeholder_name = 'Имя'
+z.string.ru.auth_placeholder_password_put = 'Пароль'
+z.string.ru.auth_placeholder_password_set = 'Пароль (минимум 8 символов)'
+z.string.ru.auth_placeholder_phone = 'Номер телефона'
+
+# Authentication: Validation errors
+z.string.ru.auth_error_code = 'Неверный код'
+z.string.ru.auth_error_country_code_invalid = 'Неверный код страны'
+z.string.ru.auth_error_email_exists = 'Такой email уже используется'
+z.string.ru.auth_error_email_forbidden = 'Извините, этот адрес электронной почты запрещен.'
+z.string.ru.auth_error_email_malformed = 'Пожалуйста, введите правильный email.'
+z.string.ru.auth_error_email_missing = 'Пожалуйста, введите email.'
+z.string.ru.auth_error_misc = 'Проблемы с подключением. Пожалуйста, попробуйте еще раз.'
+z.string.ru.auth_error_name_short = 'Введите имя с минимум 2 символами'
+z.string.ru.auth_error_offline = 'Отсутствует подключение к интернету'
+z.string.ru.auth_error_password_short = 'Выберите пароль длиной не менее 8 символов.'
+z.string.ru.auth_error_password_wrong = 'Неправильный пароль. Пожалуйста, попробуйте еще раз.'
+z.string.ru.auth_error_phone_number_forbidden = 'Извините, этот номер телефона запрещён.'
+z.string.ru.auth_error_phone_number_invalid = 'Неправильный номер телефона'
+z.string.ru.auth_error_phone_number_unknown = 'Неизвестный номер телефона'
+z.string.ru.auth_error_sign_in = 'Пожалуйста, проверьте ваши данные\nи попробуйте еще раз.'
+
+# Call stuff
+z.string.ru.call_state_outgoing = 'Звонит…'
+z.string.ru.call_state_connecting = 'Подключение…'
+z.string.ru.call_state_incoming = 'Звонит…'
+z.string.ru.call_decline = 'Отменить'
+z.string.ru.call_accept = 'Принять'
+z.string.ru.call_join = 'Присоединиться'
+z.string.ru.call_choose_shared_screen = 'Выберите экран для демонстрации'
+
+# Warnings
+z.string.ru.modal_button_cancel = 'Отменить'
+z.string.ru.modal_button_ok = 'OK'
+z.string.ru.modal_button_send = 'Отправить'
+
+# Block a user
+z.string.ru.modal_block_conversation_headline = 'Заблокировать %@.name?'
+z.string.ru.modal_block_conversation_message = '%@.name не сможет связаться с вами или пригласить вас в групповой разговор.'
+z.string.ru.modal_block_conversation_button = 'Заблокировать'
+# Cannot create the call because there is nobody to call (conversation_empty)
+z.string.ru.modal_call_conversation_empty_headline = 'Некому звонить'
+z.string.ru.modal_call_conversation_empty_message = 'Здесь никого не осталось.'
+# Cannot create the call because there are too many participants (conversation_full)
+z.string.ru.modal_call_conversation_full_headline = 'Слишком много людей для группового звонка'
+z.string.ru.modal_call_conversation_full_message = 'Звонки работают в разговорах до %no участников.'
+# Cannot video call in group conversations
+z.string.ru.modal_call_no_video_in_group_headline = 'В группах нет видеозвонков'
+z.string.ru.modal_call_no_video_in_group_message = 'Видеозвонки недоступны в групповых беседах.'
+# Second incoming call
+z.string.ru.modal_call_second_incoming_headline = 'Ответить на звонок?'
+z.string.ru.modal_call_second_incoming_message = 'Ваш текущий звонок будет завершен.'
+z.string.ru.modal_call_second_incoming_action = 'Ответить'
+# Second ongoing call
+z.string.ru.modal_call_second_ongoing_headline = 'Завершить звонок на другом устройстве?'
+z.string.ru.modal_call_second_ongoing_message = 'Вы можете одновременно находиться только в одном вызове.'
+z.string.ru.modal_call_second_ongoing_action = 'Завершить вызов'
+# Second outgoing call
+z.string.ru.modal_call_second_outgoing_headline = 'Завершить текущий звонок?'
+z.string.ru.modal_call_second_outgoing_message = 'Вы можете одновременно находиться только в одном вызове.'
+z.string.ru.modal_call_second_outgoing_action = 'Завершить вызов'
+# Cannot join the call because there are too many participants (voice_channel_full)
+z.string.ru.modal_call_voice_channel_full_headline = 'Канал переполнен'
+z.string.ru.modal_call_voice_channel_full_message = 'Здесь хватит места только для %no человек.'
+# Clear a conversation
+z.string.ru.modal_clear_conversation_headline = 'Удалить историю разговоров с "%@.name"?'
+z.string.ru.modal_clear_conversation_message = 'Это действие очистит историю разговора и удалит его из списка.'
+z.string.ru.modal_clear_conversation_option = 'Также покинуть разговор'
+z.string.ru.modal_clear_conversation_button = 'Удалить'
+# Connected device
+z.string.ru.modal_connected_device_headline = 'Ваш аккаунт использовался:'
+z.string.ru.modal_connected_device_from = 'Устройство:'
+z.string.ru.modal_connected_device_message = 'Если это были не Вы, удалите устройство и измените ваш пароль.'
+z.string.ru.modal_connected_device_manage_devices = 'Управление устройствами'
+# Delete account
+z.string.ru.modal_delete_account_action = 'Удалить'
+z.string.ru.modal_delete_account_headline = 'Удалить аккаунт'
+z.string.ru.modal_delete_account_message = 'Мы вышлем вам сообщение по электронной почте или SMS. Перейдите по ссылке, чтобы навсегда удалить свой аккаунт.'
+# Delete message
+z.string.ru.modal_delete_button = 'Удалить'
+z.string.ru.modal_delete_headline = 'Удалить только для меня?'
+z.string.ru.modal_delete_message = 'Действие не может быть отменено.'
+# Delete message
+z.string.ru.modal_delete_everyone_button = 'Удалить'
+z.string.ru.modal_delete_everyone_headline = 'Удалить для всех?'
+z.string.ru.modal_delete_everyone_message = 'Действие не может быть отменено.'
+# Too long message
+z.string.ru.modal_too_long_headline = 'Сообщение слишком длинное'
+z.string.ru.modal_too_long_message = 'Вы можете отправлять сообщения длиной до %no символов.'
+# Leave a conversation
+z.string.ru.modal_leave_conversation_headline = 'Покинуть разговор "%@.name"?'
+z.string.ru.modal_leave_conversation_message = 'Участники будут уведомлены и разговор будет удален из вашего списка.'
+z.string.ru.modal_leave_conversation_button = 'Покинуть'
+# Logout
+z.string.ru.modal_logout_headline = 'Удалить данные?'
+z.string.ru.modal_logout_message = 'Удалить все ваши личные данные и разговоры на этом устройстве.'
+z.string.ru.modal_logout_button = 'Выход'
+# New device
+z.string.ru.modal_new_device_headline = '"%@.name" начал(а) использовать новое устройство'
+z.string.ru.modal_new_device_message = 'Вы всё ещё хотите отправить ваши сообщения?'
+z.string.ru.modal_new_device_show_device = 'показать устройство'
+z.string.ru.modal_new_device_send_anyway = 'отправить всё равно'
+# Remove device
+z.string.ru.modal_remove_device_button = 'Удалить устройство'
+z.string.ru.modal_remove_device_headline = 'Удалить "%device_name"'
+z.string.ru.modal_remove_device_message = 'Для удаления устройства требуется пароль.'
+# Session Reset
+z.string.ru.modal_session_reset_headline = 'Сессия была сброшена'
+z.string.ru.modal_session_reset_message_1 = 'Если проблема не решена,'
+z.string.ru.modal_session_reset_message_link = 'cвяжитесь'
+z.string.ru.modal_session_reset_message_2 = 'с нами.'
+# Too many members in conversation
+z.string.ru.modal_too_many_members_headline = 'Канал переполнен'
+z.string.ru.modal_too_many_members_message = 'К разговору может присоединиться до %max человек. Здесь хватит места ещё для %no человек.'
+# Whitelist screensharing
+z.string.ru.modal_whitelist_screensharing_headline = 'Wire требуется разрешение для демонстрации экрана'
+z.string.ru.modal_whitelist_screensharing_message_1 = 'Откройте about:config и добавьте *.wire.com в список разрешённых доменов для демонстрации экрана. Смотрите'
+z.string.ru.modal_whitelist_screensharing_message_link = 'Вопросы и ответы'
+z.string.ru.modal_whitelist_screensharing_message_2 = 'для уточнения деталей.'
+# Parallel uploads
+z.string.ru.modal_uploads_parallel = 'Вы можете отправить до %no файлов за раз.'
+
+# Connection requests
+z.string.ru.connection_request_connect = 'Связаться'
+z.string.ru.connection_request_ignore = 'Игнорировать'
+z.string.ru.connection_request_message = 'Привет, %@.first_name.\nДавай свяжемся в Wire.\n%s.first_name'
+
+# Conversation
+z.string.ru.conversation_you_nominative = 'вы'
+z.string.ru.conversation_you_dative = 'вам'
+z.string.ru.conversation_you_accusative = 'вас'
+
+z.string.ru.conversation_connection_accepted = 'Подключен(а)'
+z.string.ru.conversation_connection_blocked = 'Заблокирован(а)'
+z.string.ru.conversation_connection_cancel_request = 'Отменить запрос'
+z.string.ru.conversation_create = ' начал(а) разговор с %@names'
+z.string.ru.conversation_create_you = ' начал(а) разговор с %@names'
+z.string.ru.conversation_device_started_using = ' начал(а) использовать'
+z.string.ru.conversation_device_started_using_you = ' начал(а) использовать'
+z.string.ru.conversation_device_unverified = ' деверифицировал(а) одно из'
+z.string.ru.conversation_device_your_devices = ' ваши устройства'
+z.string.ru.conversation_device_user_devices = 'Устройства, принадлежащие %@name'
+z.string.ru.conversation_device_a_new_device = ' новое устройство'
+z.string.ru.conversation_just_now = 'Только что'
+z.string.ru.conversation_location_link = 'Открыть карту'
+z.string.ru.conversation_member_join = ' добавил(а) %@names'
+z.string.ru.conversation_member_join_you = ' добавил(а) %@names'
+z.string.ru.conversation_member_leave_left = ' покинул(а)'
+z.string.ru.conversation_member_leave_left_you = ' покинул(а)'
+z.string.ru.conversation_member_leave_removed = ' удалил(а) %@names'
+z.string.ru.conversation_member_leave_removed_you = ' удалил(а) %@names'
+z.string.ru.conversation_message_delivered = 'Доставлено'
+z.string.ru.conversation_rename = ' переименовал(а) разговор'
+z.string.ru.conversation_rename_you = ' переименовал(а) разговор'
+z.string.ru.conversation_resume = 'Начать разговор с %@names'
+z.string.ru.conversation_ping = ' отправил(а) пинг'
+z.string.ru.conversation_ping_you = ' отправил(а) пинг'
+z.string.ru.conversation_today = 'сегодня'
+z.string.ru.conversation_verified = 'Подтверждён'
+z.string.ru.conversation_voice_channel_deactivate = ' позвонил(а)'
+z.string.ru.conversation_voice_channel_deactivate_you = ' позвонил(а)'
+z.string.ru.conversation_yesterday = 'Вчера'
+z.string.ru.conversation_unable_to_decrypt_1 = 'сообщение от %@name не было получено.'
+z.string.ru.conversation_unable_to_decrypt_2 = 'Идентификатор устройства %@name изменился. Сообщение не доставлено.'
+z.string.ru.conversation_unable_to_decrypt_link = 'Почему?'
+z.string.ru.conversation_unable_to_decrypt_error_message = 'Ошибка'
+z.string.ru.conversation_unable_to_decrypt_reset_session = 'Сбросить сессию'
+z.string.ru.conversation_asset_uploading = 'Выгрузка…'
+z.string.ru.conversation_asset_downloading = 'Загрузка…'
+z.string.ru.conversation_asset_upload_failed = 'Не удалось выгрузить'
+z.string.ru.conversation_asset_upload_too_large = 'Вы можете отправлять файлы размером до %no'
+z.string.ru.conversation_playback_error = 'Невозможно воспроизвести'
+z.string.ru.conversation_context_menu_edit = 'Правка'
+z.string.ru.conversation_context_menu_delete = 'Удалить для меня'
+z.string.ru.conversation_context_menu_delete_everyone = 'Удалить для всех'
+z.string.ru.conversation_context_menu_download = 'Загрузить'
+z.string.ru.conversation_context_menu_like = 'Нравится'
+z.string.ru.conversation_context_menu_unlike = 'Не нравится'
+z.string.ru.conversation_delete_timestamp = 'Удалено %@timestamp'
+z.string.ru.conversation_edit_timestamp = 'Изменено %@timestamp'
+z.string.ru.conversation_likes_caption = '%@number участникам'
+
+# Archive
+z.string.ru.archive_header = 'Архивировать'
+
+# Conversations
+z.string.ru.conversations_all_archived = 'Все разговоры отправлены в архив'
+z.string.ru.conversations_contacts = 'Контакты'
+z.string.ru.conversations_connection_request_many = '%no ожидающих'
+z.string.ru.conversations_connection_request_one = '1 человек ожидает'
+z.string.ru.conversations_empty_conversation = 'Разговор без участников'
+z.string.ru.conversations_no_conversations = 'Начни разговор или пригласи людей присоединиться.'
+z.string.ru.conversations_popover_archive = 'Архивировать'
+z.string.ru.conversations_popover_block = 'Заблокировать'
+z.string.ru.conversations_popover_cancel = 'Отклонить запрос'
+z.string.ru.conversations_popover_clear = 'Удалить'
+z.string.ru.conversations_popover_leave = 'Покинуть'
+z.string.ru.conversations_popover_notify = 'Вкл. звук'
+z.string.ru.conversations_popover_silence = 'Выкл. звук'
+z.string.ru.conversations_popover_unarchive = 'Разархивировать'
+
+# Invites
+z.string.ru.invite_meta_key_mac = 'Cmd'
+z.string.ru.invite_meta_key_pc = 'Ctrl'
+z.string.ru.invite_hint_selected = 'Нажмите %meta_key + C для копирования'
+z.string.ru.invite_hint_unselected = 'Выделите и нажмите %meta_key + C'
+z.string.ru.invite_detail = 'Ссылка действует 2 недели.'
+z.string.ru.invite_headline = 'Пригласите людей в Wire'
+z.string.ru.invite_message = 'Я использую Wire. Введи в поиске %mail или перейди на https://get.wire.com, чтобы связаться со мной.'
+z.string.ru.invite_message_no_email = 'Я использую Wire. Перейди на https://get.wire.com, чтобы связаться со мной.'
+
+# Extensions
+z.string.ru.extensions_bubble_button_gif = 'Gif'
+
+# Extensions Giphy
+z.string.ru.extensions_giphy_button_ok = 'Отправить'
+z.string.ru.extensions_giphy_button_more = 'Попробуйте ещё'
+z.string.ru.extensions_giphy_message = '%tag • через giphy.com'
+z.string.ru.extensions_giphy_no_gifs = 'Упс, нет GIF-ок'
+z.string.ru.extensions_giphy_random = 'Случайно'
+
+# People View
+z.string.ru.search_open = 'Открыть'
+z.string.ru.search_open_group = 'Создать группу'
+z.string.ru.people_confirm_label = 'Добавить в разговор'
+z.string.ru.people_common_contacts = 'Вы оба знакомы с'
+z.string.ru.people_people = '%no участника(ов)'
+z.string.ru.people_search_placeholder = 'Поиск по имени'
+z.string.ru.people_everyone_participates = 'Все ваши контакты \nуже участвуют\nв этом разговоре.'
+z.string.ru.people_no_matches = 'Совпадений не найдено.\nПопробуйте ввести другое имя.'
+z.string.ru.people_invite = 'Пригласить людей'
+z.string.ru.people_share = 'Поделиться контактами'
+z.string.ru.people_bring_your_friends = 'Приведите друзей в Wire'
+z.string.ru.people_invite_detail = 'Предоставление доступа к вашим контактам поможет вам связаться с другими людьми. Мы анонимизируем всю информацию и не делимся ей с кем-либо ещё.'
+z.string.ru.people_invite_button_contacts = 'Из контактов'
+z.string.ru.people_invite_button_gmail = 'Из Gmail'
+z.string.ru.people_invite_headline = 'Приведите друзей'
+z.string.ru.people_tabs_details = 'Подробнее'
+z.string.ru.people_tabs_devices = 'Устройства'
+z.string.ru.people_tabs_devices_headline = 'Wire даёт каждому устройству уникальный отпечаток. Сравните их с %@.name, чтобы верифицировать разговор.'
+z.string.ru.people_tabs_devices_why_verify = 'Зачем верифицировать разговоры?'
+z.string.ru.people_tabs_no_devices_headline = '%@.name использует устаревшую версию Wire. Устройства не отображаются.'
+z.string.ru.people_tabs_device_detail_all_my_devices = 'Показать все мои устройства'
+z.string.ru.people_tabs_device_detail_device_fingerprint = 'Отпечаток устройства'
+z.string.ru.people_tabs_device_detail_headline = 'Убедитесь, что этот отпечаток соответствует отпечатку, показанному на устройстве %bold%@.name%end.'
+z.string.ru.people_tabs_device_detail_how_to = 'Как это сделать?'
+z.string.ru.people_tabs_device_detail_reset_session = 'Сбросить сессию'
+z.string.ru.people_tabs_device_detail_show_my_device = 'Показать отпечаток моего устройства'
+z.string.ru.people_tabs_device_detail_verified = 'Подтверждён'
+
+# Block user
+z.string.ru.people_block_headline = 'Заблокировать?'
+z.string.ru.people_block_message = '%@.first_name больше не сможет найти вас или связаться с вами в Wire.'
+
+# Accept a pending connection dialogue
+z.string.ru.people_connect_headline = 'Принять?'
+z.string.ru.people_connect_message = 'Это подключит вас и откроет разговор с %@.first_name.'
+
+# Cancel a pending request
+z.string.ru.people_cancel_request_headline = 'Отменить запрос?'
+z.string.ru.people_cancel_request_message = 'Удалить запрос на добавление %@.first_name.'
+
+# Leave the conversation dialogue
+z.string.ru.people_leave_headline = 'Покинуть разговор?'
+z.string.ru.people_leave_message = 'Вы больше не сможете отправлять и получать сообщения в этом разговоре.'
+
+# Remove from conversation dialogue
+z.string.ru.people_remove_headline = 'Удалить?'
+z.string.ru.people_remove_message = '%@.first_name больше не сможет отправлять и получать сообщения в этом разговоре.'
+
+# Unblock user
+z.string.ru.people_unblock_headline = 'Разблокировать?'
+z.string.ru.people_unblock_message = '%@.first_name сможет найти вас и снова связаться с вами в Wire.'
+
+# Button labels for the actions
+z.string.ru.people_button_add = 'Добавить участников'
+z.string.ru.people_button_block = 'Заблокировать'
+z.string.ru.people_button_cancel = 'Отменить'
+z.string.ru.people_button_connect = 'Подключиться'
+z.string.ru.people_button_create = 'Создать группу'
+z.string.ru.people_button_ignore = 'Игнорировать'
+z.string.ru.people_button_leave = 'Покинуть'
+z.string.ru.people_button_open = 'Открыть разговор'
+z.string.ru.people_button_pending = 'Ожидает'
+z.string.ru.people_button_profile = 'Профиль'
+z.string.ru.people_button_remove = 'Удалить'
+z.string.ru.people_button_unblock = 'Разблокировать'
+z.string.ru.people_button_no = 'Нет'
+z.string.ru.people_button_yes = 'Да'
+
+# Settings
+z.string.ru.preferences_about = 'О программе'
+z.string.ru.preferences_account = 'Аккаунт'
+z.string.ru.preferences_device_details = 'Настройки устройства'
+z.string.ru.preferences_devices = 'Устройства'
+z.string.ru.preferences_headline = 'Настройки'
+z.string.ru.preferences_options = 'Настройки'
+
+z.string.ru.preferences_about_copyright = '© Wire Swiss GmbH'
+z.string.ru.preferences_about_privacy_policy = 'Политика конфиденциальности'
+z.string.ru.preferences_about_support = 'Поддержка'
+z.string.ru.preferences_about_support_website = 'Сайт поддержки'
+z.string.ru.preferences_about_support_contact = 'Связаться с поддержкой'
+z.string.ru.preferences_about_terms_of_use = 'Условия использования'
+z.string.ru.preferences_about_version = 'Версия %version'
+z.string.ru.preferences_about_website = 'Веб-сайт Wire'
+
+z.string.ru.preferences_account_reset_password = 'Сбросить пароль'
+z.string.ru.preferences_account_delete = 'Удалить аккаунт'
+z.string.ru.preferences_account_log_out = 'Выход'
+z.string.ru.preferences_account_username_placeholder = 'Ваше полное имя'
+
+z.string.ru.preferences_devices_activated_in = 'в %location'
+z.string.ru.preferences_devices_activated_on = 'Активирован %time'
+z.string.ru.preferences_devices_active = 'Активное'
+z.string.ru.preferences_devices_active_detail = 'Если не распознаете устройство выше, удалите его и измените пароль.'
+z.string.ru.preferences_devices_current = 'Текущее'
+z.string.ru.preferences_devices_fingerprint = 'Отпечаток ключа'
+z.string.ru.preferences_devices_fingerprint_detail = 'Wire присваивает каждому устройству уникальный отпечаток. Сравните их и верифицируйте ваши устройства и разговоры.'
+z.string.ru.preferences_devices_id = 'ID: '
+z.string.ru.preferences_devices_remove = 'Удалить'
+z.string.ru.preferences_devices_remove_cancel = 'Отменить'
+z.string.ru.preferences_devices_remove_detail = 'Удалите это устройство, если вы перестали им пользоваться. История сообщений на нём будет стёрта, и вы выйдите из аккаунта.'
+z.string.ru.preferences_devices_session_confirmation = 'Сессия была сброшена.'
+z.string.ru.preferences_devices_session_detail = 'Если отпечатки не совпадают, сбросьте сессию для создания новых ключей шифрования на обеих сторонах.'
+z.string.ru.preferences_devices_session_reset = 'Сбросить сессию'
+z.string.ru.preferences_devices_session_ongoing = 'Сброс сессии…'
+z.string.ru.preferences_devices_verification = 'Подтверждён'
+
+z.string.ru.preferences_options_contacts = 'Контакты'
+z.string.ru.preferences_options_contacts_gmail = 'Импортировать из Gmail'
+z.string.ru.preferences_options_contacts_macos = 'Импортировать из Контактов'
+z.string.ru.preferences_options_contacts_detail = 'Мы используем ваши контактные данные, чтобы соединить вас с другими пользователями. Мы анонимизируем всю информацию и не делимся ей с кем-либо еще.'
+z.string.ru.preferences_options_data = 'Отчеты о сбоях и использовании'
+z.string.ru.preferences_options_data_checkbox = 'Отчеты о сбоях и использовании'
+z.string.ru.preferences_options_data_detail = 'Сделайте Wire лучше, отправляя анонимную информацию.'
+z.string.ru.preferences_options_sound = 'Звуковые уведомления'
+z.string.ru.preferences_options_sound_all = 'Все'
+z.string.ru.preferences_options_sound_all_detail = 'Все звуки'
+z.string.ru.preferences_options_sound_none = 'Отключены'
+z.string.ru.preferences_options_sound_none_detail = 'Тсссс!'
+z.string.ru.preferences_options_sound_some = 'Некоторые'
+z.string.ru.preferences_options_sound_some_detail = 'Пинги и звонки'
+
+# Search
+z.string.ru.search_group_hint = 'Продолжите ввод или выберите больше людей для создания группы'
+z.string.ru.search_connect = 'Подключиться'
+z.string.ru.search_connections = 'Контакты'
+z.string.ru.search_groups = 'Группы'
+z.string.ru.search_placeholder = 'Поиск по имени или адресу электронной почты'
+z.string.ru.search_top_people = 'Топ-контакты'
+z.string.ru.search_try_search = 'Ищите людей по имени\nили адресу электронной почты'
+z.string.ru.search_no_contacts_on_wire = 'У вас нет контактов в Wire.\nПопробуйте найти людей по имени\nили адресу электронной почты'
+z.string.ru.search_others = 'Подключиться'
+z.string.ru.search_suggestion_one = 'Знает %@.first_name'
+z.string.ru.search_suggestion_two = 'Знает %@.first_name и %@.other_name'
+z.string.ru.search_suggestion_many = 'Знает %@.first_name и %no других'
+
+# Picture upload
+z.string.ru.upload_welcome = 'Wire выглядит лучше с вашей фотографией.'
+z.string.ru.upload_welcome_keep = 'оставить эту'
+z.string.ru.upload_welcome_choose = 'Выберите свою'
+
+# Google contacts upload
+z.string.ru.upload_google_headline = 'Найти людей,\nчтобы поговорить.'
+z.string.ru.upload_google_message = 'Мы используем ваши контактные данные, чтобы соединить вас с другими пользователями. Мы анонимизируем всю информацию и не делимся ей с кем-либо еще.'
+z.string.ru.upload_google_headline_error = 'Что-то \nпошло не так.'
+z.string.ru.upload_google_message_error = 'Мы не получили вашу информацию. Пожалуйста, попробуйте импортировать ваши контакты еще раз.'
+z.string.ru.upload_google_button_again = 'Повторить'
+
+# URLs
+z.string.ru.url_password_reset = 'https://wire.com/forgot/'
+z.string.ru.url_legal = 'https://wire.com/legal/'
+z.string.ru.url_privacy = 'https://wire.com/privacy/'
+z.string.ru.url_privacy_why = 'https://wire.com/privacy/why/'
+z.string.ru.url_support = 'https://support.wire.com'
+z.string.ru.url_terms_of_use = 'https://wire.com/legal/terms/'
+z.string.ru.url_wire = 'https://wire.com'
+z.string.ru.url_wire_for_web = 'https://app.wire.com'
+z.string.ru.url_support_calling = 'https://support.wire.com/hc/en-us/articles/202969412'
+z.string.ru.url_support_camera_access_denied = 'https://support.wire.com/hc/en-us/articles/202935412'
+z.string.ru.url_support_contact = 'https://support.wire.com/hc/en-us/requests/new'
+z.string.ru.url_support_contact_bug = 'https://support.wire.com/hc/en-us/requests/new?ticket_form_id=101615'
+z.string.ru.url_support_history = 'https://support.wire.com/hc/en-us/articles/207834645'
+z.string.ru.url_support_mic_access_denied = 'https://support.wire.com/hc/en-us/articles/202590081'
+z.string.ru.url_support_mic_not_found = 'https://support.wire.com/hc/en-us/articles/202970662'
+z.string.ru.url_support_screen_access_denied = 'https://support.wire.com/hc/en-us/articles/202935412'
+z.string.ru.url_support_screen_whitelist = 'https://support.wire.com/hc/en-us/articles/209423889'
+z.string.ru.url_decrypt_error_1 = 'https://wire.com/privacy/error-1'
+z.string.ru.url_decrypt_error_2 = 'https://wire.com/privacy/error-2'
+
+# Warnings: Permission requests & permission callbacks
+z.string.ru.warning_call_detail = 'Вашему браузеру необходим доступ к микрофону для совершения звонков.'
+z.string.ru.warning_call_headline = 'Невозможно позвонить без доступа к микрофону'
+z.string.ru.warning_call_unsupported_incoming = '%s.first_name звонит. Ваш браузер не поддерживает звонки.'
+z.string.ru.warning_call_unsupported_outgoing = 'Не удается совершить звонок, потому что ваш браузер не поддерживает звонки.'
+z.string.ru.warning_call_issues = 'Эта версия Wire не может участвовать в звонке. Пожалуйста, используйте'
+z.string.ru.warning_call_upgrade_browser = 'Для совершения звонков, пожалуйста, обновите Google Chrome.'
+z.string.ru.warning_learn_more = 'Подробнее'
+z.string.ru.warning_not_found_camera = 'Не удается совершить звонок, потому что у вас нет видеокамеры.'
+z.string.ru.warning_not_found_microphone = 'Не удается совершить звонок, потому что микрофон не подключен к компьютеру.'
+z.string.ru.warning_permission_denied_camera = 'Не удается совершить звонок, потому что ваш браузер не имеет доступа к камере.'
+z.string.ru.warning_permission_denied_microphone = 'Не удается совершить звонок, потому что ваш браузер не имеет доступа к микрофону.'
+z.string.ru.warning_permission_denied_screen = 'Не удаётся начать демонстрацию экрана, потому что у браузера нет к нему доступа.'
+z.string.ru.warning_permission_request_camera = '%icon Разрешить доступ к камере'
+z.string.ru.warning_permission_request_microphone = '%icon Разрешить доступ к микрофону'
+z.string.ru.warning_permission_request_notification = '%icon Разрешить уведомления'
+z.string.ru.warning_permission_request_screen = '%icon Разрешить доступ к экрану'
+z.string.ru.warning_tell_me_how = 'Скажите мне, как'
+
+# Warnings: Connectivity
+z.string.ru.warning_connectivity_connection_lost = 'Пытаемся подключиться. У Wire может не получиться доставить сообщения.'
+z.string.ru.warning_connectivity_no_internet = 'Отсутсвует подключение к интернету. Вы не сможете отправлять и получать сообщения.'
+
+# Browser notifications
+z.string.ru.system_notification_asset_add = 'Поделился(-лась) картинкой'
+z.string.ru.system_notification_connection_accepted = 'Принял(а) ваш запрос на добавление'
+z.string.ru.system_notification_connection_request = 'Хочет связаться'
+z.string.ru.system_notification_conversation_create = '%s.first_name начал разговор'
+z.string.ru.system_notification_conversation_rename = '%s.first_name переименовал разговор на %name'
+z.string.ru.system_notification_member_join_many = '%s.first_name добавил %no человек(а) в разговор'
+z.string.ru.system_notification_member_join_one = '%s.first_name добавил %@.first_name в разговор'
+z.string.ru.system_notification_member_leave_left = '%s.first_name покинул разговор'
+z.string.ru.system_notification_member_leave_removed_many = '%s.first_name удалил %no человек из разговора'
+z.string.ru.system_notification_member_leave_removed_one = '%s.first_name удалил %@.first_name из разговора'
+z.string.ru.system_notification_ping = 'Отправил(а) пинг'
+z.string.ru.system_notification_reaction = '%s Ваше сообщение'
+z.string.ru.system_notification_shared_audio = 'Поделился(-лась) аудио сообщением'
+z.string.ru.system_notification_shared_file = 'Поделился(-лась) файлом'
+z.string.ru.system_notification_shared_location = 'Поделился(-лась) местоположением'
+z.string.ru.system_notification_shared_video = 'Поделился(-лась) видео'
+z.string.ru.system_notification_voice_channel_activate = 'Звонит'
+z.string.ru.system_notification_voice_channel_deactivate = 'Звонил(а)'
+
+# Tooltips
+z.string.ru.tooltip_conversation_all_verified = 'Все отпечатки верифицированы'
+z.string.ru.tooltip_conversation_call = 'Звонок'
+z.string.ru.tooltip_conversation_ephemeral = 'Временное сообщение'
+z.string.ru.tooltip_conversation_file = 'Добавить файл'
+z.string.ru.tooltip_conversation_input_placeholder = 'Наберите сообщение'
+z.string.ru.tooltip_conversation_people = 'Люди (%shortcut)'
+z.string.ru.tooltip_conversation_picture = 'Добавить изображение'
+z.string.ru.tooltip_conversation_ping = 'Пинг (%shortcut)'
+z.string.ru.tooltip_conversation_video_call = 'Видеозвонок'
+
+z.string.ru.tooltip_conversations_archive = 'Архивировать (%shortcut)'
+z.string.ru.tooltip_conversations_archived = 'Показать архив (%no)'
+z.string.ru.tooltip_conversations_more = 'Больше'
+z.string.ru.tooltip_conversations_notify = 'Включить звук (%shortcut)'
+z.string.ru.tooltip_conversations_silence = 'Выключить звук (%shortcut)'
+z.string.ru.tooltip_conversations_tooltip_start = 'Начать разговор (%shortcut)'
+
+z.string.ru.tooltip_people_add = 'Добавить людей в разговор (%shortcut)'
+z.string.ru.tooltip_people_back = 'Назад'
+z.string.ru.tooltip_people_block = 'Заблокировать'
+z.string.ru.tooltip_people_connect = 'Подключиться'
+z.string.ru.tooltip_people_leave = 'Покинуть разговор'
+z.string.ru.tooltip_people_open = 'Открыть разговор'
+z.string.ru.tooltip_people_profile = 'Открыть свой профиль'
+z.string.ru.tooltip_people_rename = 'Изменить название разговора'
+z.string.ru.tooltip_people_remove = 'Удалить из разговора'
+z.string.ru.tooltip_people_unblock = 'Разблокировать'
+
+z.string.ru.tooltip_preferences_contacts_gmail = 'Войдите в свой аккаунт Gmail, чтобы поделиться контактами'
+z.string.ru.tooltip_preferences_contacts_macos = 'Поделиться всеми контактами из приложения macOS Контакты'
+z.string.ru.tooltip_preferences_password = 'Открыть страницу сброса пароля'
+z.string.ru.tooltip_preferences_picture = 'Измените свой аватар…'
+z.string.ru.tooltip_preferences_rename = 'Изменить свое имя'
+
+z.string.ru.tooltip_search_close = 'Закрыть (Esc)'
+
+# App loading
+z.string.ru.init_received_access_token = 'Доступ предоставлен'
+z.string.ru.init_received_self_user = 'Здравствуйте, %name.'
+z.string.ru.init_sessions_expectation = 'Необходимо инициализировать сессии %sessions'
+z.string.ru.init_sessions_expectation_long = 'Необходимо инициализировать сессии %sessions'
+z.string.ru.init_sessions_progress = 'Инициализация сессий — %progress из %total'
+z.string.ru.init_initialized_storage = 'Сессии загружены'
+z.string.ru.init_initialized_cryptography = 'Криптография полностью настроена'
+z.string.ru.init_validated_client = 'Загрузка ваших контактов и разговоров'
+z.string.ru.init_received_user_data = 'Проверка наличия новых сообщений'
+z.string.ru.init_events_expectation = 'У вас %events новых сообщений'
+z.string.ru.init_events_expectation_long = 'Загрузка %events новых сообщений'
+z.string.ru.init_events_progress = 'Загрузка сообщений — %progress из %total'
+z.string.ru.init_updated_from_notifications = 'Почти готово'
+z.string.ru.init_app_pre_loaded = 'Наслаждайтесь Wire'
+
+z.string.ru.ephememal_units_second = 'сек.'
+z.string.ru.ephememal_units_seconds = 'сек.'
+z.string.ru.ephememal_units_minute = 'мин.'
+z.string.ru.ephememal_units_minutes = 'мин.'
+z.string.ru.ephememal_units_day = 'дн.'
+z.string.ru.ephememal_units_days = 'дн.'
diff --git a/app/script/localization/strings.coffee b/app/script/localization/strings.coffee
index 139bce285f0..acdb755717c 100644
--- a/app/script/localization/strings.coffee
+++ b/app/script/localization/strings.coffee
@@ -18,7 +18,7 @@
 
 #General terms
 z.string.wire = 'Wire'
-z.string.wire_osx = 'Wire for macOS'
+z.string.wire_macos = 'Wire for macOS'
 z.string.wire_windows = 'Wire for Windows'
 z.string.wire_linux = 'Wire for Linux'
 z.string.truncation = '…'
@@ -395,7 +395,7 @@ z.string.preferences_about_terms_of_use = 'Terms of use'
 z.string.preferences_about_version = 'Version %version'
 z.string.preferences_about_website = 'Wire website'
 
-z.string.preferences_account_change_password = 'Change password'
+z.string.preferences_account_reset_password = 'Reset password'
 z.string.preferences_account_delete = 'Delete account'
 z.string.preferences_account_log_out = 'Log out'
 z.string.preferences_account_username_placeholder = 'Your full name'
@@ -403,13 +403,14 @@ z.string.preferences_account_username_placeholder = 'Your full name'
 z.string.preferences_devices_activated_in = 'in %location'
 z.string.preferences_devices_activated_on = 'Activated on %time'
 z.string.preferences_devices_active = 'Active'
+z.string.preferences_devices_active_detail = 'If you don’t recognize a device above, remove it and reset your password.'
 z.string.preferences_devices_current = 'Current'
 z.string.preferences_devices_fingerprint = 'Key fingerprint'
 z.string.preferences_devices_fingerprint_detail = 'Wire gives every device a unique fingerprint. Compare them and verify your devices and conversations.'
 z.string.preferences_devices_id = 'ID: '
 z.string.preferences_devices_remove = 'Remove'
 z.string.preferences_devices_remove_cancel = 'Cancel'
-z.string.preferences_devices_remove_detail = 'Remove this device if you have stopped using it. Your message history will be erased and you will be logged out.'
+z.string.preferences_devices_remove_detail = 'Remove this device if you have stopped using it. Your message history will be erased on this device and you will be logged out.'
 z.string.preferences_devices_session_confirmation = 'The session has been reset.'
 z.string.preferences_devices_session_detail = 'If fingerprints don’t match, reset the session to generate new encryption keys on both sides.'
 z.string.preferences_devices_session_reset = 'Reset session'
@@ -418,7 +419,7 @@ z.string.preferences_devices_verification = 'Verified'
 
 z.string.preferences_options_contacts = 'Contacts'
 z.string.preferences_options_contacts_gmail = 'Import from Gmail'
-z.string.preferences_options_contacts_osx = 'Import from Contacts'
+z.string.preferences_options_contacts_macos = 'Import from Contacts'
 z.string.preferences_options_contacts_detail = 'We use your contact data to connect you with others. We anonymize all information and do not share it with anyone else.'
 z.string.preferences_options_data = 'Usage and crash reports'
 z.string.preferences_options_data_checkbox = 'Usage and crash reports'
@@ -507,6 +508,8 @@ z.string.system_notification_connection_accepted = 'Accepted your connection req
 z.string.system_notification_connection_request = 'Wants to connect'
 z.string.system_notification_conversation_create = '%s.first_name started a conversation'
 z.string.system_notification_conversation_rename = '%s.first_name renamed the conversation to %name'
+z.string.system_notification_ephemeral = 'Sent you a message'
+z.string.system_notification_ephemeral_title = 'Someone'
 z.string.system_notification_member_join_many = '%s.first_name added %no people to the conversation'
 z.string.system_notification_member_join_one = '%s.first_name added %@.first_name to the conversation'
 z.string.system_notification_member_leave_left = '%s.first_name left the conversation'
@@ -522,14 +525,15 @@ z.string.system_notification_voice_channel_activate = 'Calling'
 z.string.system_notification_voice_channel_deactivate = 'Called'
 
 # Tooltips
+z.string.tooltip_conversation_all_verified = 'All fingerprints are verified'
 z.string.tooltip_conversation_call = 'Call'
-z.string.tooltip_conversation_video_call = 'Video Call'
+z.string.tooltip_conversation_ephemeral = 'Timed message'
 z.string.tooltip_conversation_file = 'Add file'
+z.string.tooltip_conversation_input_placeholder = 'Type a message'
 z.string.tooltip_conversation_people = 'People (%shortcut)'
 z.string.tooltip_conversation_picture = 'Add picture'
 z.string.tooltip_conversation_ping = 'Ping (%shortcut)'
-z.string.tooltip_conversation_all_verified = 'All fingerprints are verified'
-z.string.tooltip_conversation_input_placeholder = 'Type a message'
+z.string.tooltip_conversation_video_call = 'Video Call'
 
 z.string.tooltip_conversations_archive = 'Archive (%shortcut)'
 z.string.tooltip_conversations_archived = 'Show archive (%no)'
@@ -549,7 +553,8 @@ z.string.tooltip_people_rename = 'Change conversation name'
 z.string.tooltip_people_remove = 'Remove from conversation'
 z.string.tooltip_people_unblock = 'Unblock'
 
-z.string.tooltip_preferences_contacts = 'Sign in to your Gmail account to share contacts'
+z.string.tooltip_preferences_contacts_gmail = 'Log in to your Gmail account to share contacts'
+z.string.tooltip_preferences_contacts_macos = 'Share all your contacts from the macOS Contacts app'
 z.string.tooltip_preferences_password = 'Open another website to reset your password'
 z.string.tooltip_preferences_picture = 'Change your picture…'
 z.string.tooltip_preferences_rename = 'Change your name'
@@ -571,3 +576,13 @@ z.string.init_events_expectation_long = 'Loading %events new messages'
 z.string.init_events_progress = 'Loading messages - %progress of %total'
 z.string.init_updated_from_notifications = 'We are almost there'
 z.string.init_app_pre_loaded = 'Enjoy Wire'
+
+z.string.ephememal_units_none = 'Off'
+z.string.ephememal_units_second = 'second'
+z.string.ephememal_units_seconds = 'seconds'
+z.string.ephememal_units_minute = 'minute'
+z.string.ephememal_units_minutes = 'minutes'
+z.string.ephememal_units_hour = 'hour'
+z.string.ephememal_units_hours = 'hours'
+z.string.ephememal_units_day = 'day'
+z.string.ephememal_units_days = 'days'
diff --git a/app/script/location/GeoLocation.coffee b/app/script/location/GeoLocation.coffee
index 3b296aa89dd..9d18de67075 100644
--- a/app/script/location/GeoLocation.coffee
+++ b/app/script/location/GeoLocation.coffee
@@ -57,7 +57,7 @@ z.location = do ->
         if response.status is 'OK'
           resolve _parse_results response.results
         else
-          reject response.status
+          resolve()
       .fail (jqXHR, textStatus, errorThrown) ->
         reject new Error errorThrown
 
diff --git a/app/script/main/app.coffee b/app/script/main/app.coffee
index b0ef2dc3572..307e79a13ae 100644
--- a/app/script/main/app.coffee
+++ b/app/script/main/app.coffee
@@ -51,6 +51,7 @@ class z.main.App
     service = {}
 
     service.asset                   = new z.assets.AssetService @auth.client
+    service.bot                     = new z.bot.BotService()
     service.call                    = new z.calling.CallService @auth.client
     service.connect                 = new z.connect.ConnectService @auth.client
     service.connect_google          = new z.connect.ConnectGoogleService @auth.client
@@ -95,6 +96,7 @@ class z.main.App
       repository.links
     )
 
+    repository.bot                 = new z.bot.BotRepository @service.bot, repository.conversation
     repository.call_center         = new z.calling.CallCenter @service.call, repository.conversation, repository.user, repository.audio
     repository.event_tracker       = new z.tracking.EventTrackingRepository repository.user, repository.conversation
     repository.system_notification = new z.SystemNotification.SystemNotificationRepository repository.conversation
@@ -198,6 +200,8 @@ class z.main.App
       @view.loading.switch_message z.string.init_app_pre_loaded, true
       @telemetry.time_step z.telemetry.app_init.AppInitTimingsStep.APP_PRE_LOADED
       @logger.log @logger.levels.INFO, 'App pre-loading completed'
+      @_handle_url_params()
+    .then =>
       @_show_ui()
       @telemetry.time_step z.telemetry.app_init.AppInitTimingsStep.SHOWING_UI
       @telemetry.report()
@@ -257,6 +261,13 @@ class z.main.App
           @logger.log @logger.levels.ERROR, error.message
         reject error
 
+  # Handle URL params
+  _handle_url_params: ->
+    bot_name = z.util.get_url_parameter z.auth.URLParameter.BOT
+    if bot_name
+      @logger.log @logger.levels.INFO, "Found bot token '#{bot_name}'"
+      @repository.bot.add_bot bot_name
+
   ###
   Check whether the page has been reloaded.
   @private
diff --git a/app/script/message/EphemeralStatusType.coffee b/app/script/message/EphemeralStatusType.coffee
new file mode 100644
index 00000000000..3c69bb76283
--- /dev/null
+++ b/app/script/message/EphemeralStatusType.coffee
@@ -0,0 +1,26 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+window.z ?= {}
+z.message ?= {}
+
+z.message.EphemeralStatusType =
+  ACTIVE: 1
+  INACTIVE: 2
+  NONE: 0
+  TIMED_OUT: 3
diff --git a/app/script/service/Client.coffee b/app/script/service/Client.coffee
index 1f8d5099b47..62f0b6928f8 100644
--- a/app/script/service/Client.coffee
+++ b/app/script/service/Client.coffee
@@ -51,9 +51,10 @@ class z.service.Client
     @web_socket_url = settings.web_socket_url
 
     @request_queue = []
-    @is_requesting_access_token = ko.observable false
-    @is_requesting_access_token.subscribe (is_requesting) =>
-      @execute_request_queue() if @access_token isnt '' and @request_queue.length > 0 and not is_requesting
+    @request_queue_blocked_state = ko.observable z.service.RequestQueueBlockedState.NONE
+    @request_queue_blocked_state.subscribe (blocked_state) =>
+      if blocked_state is z.service.RequestQueueBlockedState.NONE and @access_token and @request_queue.length
+        @execute_request_queue()
 
     @access_token = ''
     @access_token_type = ''
@@ -128,19 +129,31 @@ class z.service.Client
   ###
   Send jQuery AJAX request.
   @see http://api.jquery.com/jquery.ajax/#jQuery-ajax-settings
-  @param config [jQuery.ajax SettingsObject]
+  @param config [Object]
+  @option config [Function] callback DEPRECATED: use Promises
+  @option config [String] contentType
+  @option config [Object] data
+  @option config [Object] headers
+  @option config [Boolean] processData
+  @option config [Number] timeout
+  @option config [String] type
+  @option config [String] url
+  @option config [Boolean] withCredentials
   ###
   send_request: (config) ->
     return new Promise (resolve, reject) =>
-      if @is_requesting_access_token()
-        @logger.log @logger.levels.INFO, 'Request queued while access token is refreshed', config
+      if @request_queue_blocked_state() isnt z.service.RequestQueueBlockedState.NONE
+        @logger.log @logger.levels.INFO, 'Request queued for later execution', config
         @request_queue.push [config, resolve, reject]
       else
         headers = config.headers or {}
-        headers['Authorization'] = "#{@access_token_type} #{@access_token}" if @access_token
-
         xhrFields = {}
-        xhrFields['withCredentials'] = true if config.withCredentials
+
+        if @access_token
+          headers['Authorization'] = "#{@access_token_type} #{@access_token}"
+
+        if config.withCredentials
+          xhrFields['withCredentials'] = true
 
         @number_of_requests @number_of_requests() + 1
 
@@ -152,20 +165,25 @@ class z.service.Client
           timeout: config.timeout
           type: config.type
           url: config.url
+          xhrFields: xhrFields
         .done (data, textStatus, jqXHR) =>
-          @logger.log @logger.levels.OFF, "Server Response ##{jqXHR.wire.request_id} from '#{config.url}':", data
+          @logger.log @logger.levels.OFF, "Server Response '#{jqXHR.wire.request_id}' from '#{config.url}':", data
           config.callback? data
           resolve data
         .fail (jqXHR, textStatus, errorThrown) =>
           switch jqXHR.status
             when z.service.BackendClientError::STATUS_CODE.CONNECTIVITY_PROBLEM
               @logger.log @logger.levels.WARN, 'Request failed due to connectivity problem.', config
+              @request_queue_blocked_state z.service.RequestQueueBlockedState.CONNECTIVITY_PROBLEM
               @request_queue.push [config, resolve, reject]
-              @execute_on_connectivity().then => @execute_request_queue()
+              @execute_on_connectivity()
+              .then =>
+                @request_queue_blocked_state z.service.RequestQueueBlockedState.NONE
+                @execute_request_queue()
               return
             when z.service.BackendClientError::STATUS_CODE.UNAUTHORIZED
               @request_queue.push [config, resolve, reject]
-              @logger.log @logger.levels.WARN, 'Request failed as access token is invalid.', config
+              @logger.log @logger.levels.WARN, "Request failed as access token (#{@access_token}) is invalid.", config
               amplify.publish z.event.WebApp.CONNECTION.ACCESS_TOKEN.RENEW
               return
             when z.service.BackendClientError::STATUS_CODE.FORBIDDEN
@@ -183,32 +201,20 @@ class z.service.Client
           if _.isFunction config.callback
             config.callback null, jqXHR.responseJSON or new z.service.BackendClientError errorThrown
           else
-            if navigator.onLine
-              reject jqXHR.responseJSON or new z.service.BackendClientError jqXHR.status
-            else
-              error_data =
-                code: z.service.BackendClientError::STATUS_CODE.CONNECTIVITY_PROBLEM
-                label: z.service.BackendClientError::LABEL.CONNECTIVITY_PROBLEM
-                message: 'Problem with the network connectivity'
-              reject new z.service.BackendClientError error_data
+            reject jqXHR.responseJSON or new z.service.BackendClientError jqXHR.status
 
   ###
   Send AJAX request with compressed JSON body.
 
-  @param config [Object]
-  @option config [Function] callback
-  @option config [JSON] data
-  @option config [String] type
-  @option config [String] url
+  Note that contentType will be overwritten with 'application/json; charset=utf-8'
+
+  @see send_request for valid parameters
   ###
   send_json: (config) ->
-    @send_request
-      api_endpoint: config.api_endpoint
-      callback: config.callback
+    json_config =
       contentType: 'application/json; charset=utf-8'
       data: pako.gzip JSON.stringify config.data if config.data
       headers:
         'Content-Encoding': 'gzip'
       processData: false
-      type: config.type
-      url: config.url
+    @send_request $.extend config, json_config, true
diff --git a/app/script/service/RequestQueueBlockedState.coffee b/app/script/service/RequestQueueBlockedState.coffee
new file mode 100644
index 00000000000..11bd9b10f46
--- /dev/null
+++ b/app/script/service/RequestQueueBlockedState.coffee
@@ -0,0 +1,25 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+window.z ?= {}
+z.service ?= {}
+
+z.service.RequestQueueBlockedState =
+  ACCESS_TOKEN_REFRESH: 'z.service.RequestQueueBlockedState.ACCESS_TOKEN_REFRESH'
+  CONNECTIVITY_PROBLEM: 'z.service.RequestQueueBlockedState.CONNECTIVITY_PROBLEM'
+  NONE: 'z.service.RequestQueueBlockedState.NONE'
diff --git a/app/script/storage/StorageService.coffee b/app/script/storage/StorageService.coffee
index 6e9351f8d3d..0629f270bf6 100644
--- a/app/script/storage/StorageService.coffee
+++ b/app/script/storage/StorageService.coffee
@@ -339,7 +339,9 @@ class z.storage.StorageService
     return new Dexie.Promise (resolve, reject) =>
       if @db[store_name]?
         @db[store_name].put entity, primary_key
-        .then (key) -> resolve key
+        .then (key) =>
+          @logger.log @logger.levels.INFO, "Saved '#{key}' into store '#{store_name}'", entity
+          resolve key
         .catch (error) =>
           @logger.log @logger.levels.ERROR, "Failed to put '#{primary_key}' into store '#{store_name}'", error
           reject error
diff --git a/app/script/system_notification/SystemNotificationRepository.coffee b/app/script/system_notification/SystemNotificationRepository.coffee
index a8454f24d91..5b856836a11 100644
--- a/app/script/system_notification/SystemNotificationRepository.coffee
+++ b/app/script/system_notification/SystemNotificationRepository.coffee
@@ -162,7 +162,7 @@ class z.SystemNotification.SystemNotificationRepository
   _create_body_content: (message_et) ->
     if message_et.has_asset_text()
       for asset_et in message_et.assets() when asset_et.is_text()
-        return z.util.trunc_text asset_et.text, z.config.BROWSER_NOTIFICATION.BODY_LENGTH
+        return z.util.truncate_text asset_et.text, z.config.BROWSER_NOTIFICATION.BODY_LENGTH if not asset_et.previews().length
     else if message_et.has_asset_medium_image()
       return  z.localization.Localizer.get_text z.string.system_notification_asset_add
     else if message_et.has_asset_location()
@@ -191,6 +191,14 @@ class z.SystemNotification.SystemNotificationRepository
         content: message_et.name
       ]
 
+  ###
+  Creates the notification body.
+  @private
+  @return [String] Notification message body
+  ###
+  _create_body_ephemeral: ->
+    return z.localization.Localizer.get_text z.string.system_notification_ephemeral
+
   ###
   Creates the notification body for people being added to a group conversation.
 
@@ -328,6 +336,8 @@ class z.SystemNotification.SystemNotificationRepository
   @return [String] Notification message body
   ###
   _create_options_body: (conversation_et, message_et) =>
+    return @_create_body_ephemeral() if message_et.is_ephemeral()
+
     switch message_et.super_type
       when z.message.SuperType.CALL
         return @_create_body_call message_et
@@ -375,14 +385,14 @@ class z.SystemNotification.SystemNotificationRepository
   @return [String] Notification message title
   ###
   _create_title: (conversation_et, message_et) ->
+    if message_et.is_ephemeral()
+      return z.util.truncate_text z.localization.Localizer.get_text(z.string.system_notification_ephemeral_title), z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
     if conversation_et.display_name?()
       if conversation_et.is_group()
-        return  z.util.trunc_text "#{message_et.user().first_name()} in #{conversation_et.display_name()}", z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
-      return z.util.trunc_text conversation_et.display_name(), z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
-    if not message_et.user()
-      Raygun.send new Error 'Message does not contain user info'
-    else
-      return  z.util.trunc_text message_et.user().name(), z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        return  z.util.truncate_text "#{message_et.user().first_name()} in #{conversation_et.display_name()}", z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+      return z.util.truncate_text conversation_et.display_name(), z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+    return Raygun.send new Error 'Message does not contain user info' if not message_et.user()
+    return z.util.truncate_text message_et.user().name(), z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
 
   ###
   Creates the notification trigger.
diff --git a/app/script/tracking/EventName.coffee b/app/script/tracking/EventName.coffee
index cc6a55403d0..26a1a9bd658 100644
--- a/app/script/tracking/EventName.coffee
+++ b/app/script/tracking/EventName.coffee
@@ -47,10 +47,6 @@ z.tracking.EventName =
     EDITED_MESSAGE: 'conversation.edited_message'
     SELECTED_MESSAGE: 'conversation.selected_message'
     REACTED_TO_MESSAGE: 'conversation.reacted_to_message'
-  MEDIA:
-    COMPLETED_MEDIA_ACTION: 'media.completed_media_action'
-    PLAYED_AUDIO_MESSAGE: 'media.played_audio_message'
-    PLAYED_VIDEO_MESSAGE: 'media.played_video_message'
   E2EE:
     CANNOT_DECRYPT_MESSAGE: 'e2ee.cannot_decrypt_message'
   FILE:
@@ -63,6 +59,10 @@ z.tracking.EventName =
     DOWNLOAD_FAILED: 'file.failed_file_download'
     DOWNLOAD_SUCCESSFUL: 'file.successfully_downloaded_file'
   IMAGE_SENT_ERROR: 'Image Sent Error'
+  MEDIA:
+    COMPLETED_MEDIA_ACTION: 'media.completed_media_action'
+    PLAYED_AUDIO_MESSAGE: 'media.played_audio_message'
+    PLAYED_VIDEO_MESSAGE: 'media.played_video_message'
   NAVIGATION:
     OPENED_WIRE_WEBSITE: 'navigation.opened_wire_website'
     OPENED_TERMS: 'navigation.opened_terms'
diff --git a/app/script/ui/Shortcut.coffee b/app/script/ui/Shortcut.coffee
index c6fc84c5d0b..0ccf84f0c93 100644
--- a/app/script/ui/Shortcut.coffee
+++ b/app/script/ui/Shortcut.coffee
@@ -39,10 +39,10 @@ z.ui.Shortcut = do ->
   shortcut_map[z.ui.ShortcutType.ADD_PEOPLE] =
     shortcut:
       webapp:
-        osx: 'command + shift + k'
+        macos: 'command + shift + k'
         pc: 'ctrl + shift + k'
       electron:
-        osx: 'command + shift + k'
+        macos: 'command + shift + k'
         pc: 'ctrl + shift + k'
         menu: true
     event: z.event.WebApp.SHORTCUT.ADD_PEOPLE
@@ -50,10 +50,10 @@ z.ui.Shortcut = do ->
   shortcut_map[z.ui.ShortcutType.ARCHIVE] =
     shortcut:
       webapp:
-        osx: 'command + alt + shift + d'
+        macos: 'command + alt + shift + d'
         pc: 'ctrl + alt + d'
       electron:
-        osx: 'command + d'
+        macos: 'command + d'
         pc: 'ctrl + d'
         menu: true
     event: z.event.WebApp.SHORTCUT.ARCHIVE
@@ -61,30 +61,30 @@ z.ui.Shortcut = do ->
   shortcut_map[z.ui.ShortcutType.CALL_IGNORE] =
     shortcut:
       webapp:
-        osx: 'command + alt + .'
+        macos: 'command + alt + .'
         pc: 'ctrl + alt + .'
       electron:
-        osx: 'command + .'
+        macos: 'command + .'
         pc: 'ctrl + .'
     event: z.event.WebApp.SHORTCUT.CALL_IGNORE
 
   shortcut_map[z.ui.ShortcutType.CALL_MUTE] =
     shortcut:
       webapp:
-        osx: 'command + alt + m'
+        macos: 'command + alt + m'
         pc: 'ctrl + alt + m'
       electron:
-        osx: 'command + alt + m'
+        macos: 'command + alt + m'
         pc: 'ctrl + alt + m'
     event: z.event.WebApp.SHORTCUT.CALL_MUTE
 
   shortcut_map[z.ui.ShortcutType.PREV] =
     shortcut:
       webapp:
-        osx: 'command + alt + down'
+        macos: 'command + alt + down'
         pc: 'alt + shift + down'
       electron:
-        osx: 'command + alt + down'
+        macos: 'command + alt + down'
         pc: 'alt + shift + down'
         menu: true
     event: z.event.WebApp.SHORTCUT.PREV
@@ -92,10 +92,10 @@ z.ui.Shortcut = do ->
   shortcut_map[z.ui.ShortcutType.NEXT] =
     shortcut:
       webapp:
-        osx: 'command + alt + up'
+        macos: 'command + alt + up'
         pc: 'alt + shift + up'
       electron:
-        osx: 'command + alt + up'
+        macos: 'command + alt + up'
         pc: 'alt + shift + up'
         menu: true
     event: z.event.WebApp.SHORTCUT.NEXT
@@ -103,10 +103,10 @@ z.ui.Shortcut = do ->
   shortcut_map[z.ui.ShortcutType.PING] =
     shortcut:
       webapp:
-        osx: 'command + alt + k'
+        macos: 'command + alt + k'
         pc: 'ctrl + alt + k'
       electron:
-        osx: 'command + k'
+        macos: 'command + k'
         pc: 'ctrl + k'
         menu: true
     event: z.event.WebApp.SHORTCUT.PING
@@ -114,10 +114,10 @@ z.ui.Shortcut = do ->
   shortcut_map[z.ui.ShortcutType.PEOPLE] =
     shortcut:
       webapp:
-        osx: 'command + alt + shift + i'
+        macos: 'command + alt + shift + i'
         pc: 'ctrl + alt + i'
       electron:
-        osx: 'command + i'
+        macos: 'command + i'
         pc: 'ctrl + i'
         menu: true
     event: z.event.WebApp.SHORTCUT.PEOPLE
@@ -125,10 +125,10 @@ z.ui.Shortcut = do ->
   shortcut_map[z.ui.ShortcutType.SILENCE] =
     shortcut:
       webapp:
-        osx: 'command + alt + s'
+        macos: 'command + alt + s'
         pc: 'ctrl + alt + s'
       electron:
-        osx: 'command + alt + s'
+        macos: 'command + alt + s'
         pc: 'ctrl + alt + s'
         menu: true
     event: z.event.WebApp.SHORTCUT.SILENCE
@@ -136,10 +136,10 @@ z.ui.Shortcut = do ->
   shortcut_map[z.ui.ShortcutType.START] =
     shortcut:
       webapp:
-        osx: 'command + alt + graveaccent' # KeyboardJS fires this when using cmd + alt + n
+        macos: 'command + alt + graveaccent' # KeyboardJS fires this when using cmd + alt + n
         pc: 'ctrl + alt + graveaccent'
       electron:
-        osx: 'command + n'
+        macos: 'command + n'
         pc: 'ctrl + n'
         menu: true
 
@@ -149,10 +149,10 @@ z.ui.Shortcut = do ->
     shortcut_map[z.ui.ShortcutType.DEBUG] =
       shortcut:
         webapp:
-          osx: 'command + alt + g'
+          macos: 'command + alt + g'
           pc: 'ctrl + alt + g'
         electron:
-          osx: 'command + alt + g'
+          macos: 'command + alt + g'
           pc: 'ctrl + alt + g'
       event: z.event.WebApp.SHORTCUT.DEBUG
 
@@ -194,7 +194,7 @@ z.ui.Shortcut = do ->
   get_shortcut = (shortcut_name) ->
     platform = if z.util.Environment.electron then 'electron' else 'webapp'
     platform_shortcuts = shortcut_map[shortcut_name].shortcut[platform]
-    os_shortcut = if z.util.Environment.os.mac then platform_shortcuts.osx else platform_shortcuts.pc
+    os_shortcut = if z.util.Environment.os.mac then platform_shortcuts.macos else platform_shortcuts.pc
     return os_shortcut
 
   get_shortcut_tooltip = (shortcut_name) ->
diff --git a/app/script/user/UserProperties.coffee b/app/script/user/UserProperties.coffee
index a0d8d9f66e9..b0102c88627 100644
--- a/app/script/user/UserProperties.coffee
+++ b/app/script/user/UserProperties.coffee
@@ -34,6 +34,6 @@ class z.user.UserProperties
         alerts: z.audio.AudioSetting.ALL
     @contact_import =
       google: undefined
-      osx: undefined
+      macos: undefined
     @has_created_conversation = false
     @enable_debugging = false
diff --git a/app/script/user/UserRepository.coffee b/app/script/user/UserRepository.coffee
index 642e23b6a51..9e168af4fdb 100644
--- a/app/script/user/UserRepository.coffee
+++ b/app/script/user/UserRepository.coffee
@@ -627,16 +627,16 @@ class z.user.UserRepository
   save_property_contact_import_google: (timestamp) =>
     @properties.contact_import.google = timestamp
     @save_properties 'contact_import.google', timestamp
-    .then -> amplify.publish z.event.WebApp.PROPERTIES.UPDATE.GOOGLE, timestamp
+    .then -> amplify.publish z.event.WebApp.PROPERTIES.UPDATE.CONTACTS_GOOGLE, timestamp
 
   ###
-  Save timestamp for OSX Contacts import.
+  Save timestamp for macOS Contacts import.
   @param timestamp [String] Timestamp to be saved
   ###
-  save_property_contact_import_osx: (timestamp) =>
-    @properties.contact_import.osx = timestamp
-    @save_properties 'contact_import.osx', timestamp
-    .then -> amplify.publish z.event.WebApp.PROPERTIES.UPDATE.OSX_CONTACTS, timestamp
+  save_property_contact_import_macos: (timestamp) =>
+    @properties.contact_import.macos = timestamp
+    @save_properties 'contact_import.macos', timestamp
+    .then -> amplify.publish z.event.WebApp.PROPERTIES.UPDATE.CONTACTS_MACOS, timestamp
 
   ###
   Save data settings.
diff --git a/app/script/util/ArrayUtil.coffee b/app/script/util/ArrayUtil.coffee
index a776a65b78c..4317af6d61f 100644
--- a/app/script/util/ArrayUtil.coffee
+++ b/app/script/util/ArrayUtil.coffee
@@ -32,6 +32,12 @@ z.util.ArrayUtil.random_element = (array) ->
 z.util.ArrayUtil.contains = (array, value) ->
   return array.indexOf(value) > -1
 
+z.util.ArrayUtil.find_closest = (array, value) ->
+  closest = array[0]
+  array.forEach (current) ->
+    closest = current if value >= current
+  return closest
+
 ###
 Interpolates an array of numbers using linear interpolation
 
diff --git a/app/script/util/StringUtil.coffee b/app/script/util/StringUtil.coffee
new file mode 100644
index 00000000000..387ec61f5c0
--- /dev/null
+++ b/app/script/util/StringUtil.coffee
@@ -0,0 +1,32 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+window.z ?= {}
+z.util ?= {}
+z.util.StringUtil =
+  obfuscate: (text) ->
+    alphabet = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'x', 'y', 'z']
+    obfuscated = ''
+
+    for character in text
+      if character.match /[\n\r\s]+/gi
+        obfuscated += character
+      else
+        obfuscated += z.util.ArrayUtil.random_element alphabet
+
+    return obfuscated
diff --git a/app/script/util/util.coffee b/app/script/util/util.coffee
index ee7c5ffe1c1..70697db0e19 100644
--- a/app/script/util/util.coffee
+++ b/app/script/util/util.coffee
@@ -71,7 +71,7 @@ z.util.load_url_buffer = (url, xhr_accessor_function) ->
       if xhr.status is 200
         resolve [xhr.response, xhr.getResponseHeader 'content-type']
       else
-        reject new Error "Requesting arraybuffer failed with status #{xhr.status} for #{url}"
+        reject new Error "Requesting arraybuffer failed with status #{xhr.status}"
     xhr.onerror = reject
     xhr.onabort = reject
     xhr_accessor_function? xhr
@@ -138,7 +138,7 @@ z.util.format_bytes = (bytes, decimals) ->
 ###
 Format seconds into hh:mm:ss.
 
-@param bytes [seconds] duration to format in seconds
+@param duration [Number] duration to format in seconds
 @return [String]
 ###
 z.util.format_seconds = (duration) ->
@@ -160,12 +160,25 @@ z.util.format_seconds = (duration) ->
 
   return components.join ':'
 
+###
+Format seconds into 15s, 2m.
+
+@param duration [Number] duration to format in seconds
+@return [Array] [number, unit]
+###
+z.util.format_milliseconds_short = (duration) ->
+  seconds = Math.floor duration / 1000
+  switch
+    when seconds < 60 then [seconds, 's']
+    when seconds < 60 * 60 then [Math.floor(seconds / 60), 'm']
+    when seconds < 60 * 60 * 24 then [Math.floor(seconds / 60 / 60), 'h']
+    else [Math.floor(seconds / 60 / 60 / 24), 'd']
+
 
 z.util.get_content_type_from_data_url = (data_url) ->
   return data_url.split(',')[0].split(':')[1].split(';')[0]
 
 
-
 z.util.strip_data_uri = (string) ->
   return string.replace /^data:.*,/, ''
 
@@ -488,7 +501,7 @@ z.util.valid_profile_image_size = (file, min_width, min_height, callback) ->
   image.src = window.URL.createObjectURL file
 
 
-z.util.trunc_text = (text, output_length, word_boundary = true) ->
+z.util.truncate_text = (text, output_length, word_boundary = true) ->
   if text.length > output_length
     trunc_index = output_length - 1
     if word_boundary and text.lastIndexOf(' ', output_length - 1) > output_length - 25
diff --git a/app/script/view_model/AuthViewModel.coffee b/app/script/view_model/AuthViewModel.coffee
index f24ff7f501a..53d9d1d95e9 100644
--- a/app/script/view_model/AuthViewModel.coffee
+++ b/app/script/view_model/AuthViewModel.coffee
@@ -1265,6 +1265,8 @@ class z.ViewModel.AuthViewModel
   _redirect_to_app: =>
     url = '/'
     url = "/#{@auth.settings.parameter}" if @auth.settings.parameter?
+    bot_name = z.util.get_url_parameter z.auth.URLParameter.BOT
+    url = z.util.append_url_parameter url, "#{z.auth.URLParameter.BOT}=#{bot_name}" if bot_name
     window.location.replace url
 
   _register_client: =>
diff --git a/app/script/view_model/ConversationInputViewModel.coffee b/app/script/view_model/ConversationInputViewModel.coffee
index 9b9736b6920..03f32df5a7d 100644
--- a/app/script/view_model/ConversationInputViewModel.coffee
+++ b/app/script/view_model/ConversationInputViewModel.coffee
@@ -43,6 +43,8 @@ class z.ViewModel.ConversationInputViewModel
       else
         window.removeEventListener 'click', @on_window_click
 
+    @ephemeral_timer = @conversation_et.ephemeral_timer
+
     @conversation_has_focus = ko.observable(true).extend notify: 'always'
     @browser_has_focus = ko.observable true
 
@@ -68,7 +70,10 @@ class z.ViewModel.ConversationInputViewModel
         content: z.ui.Shortcut.get_shortcut_tooltip z.ui.ShortcutType.PING
     @picture_tooltip = z.localization.Localizer.get_text z.string.tooltip_conversation_picture
     @file_tooltip = z.localization.Localizer.get_text z.string.tooltip_conversation_file
-
+    @input_tooltip = ko.pureComputed =>
+      if @conversation_et().ephemeral_timer()
+        return z.localization.Localizer.get_text z.string.tooltip_conversation_ephemeral
+      return z.localization.Localizer.get_text z.string.tooltip_conversation_input_placeholder
     @ping_disabled = ko.observable false
 
     $(window)
@@ -83,9 +88,10 @@ class z.ViewModel.ConversationInputViewModel
     amplify.subscribe z.event.WebApp.EXTENSIONS.GIPHY.SEND, => @conversation_et()?.input ''
     amplify.subscribe z.event.WebApp.CONVERSATION.IMAGE.SEND, @upload_images
     amplify.subscribe z.event.WebApp.CONVERSATION.MESSAGE.EDIT, @edit_message
+    amplify.subscribe z.event.WebApp.CONTEXT_MENU, @on_context_menu_action
 
   added_to_view: =>
-    setTimeout =>
+    window.setTimeout =>
       amplify.subscribe z.event.WebApp.SHORTCUT.PING, => @ping()
     , 50
 
@@ -106,8 +112,7 @@ class z.ViewModel.ConversationInputViewModel
       , 2000
 
   send_message: (message) =>
-    if message.length is 0
-      return
+    return if message.length is 0
     @conversation_repository.send_message_with_link_preview message, @conversation_et()
 
   send_message_edit: (message, message_et) =>
@@ -118,6 +123,14 @@ class z.ViewModel.ConversationInputViewModel
     if message isnt message_et.get_first_asset().text
       @conversation_repository.send_message_edit message, message_et, @conversation_et()
 
+  set_ephemeral_timer: (millis) =>
+    if not millis
+      @conversation_et().ephemeral_timer false
+      @logger.log "Ephemeral timer for conversation '#{@conversation_et().display_name()}' turned off."
+    else
+      @conversation_et().ephemeral_timer millis
+      @logger.log "Ephemeral timer for conversation '#{@conversation_et().display_name()}' is now at '#{@conversation_et().ephemeral_timer().toString()}'."
+
   upload_images: (images) =>
     for image in images
       return @_show_upload_warning image if image.size > z.config.MAXIMUM_IMAGE_FILE_SIZE
@@ -153,7 +166,7 @@ class z.ViewModel.ConversationInputViewModel
         amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.FILE.UPLOAD_TOO_BIG,
           {size: file.size, type: file.type}
         amplify.publish z.event.WebApp.AUDIO.PLAY, z.audio.AudioType.ALERT
-        setTimeout ->
+        window.setTimeout ->
           amplify.publish z.event.WebApp.WARNING.MODAL, z.ViewModel.ModalType.UPLOAD_TOO_LARGE,
             data: z.util.format_bytes(z.config.MAXIMUM_ASSET_FILE_SIZE)
         , 200
@@ -201,7 +214,7 @@ class z.ViewModel.ConversationInputViewModel
   on_input_key_down: (data, event) =>
     switch event.keyCode
       when z.util.KEYCODE.ARROW_UP
-        @edit_message @conversation_et().get_last_added_text_message(), event.target if @input().length is 0
+        @edit_message @conversation_et().get_last_editable_message(), event.target if @input().length is 0
       when z.util.KEYCODE.ESC
         @cancel_edit()
       when z.util.KEYCODE.ENTER
@@ -228,3 +241,43 @@ class z.ViewModel.ConversationInputViewModel
     setTimeout ->
       input_element.selectionStart = input_element.selectionEnd = input_element.value.length * 2
     , 0
+
+  ###
+  Create context menu entries for ephemeral timer
+  @param message_et [z.entity.Message]
+  ###
+  get_context_menu_entries: ->
+    entries = [label: z.localization.Localizer.get_text(z.string.ephememal_units_none), action: 0]
+    return entries.concat z.ephemeral.timings.get_values().map (milliseconds) =>
+      [number, unit] = z.util.format_milliseconds_short(milliseconds)
+      unit_locale = @_get_localized_unit_string number, unit
+      return label: "#{number} #{unit_locale}", action: milliseconds
+
+  ###
+  Returns the full localized unit string
+  @param number [Number]
+  @param unit [String] 's', 'm', 'd', 'h'
+  ###
+  _get_localized_unit_string: (number, unit) ->
+    return switch
+      when unit is 's'
+        if number is 1
+          return z.localization.Localizer.get_text z.string.ephememal_units_second
+        return z.localization.Localizer.get_text z.string.ephememal_units_seconds
+      when unit is 'm'
+        if number is 1
+          return z.localization.Localizer.get_text z.string.ephememal_units_minute
+        return z.localization.Localizer.get_text z.string.ephememal_units_minutes
+      when unit is 'd'
+        if number is 1
+          return z.localization.Localizer.get_text z.string.ephememal_units_day
+        return z.localization.Localizer.get_text z.string.ephememal_units_days
+
+  ###
+  Click on context menu entry
+  @param tag [String] associated tag
+  @param action [String] action that was triggered
+  ###
+  on_context_menu_action: (tag, action) =>
+    return if tag isnt 'ephemeral'
+    @set_ephemeral_timer window.parseInt(action, 10)
diff --git a/app/script/view_model/ConversationTitlebarViewModel.coffee b/app/script/view_model/ConversationTitlebarViewModel.coffee
index d4693943969..224378cc56f 100644
--- a/app/script/view_model/ConversationTitlebarViewModel.coffee
+++ b/app/script/view_model/ConversationTitlebarViewModel.coffee
@@ -24,7 +24,7 @@ class z.ViewModel.ConversationTitlebarViewModel
   constructor: (element_id, @conversation_repository, @call_center, @multitasking) ->
     @logger = new z.util.Logger 'z.ViewModel.ConversationTitlebarViewModel', z.config.LOGGER.OPTIONS
 
-    # TODO remove this for now to ensure that buttons are clickable in osx wrappers
+    # TODO remove this for now to ensure that buttons are clickable in macOS wrappers
     window.setTimeout ->
       $('.titlebar').remove()
     , 1000
diff --git a/app/script/view_model/MessageListViewModel.coffee b/app/script/view_model/MessageListViewModel.coffee
index 694c42b4087..6f7c9ec7e6f 100644
--- a/app/script/view_model/MessageListViewModel.coffee
+++ b/app/script/view_model/MessageListViewModel.coffee
@@ -32,7 +32,7 @@ class z.ViewModel.MessageListViewModel
 
     @conversation = ko.observable new z.entity.Conversation()
     @center_messages = ko.pureComputed =>
-      return not @conversation().has_further_messages() and @conversation().messages_visible().length is 1 and @conversation().messages_visible()[0].is_connection()
+      return not @conversation().has_further_messages() and @conversation().messages_visible().length is 1 and @conversation().messages_visible()[0]?.is_connection?()
 
     @conversation_is_changing = false
 
@@ -58,6 +58,7 @@ class z.ViewModel.MessageListViewModel
     @recalculate_timeout = undefined
 
     @should_scroll_to_bottom = true
+    @ephemeral_timers = {}
 
     # Check if the message container is to small and then pull new events
     @on_mouse_wheel = _.throttle (e) =>
@@ -385,7 +386,7 @@ class z.ViewModel.MessageListViewModel
     if message_et.has_asset()
       entries.push {label: z.string.conversation_context_menu_download, action: 'download'}
 
-    if message_et.is_reactable() and not @conversation().removed_from_conversation() and message_et.status() isnt z.message.StatusType.SENDING
+    if message_et.is_reactable() and not @conversation().removed_from_conversation()
       if message_et.is_liked()
         entries.push {label: z.string.conversation_context_menu_unlike, action: 'react'}
       else
@@ -444,6 +445,7 @@ class z.ViewModel.MessageListViewModel
   ###
   show_detail: (asset_et, event) ->
     target_element = $(event.currentTarget)
+    return if target_element.hasClass 'image-ephemeral'
     return if target_element.hasClass 'image-loading'
     amplify.publish z.event.WebApp.CONVERSATION.DETAIL_VIEW.SHOW, target_element.find('img')[0].src
 
@@ -524,3 +526,36 @@ class z.ViewModel.MessageListViewModel
       user: if message_et.user().is_me then 'sender' else 'receiver'
       type: z.tracking.helpers.get_message_type message_et
       reacted_to_last_message: conversation_et.get_last_message() is message_et
+
+  ###
+  Message appeared in viewport.
+  @param message_et [z.entity.Message]
+  ###
+  message_in_viewport: (message_et) =>
+    return if not message_et.is_ephemeral()
+
+    set_ephemeral_timer = =>
+      @conversation_repository.get_ephemeral_timer message_et
+      .then (millis) => @start_ephemeral_timer message_et, millis if millis?
+
+    if document.hasFocus()
+      set_ephemeral_timer()
+    else
+      start_timer_on_focus = @conversation.id
+
+      $(window).one 'focus', =>
+        set_ephemeral_timer() if start_timer_on_focus is @conversation.id
+
+  ###
+  Start ephemeral timeout.
+
+  @param message_et [z.entity.Message]
+  @param millis [Number]
+  ###
+  start_ephemeral_timer: (message_et, millis) ->
+    return if @ephemeral_timers[message_et.id]
+
+    conversation_et = @conversation()
+    @ephemeral_timers[message_et.id] = window.setTimeout (=>
+      @conversation_repository.timeout_ephemeral_message conversation_et, message_et
+    ), millis
diff --git a/app/script/view_model/ParticipantsViewModel.coffee b/app/script/view_model/ParticipantsViewModel.coffee
index 0a8ea82c70a..e6c9564298a 100644
--- a/app/script/view_model/ParticipantsViewModel.coffee
+++ b/app/script/view_model/ParticipantsViewModel.coffee
@@ -171,7 +171,8 @@ class z.ViewModel.ParticipantsViewModel
           {numberOfParticipantsAdded: user_ids.length, numberOfGroupParticipants: @conversation().number_of_participants()}
     else
       user_ids = user_ids.concat @user_profile().id
-      @conversation_repository.create_new_conversation user_ids, null, (conversation_et) ->
+      @conversation_repository.create_new_conversation user_ids, null
+      .then (conversation_et) ->
         amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.CONVERSATION.CREATE_GROUP_CONVERSATION,
           {creationContext: 'addedToOneToOne', numberOfParticipants: user_ids.length}
         amplify.publish z.event.WebApp.CONVERSATION.SHOW, conversation_et
diff --git a/app/script/view_model/bindings/MessageListBindings.coffee b/app/script/view_model/bindings/MessageListBindings.coffee
index 979c1b5fb90..1d700173acf 100644
--- a/app/script/view_model/bindings/MessageListBindings.coffee
+++ b/app/script/view_model/bindings/MessageListBindings.coffee
@@ -62,20 +62,21 @@ ko.bindingHandlers.background_image =
 
     _on_viewport_change = _.debounce ->
       if _in_view element
-        asset_et()?.load()
+        asset_remote_data()?.load()
         .then (blob) ->
           $(element).removeClass 'image-loading'
           object_url = window.URL.createObjectURL blob
           image_element[0].src = object_url
           viewport_subscription.dispose()
+        .catch -> return
     , 500
 
     image_element = $(element).find 'img'
-    asset_et = valueAccessor()
+    asset_remote_data = valueAccessor()
 
     viewport_changed = allBindingsAccessor.get 'viewport_changed'
     viewport_subscription = viewport_changed.subscribe _on_viewport_change
-    asset_subscription = asset_et.subscribe _on_viewport_change
+    asset_subscription = asset_remote_data.subscribe _on_viewport_change
 
     _on_viewport_change()
 
@@ -178,3 +179,8 @@ ko.bindingHandlers.relative_timestamp = do ->
     ko.utils.domNodeDisposal.addDisposeCallback element, ->
       timestamp_index = timestamps.indexOf timestamp_func
       timestamps.splice timestamp_index, 1
+
+ko.bindingHandlers.message_in_viewport =
+  init: (element, valueAccessor, allBindingsAccessor) ->
+    callback = valueAccessor()
+    callback()
diff --git a/app/script/view_model/content/PreferencesDeviceDetailsViewModel.coffee b/app/script/view_model/content/PreferencesDeviceDetailsViewModel.coffee
index 2d69fcb3149..9e4da0a654b 100644
--- a/app/script/view_model/content/PreferencesDeviceDetailsViewModel.coffee
+++ b/app/script/view_model/content/PreferencesDeviceDetailsViewModel.coffee
@@ -67,9 +67,8 @@ class z.ViewModel.content.PreferencesDeviceDetailsViewModel
   _update_device_location: (location) ->
     z.location.get_location location.lat, location.lon
     .then (retrieved_location) =>
-      @_update_activation_location "#{retrieved_location.place}, #{retrieved_location.country_code}"
-    .catch (error) =>
-      @logger.log @logger.levels.WARN, "Could not update device location: #{error.message}", error
+      if retrieved_location
+        @_update_activation_location "#{retrieved_location.place}, #{retrieved_location.country_code}"
 
   _update_fingerprint: =>
     @cryptography_repository.get_remote_fingerprint @self_user().id, @device().id
@@ -107,5 +106,3 @@ class z.ViewModel.content.PreferencesDeviceDetailsViewModel
 
     @client_repository.update_client_in_db @self_user().id, @device().id, {meta: is_verified: toggle_verified}
     .then => @device().meta.is_verified toggle_verified
-
-    event.stopPropagation()
diff --git a/app/script/view_model/content/PreferencesDevicesViewModel.coffee b/app/script/view_model/content/PreferencesDevicesViewModel.coffee
index 4f025624fb2..ef86237b3a9 100644
--- a/app/script/view_model/content/PreferencesDevicesViewModel.coffee
+++ b/app/script/view_model/content/PreferencesDevicesViewModel.coffee
@@ -66,9 +66,8 @@ class z.ViewModel.content.PreferencesDevicesViewModel
   _update_device_location: (location) ->
     z.location.get_location location.lat, location.lon
     .then (retrieved_location) =>
-      @_update_activation_location "#{retrieved_location.place}, #{retrieved_location.country_code}"
-    .catch (error) =>
-      @logger.log @logger.levels.WARN, "Could not update device location: #{error.message}", error
+      if retrieved_location
+        @_update_activation_location "#{retrieved_location.place}, #{retrieved_location.country_code}"
 
   click_on_show_device: (device_et) =>
     @preferences_device_details.device device_et
diff --git a/app/script/view_model/content/PreferencesOptionsViewModel.coffee b/app/script/view_model/content/PreferencesOptionsViewModel.coffee
index d3712faf440..8510a098e6e 100644
--- a/app/script/view_model/content/PreferencesOptionsViewModel.coffee
+++ b/app/script/view_model/content/PreferencesOptionsViewModel.coffee
@@ -44,7 +44,7 @@ class z.ViewModel.content.PreferencesOptionsViewModel
     amplify.publish z.event.WebApp.CONNECT.IMPORT_CONTACTS, z.connect.ConnectSource.GMAIL, z.connect.ConnectTrigger.SETTINGS
     amplify.publish z.event.WebApp.SEARCH.SHOW
 
-  connect_osx_contacts: ->
+  connect_macos_contacts: ->
     amplify.publish z.event.WebApp.CONNECT.IMPORT_CONTACTS, z.connect.ConnectSource.ICLOUD, z.connect.ConnectTrigger.SETTINGS
     amplify.publish z.event.WebApp.SEARCH.SHOW
 
diff --git a/app/script/view_model/list/StartUIViewModel.coffee b/app/script/view_model/list/StartUIViewModel.coffee
index d640e91cdce..a23b7ede0d3 100644
--- a/app/script/view_model/list/StartUIViewModel.coffee
+++ b/app/script/view_model/list/StartUIViewModel.coffee
@@ -158,10 +158,10 @@ class z.ViewModel.list.StartUIViewModel
     @_init_subscriptions()
 
   _init_subscriptions: =>
-    amplify.subscribe z.event.WebApp.CONNECT.IMPORT_CONTACTS,         @import_contacts
-    amplify.subscribe z.event.WebApp.PROPERTIES.UPDATED,              @update_properties
-    amplify.subscribe z.event.WebApp.PROPERTIES.UPDATE.GOOGLE,        @update_properties
-    amplify.subscribe z.event.WebApp.PROPERTIES.UPDATE.OSX_CONTACTS,  @update_properties
+    amplify.subscribe z.event.WebApp.CONNECT.IMPORT_CONTACTS,                    @import_contacts
+    amplify.subscribe z.event.WebApp.PROPERTIES.UPDATED,                         @update_properties
+    amplify.subscribe z.event.WebApp.PROPERTIES.UPDATE.CONTACTS_GOOGLE,          @update_properties
+    amplify.subscribe z.event.WebApp.PROPERTIES.UPDATE.CONTACTS_MACOS,           @update_properties
     amplify.subscribe z.event.WebApp.PROPERTIES.UPDATE.HAS_CREATED_CONVERSATION, @update_properties
     amplify.subscribe z.event.WebApp.PROPERTIES.UPDATED, @update_properties
 
@@ -195,7 +195,7 @@ class z.ViewModel.list.StartUIViewModel
     if source is z.connect.ConnectSource.GMAIL
       import_promise = @connect_repository.get_google_contacts()
     else if source is z.connect.ConnectSource.ICLOUD
-      import_promise = @connect_repository.get_osx_contacts()
+      import_promise = @connect_repository.get_macos_contacts()
 
     import_promise.then (response) =>
       @_show_onboarding_results response
@@ -424,7 +424,7 @@ class z.ViewModel.list.StartUIViewModel
 
   update_properties: =>
     @has_created_conversation @user_repository.properties.has_created_conversation
-    @has_uploaded_contacts @user_repository.properties.contact_import.google? or @user_repository.properties.contact_import.osx?
+    @has_uploaded_contacts @user_repository.properties.contact_import.google? or @user_repository.properties.contact_import.macos?
     return true
 
 
@@ -444,21 +444,18 @@ class z.ViewModel.list.StartUIViewModel
       callback conversation_et if _.isFunction callback
       return
 
-    on_success = (conversation_et) =>
+    @conversation_repository.create_new_conversation user_ids, null
+    .then (conversation_et) =>
       @logger.log @logger.levels.INFO, "Created new conversation with ID: #{conversation_et.id}"
       @user_repository.save_property_has_created_conversation()
       amplify.publish z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.CONVERSATION.CREATE_GROUP_CONVERSATION,
         {creationContext: 'search', numberOfParticipants: user_ids.length}
       @click_on_group conversation_et
       callback conversation_et if _.isFunction callback
-
-    # Error: {code: 403, message: "Users are not connected", label: "not-connected"}
-    on_error = (error) =>
+    .catch (error) =>
       @logger.log @logger.levels.WARN, "Unable to create conversation: #{error.message}"
       @_close_list()
 
-    @conversation_repository.create_new_conversation user_ids, null, on_success, on_error
-
   on_audio_call: =>
     @on_submit_search (conversation_et) ->
       window.setTimeout ->
diff --git a/app/style/common/colors.less b/app/style/common/colors.less
index 6052d67a1da..d23a6a6c316 100644
--- a/app/style/common/colors.less
+++ b/app/style/common/colors.less
@@ -49,6 +49,7 @@
 .text-graphite {.text(@graphite)}
 .text-graphite-dark {.text(@graphite-dark)}
 .text-white {.text(#fff)}
+.text-ephemeral {.text(@ephemeral-color)}
 
 // fonts
 .font-size(@size) {
@@ -72,3 +73,10 @@
 .accent-color-5 {color: @accent_colors-5}
 .accent-color-6 {color: @accent_colors-6}
 .accent-color-7 {color: @accent_colors-7}
+
+// background colors
+.bg-color(@color) {
+  background-color: @color !important;
+}
+
+.bg-color-ephemeral {.bg-color(@ephemeral-color)}
diff --git a/app/style/common/variables.less b/app/style/common/variables.less
index cc57068b3bc..0f227dcaeda 100644
--- a/app/style/common/variables.less
+++ b/app/style/common/variables.less
@@ -22,7 +22,8 @@
 // ----------------------------------------------------------------------------
 @ars-font-path:       "../font/";
 
-@font-family-base:    BlinkMacSystemFont, -apple-system, "Helvetica Neue", Arial, sans-serif;
+@font-family-base:      BlinkMacSystemFont, -apple-system, "Helvetica Neue", Arial, sans-serif;
+@font-family-ephemeral: 'Redacted Script';
 
 @font-size-xxs:       8px;
 @font-size-xs:        11px;
@@ -74,7 +75,9 @@
 @graphite:                #8d989f;
 
 // use for seperator and icon surrounds on white background
-@seperator-color:       fade(@graphite, 24%);
+@seperator-color:         fade(@graphite, 24%);
+
+@ephemeral-color:         #ff5000;
 
 // ----------------------------------------------------------------------------
 // Buttons
diff --git a/app/style/components/ephemeral-timer.less b/app/style/components/ephemeral-timer.less
new file mode 100644
index 00000000000..118f5835738
--- /dev/null
+++ b/app/style/components/ephemeral-timer.less
@@ -0,0 +1,42 @@
+/*
+ * Wire
+ * Copyright (C) 2016 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+.ephemeral-timer {
+  display: inline-block;
+  background-color: #fff;
+  border-radius: 4px;
+  list-style: none;
+  margin: 0;
+  padding: 3px;
+}
+
+.ephemeral-timer-bullet:before {
+  .circle(3px);
+  display: block;
+  content: "";
+  background-color: @ephemeral-color;
+}
+
+.ephemeral-timer-bullet-inactive:before {
+  opacity: 0.24;
+}
+
+.ephemeral-timer-bullet + .ephemeral-timer-bullet {
+  margin-top: 2px;
+}
diff --git a/app/style/content/conversation/conversation-input.less b/app/style/content/conversation/conversation-input.less
index 509f3f0c4d4..70663386182 100644
--- a/app/style/content/conversation/conversation-input.less
+++ b/app/style/content/conversation/conversation-input.less
@@ -22,7 +22,6 @@
   box-sizing: content-box;
   width: 100%;
   min-height: @conversation-input-min-height;
-  overflow: hidden;
   background-color: #fff;
 }
 
@@ -57,14 +56,16 @@
     color: fade(@graphite, 48%);
     padding-left: 8px;
   }
+
+  &.ephemeral-input::placeholder {
+    color: @ephemeral-color;
+  }
 }
 
 .controls-left {
+  .flex-center;
   width: @conversation-message-sender-width;
   height: @conversation-input-min-height;
-  align-items: center;
-  display: flex;
-  justify-content: center;
 }
 
 .controls-center {
@@ -83,7 +84,46 @@
 }
 
 .controls-right-button {
+  position: relative;
   flex: 0 0 auto;
   margin-left: 12px;
   margin-right: 12px;
 }
+
+.conversation-input-ephemeral {
+  position: relative;
+}
+
+.controls-right-button-ephemeral-context {
+  .square(32px);
+  position: absolute;
+  left: 0;
+  top: 0;
+  outline: 0;
+}
+
+.ephemeral-mode,
+.bubble-menu .ephemeral-mode {
+  color: @ephemeral-color;
+}
+
+.ephemeral-timer-button {
+  .circle(@avatar-diameter-xs);
+  position: relative;
+  color: @ephemeral-color;
+  border: 1px solid fade(@ephemeral-color, 40%);
+  font-size: @font-size-xs;
+  font-weight: 600;
+  line-height: @avatar-diameter-xs - 2;
+  text-align: center;
+  margin: 4px;
+}
+
+.ephemeral-timer-button-unit {
+  .circle(16px);
+  position: absolute;
+  right: -8px;
+  top: -2px;
+  background-color: #fff;
+  line-height: 14px;
+}
diff --git a/app/style/content/conversation/message-list.less b/app/style/content/conversation/message-list.less
index bc9d3abc5ea..f64f731c9e9 100644
--- a/app/style/content/conversation/message-list.less
+++ b/app/style/content/conversation/message-list.less
@@ -32,21 +32,6 @@
   transform: translateZ(0);
   height: 100%;
   max-width: @conversation-max-width;
-
-  &.messages-centered {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-}
-
-// actions pill
-.action-pill-style() {
-  opacity: 0;
-  line-height: 18px;
-  text-decoration: none;
-  z-index: 1;
-  transition: opacity, .3s;
 }
 
 // MESSAGE
@@ -54,13 +39,9 @@
   position: relative;
   margin-bottom: 16px;
 
-  a {
-    text-decoration: none;
-  }
-
-  & * {
-    .accent-selection-color();
-  }
+  & a {text-decoration: none;}
+  & * {.accent-selection-color;}
+  &:last-child {margin-bottom: 24px;}
 
   &.hover .time,
   &:hover .time,
@@ -75,70 +56,18 @@
       opacity: 1;
     }
   }
-
-  .show-timestamp.time + .message-status {
-    opacity: 0;
-  }
-
-  &:last-child {
-    margin-bottom: 24px;
-  }
-
-  .time,
-  .message-status {
-    .action-pill-style;
-    color: fade(#000, 40%);
-    font-size: @font-size-xs;
-    padding-left: 6px;
-    padding-right: 6px;
-    pointer-events: none;
-    position: absolute;
-    right: 24px;
-    top: 3px;
-  }
-}
-
-.message-is-editing {
-  color: @graphite;
-}
-
-.message-fade-out {
-  opacity: 0;
-  transition: opacity @animation-timing-slow @ease-out-quart
 }
 
-// CONTEXT MENU
-.context-menu {
-  .square(18px);
-  .action-pill-style;
-  display: flex;
-  justify-content: center;
-  position: absolute;
-  right: 72px;
-  top: 3px;
-
-  &:focus {
-    opacity: 1 !important;
-    outline: none;
-  }
-}
-
-// MESSAGE GRID
+// MESSAGE - HEADER
 .message-header {
   display: flex;
   margin-bottom: 4px;
   line-height: @avatar-diameter-xs;
 }
 
-.message-hide-user-avatar {
-  display: none;
-}
-
 .message-header-icon {
-  align-items: center;
+  .flex-center;
   color: @graphite-dark;
-  display: flex;
-  justify-content: center;
   width: @conversation-message-sender-width;
 }
 
@@ -172,7 +101,7 @@
   min-width: @conversation-message-timestamp-width;
 }
 
-// MEMBER TIMESTAMP
+// MESSAGE - TIMESTAMP
 .message-timestamp {
   border-bottom: 1px solid @seperator-color;
   height: 48px;
@@ -207,117 +136,7 @@
   time[data-timestamp-type='day'] {display: block;}
 }
 
-// MEMBER MESSAGE
-.message-connected {
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-  margin-top: 32px;
-  margin-bottom: 48px;
-}
-
-.message-connected-header {
-  font-size: @font-size-lg;
-  line-height: 42px;
-}
-
-.message-connected-avatar {
-  margin-top: 32px;
-}
-
-.message-connected-cancel {
-  .label-xs;
-  cursor: pointer;
-  margin-top: 32px;
-}
-
-// PING MESSAGE
-@keyframes ping-scale-animation {0%{ transform: scale(1); } 100%{ transform: scale(1.8);}}
-@keyframes ping-opacity-animation {0%{ opacity: 1; } 100%{ opacity: 0;}}
-
-.ping-animation {
-  animation-name: ping-scale-animation, ping-opacity-animation;
-  animation-delay: .05s, .05s;
-  animation-timing-function: @ease-out-expo, @ease-out-quart;
-  animation-duration: .7s, .7s;
-}
-
-.ping-animation-soft {animation-iteration-count: 3, 3}
-
-.message-icon-ping {
-  margin-left: 16px;
-}
-
-// CALL MESSAGE
-.message-icon-missed-call {
-  position: absolute;
-  top: 8px;
-  left: 16px;
-
-  &.accent-color-1 { path {fill: @accent_colors-1}}
-  &.accent-color-2 { path {fill: @accent_colors-2}}
-  &.accent-color-3 { path {fill: @accent_colors-3}}
-  &.accent-color-4 { path {fill: @accent_colors-4}}
-  &.accent-color-5 { path {fill: @accent_colors-5}}
-  &.accent-color-6 { path {fill: @accent_colors-6}}
-  &.accent-color-7 { path {fill: @accent_colors-7}}
-}
-
-// DECRYPT MESSAGE
-.message-body-decrypt-error {
-  min-height: 24px;
-}
-
-.message-header-decrypt-error-label {
-  .label-xs;
-  color: @graphite;
-}
-
-.message-header-decrypt-reset-session {
-  .label-xs;
-  display: inline-block;
-  cursor: pointer;
-  position: relative;
-  height: 16px;
-  width: 100%;
-}
-
-.message-header-decrypt-reset-session-action,
-.message-header-decrypt-reset-session-spinner {
-  position: absolute;
-  left: 0;
-  top: 0;
-}
-
-.message-header-decrypt-reset-session-action {
-  height: 12px;
-}
-
-.message-header-decrypt-reset-session-spinner {
-  top: 4px;
-}
-
-// MESSAGE SPACING
-.message-rename,
-.message-member,
-.message-ping {
-  padding-top: 16px;
-  margin-bottom: 32px;
-}
-
-.message-ping {
-  .time,
-  .context-menu {
-    top: 21px;
-  }
-}
-
-.message-call {
-  margin-bottom: 40px;
-  padding-top: 16px;
-}
-
-// MESSAGE BODY
+// MESSAGE - BODY
 .message-body {
   position: relative;
   margin-top: -5px;
@@ -334,14 +153,6 @@
         margin-left: 0;
       }
     }
-
-    .time,
-    .context-menu,
-    .message-status {
-      top: 24px;
-      background-color: fade(#fff, 80%);
-      border-radius: 16px;
-    }
   }
 
   .text {
@@ -420,6 +231,11 @@
     cursor: pointer;
     max-width: 100%;
     max-height: 80vh;
+
+    &.image-ephemeral {
+      cursor: default;
+      opacity: 0;
+    }
   }
 
   .image-placeholder-icon {
@@ -439,9 +255,7 @@
 }
 
 .message-footer-icon {
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  .flex-center;
   width: @conversation-message-sender-width;
 }
 
@@ -478,3 +292,191 @@
     transition-delay: @animation-timing-faster + .05;
   }
 }
+
+// MESSAGE - ACTIONS
+.message-body-actions {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: @conversation-message-timestamp-width;
+  height: @line-height-lg;
+
+  // actions pill
+  .action-pill-style() {
+    opacity: 0;
+    line-height: 18px;
+    text-decoration: none;
+    z-index: 1;
+    transition: opacity, .3s;
+  }
+
+  // CONTEXT MENU
+  .context-menu {
+    .square(18px);
+    .action-pill-style;
+    display: flex;
+    justify-content: center;
+    position: absolute;
+    right: 72px;
+    top: 3px;
+
+    &:focus {
+      opacity: 1 !important;
+      outline: none;
+    }
+  }
+
+  .show-timestamp.time + .message-status {
+    opacity: 0;
+  }
+
+  .time,
+  .message-status {
+    .action-pill-style;
+    color: fade(#000, 40%);
+    font-size: @font-size-xs;
+    padding-left: 6px;
+    padding-right: 6px;
+    pointer-events: none;
+    position: absolute;
+    right: 24px;
+    top: 3px;
+  }
+
+  .image-widescreen & {
+    top: 24px;
+
+    .time,
+    .context-menu,
+    .message-status {
+      background-color: fade(#fff, 80%);
+      border-radius: 16px;
+    }
+  }
+
+  .message-ephemeral-timer {
+    position: absolute;
+    top: 0;
+    right: 8px;
+  }
+}
+
+.message-body-actions-large {
+  width: 160px;
+  position: relative;
+}
+
+// MEMBER MESSAGE
+.message-connected {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  margin-top: 32px;
+  margin-bottom: 48px;
+}
+
+.message-connected-header {
+  font-size: @font-size-lg;
+  line-height: 42px;
+}
+
+.message-connected-avatar {
+  margin-top: 32px;
+}
+
+.message-connected-cancel {
+  .label-xs;
+  cursor: pointer;
+  margin-top: 32px;
+}
+
+// PING MESSAGE
+@keyframes ping-scale-animation {0%{ transform: scale(1); } 100%{ transform: scale(1.8);}}
+@keyframes ping-opacity-animation {0%{ opacity: 1; } 100%{ opacity: 0;}}
+
+.ping-animation {
+  animation-name: ping-scale-animation, ping-opacity-animation;
+  animation-delay: .05s, .05s;
+  animation-timing-function: @ease-out-expo, @ease-out-quart;
+  animation-duration: .7s, .7s;
+}
+
+.ping-animation-soft {animation-iteration-count: 3, 3}
+
+.message-icon-ping {
+  margin-left: 8px;
+}
+
+// CALL MESSAGE
+.message-icon-missed-call {
+  position: absolute;
+  top: 8px;
+  left: 16px;
+
+  &.accent-color-1 { path {fill: @accent_colors-1}}
+  &.accent-color-2 { path {fill: @accent_colors-2}}
+  &.accent-color-3 { path {fill: @accent_colors-3}}
+  &.accent-color-4 { path {fill: @accent_colors-4}}
+  &.accent-color-5 { path {fill: @accent_colors-5}}
+  &.accent-color-6 { path {fill: @accent_colors-6}}
+  &.accent-color-7 { path {fill: @accent_colors-7}}
+}
+
+// DECRYPT MESSAGE
+.message-body-decrypt-error {
+  min-height: 24px;
+}
+
+.message-header-decrypt-error-label {
+  .label-xs;
+  color: @graphite;
+}
+
+.message-header-decrypt-reset-session {
+  .label-xs;
+  display: inline-block;
+  cursor: pointer;
+  position: relative;
+  height: 16px;
+  width: 100%;
+}
+
+.message-header-decrypt-reset-session-action,
+.message-header-decrypt-reset-session-spinner {
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.message-header-decrypt-reset-session-action {
+  height: 12px;
+}
+
+.message-header-decrypt-reset-session-spinner {
+  top: 4px;
+}
+
+// MESSAGE SPACING
+.message-rename,
+.message-member,
+.message-ping {
+  padding-top: 16px;
+  margin-bottom: 32px;
+}
+
+.message-ping {
+  .message-body-actions {
+    position: relative;
+  }
+}
+
+.message-call {
+  margin-bottom: 40px;
+  padding-top: 16px;
+}
+
+// TODO make generic class
+.ephemeral-message-obfuscated {
+  font-family: @font-family-ephemeral;
+  color: @ephemeral-color;
+}
diff --git a/app/style/fonts/README.md b/app/style/fonts/README.md
index cb3e40da16a..6bbb0a6cc30 100644
--- a/app/style/fonts/README.md
+++ b/app/style/fonts/README.md
@@ -1,6 +1,6 @@
 Update font
 ====
 
-1. Find the generated icon font in Dropbox/Zeta Main/Design/Icons/Webapp - Icon
-2. Copy the content of style.css to /style/fonts/zeta-neue.css and remove all sources except ttf (should point to /font)
-3. Copy Dropbox/Zeta Main/Design/Icons/Webapp - Icon/fonts/Wire.tff to /fonts/Wire.ttf
+1. Find the generated icon font in "Dropbox/Zeta Main/Design/Icons/Webapp - Icon": https://www.dropbox.com/work/Zeta-Main/Design/Assets/Webapp%20-%20Icon%20font
+2. Copy the content of "style.css" to ""/style/fonts/zeta-neue.css" and remove all sources except ttf (should point to /font)
+3. Copy "Dropbox/Zeta Main/Design/Icons/Webapp - Icon/fonts/Wire.tff" to "/fonts/Wire.ttf"
diff --git a/app/style/fonts/redacted.css b/app/style/fonts/redacted.css
new file mode 100644
index 00000000000..e9862f62c4f
--- /dev/null
+++ b/app/style/fonts/redacted.css
@@ -0,0 +1,25 @@
+/*
+ * Wire
+ * Copyright (C) 2016 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+@font-face {
+  font-family: 'Redacted Script';
+  src: url('/font/redacted-script-regular.woff2') format('woff2');
+  font-weight: normal;
+  font-style: normal;
+}
diff --git a/app/style/fonts/zeta-neue.css b/app/style/fonts/zeta-neue.css
index 0f5ef9ba760..2d3e8ac2714 100755
--- a/app/style/fonts/zeta-neue.css
+++ b/app/style/fonts/zeta-neue.css
@@ -19,7 +19,7 @@
 
 @font-face {
   font-family: 'Wire';
-  src: url('/font/Wire.ttf?f4rt5') format('truetype');
+  src: url('/font/Wire.ttf?3b4ff8') format('truetype');
   font-weight: normal;
   font-style: normal;
 }
@@ -225,6 +225,9 @@
 .icon-video-off:before {
   content: "\e231";
 }
+.icon-hourglass:before {
+  content: "\e239";
+}
 .icon-checkbox:before {
   content: "\e600";
 }
diff --git a/app/style/main.less b/app/style/main.less
index f4a56d77f4c..4f9ad93dcc7 100644
--- a/app/style/main.less
+++ b/app/style/main.less
@@ -20,6 +20,7 @@
 @import (less) "ext/css/normalize-css/normalize.css";
 @import (less) "ext/css/antiscroll-2/antiscroll-2.css";
 @import (less) "ext/css/webapp-module-external/github.css";
+@import (less) "fonts/redacted.css";
 @import (less) "fonts/zeta-neue.css";
 
 @import "ext/less/webapp-module-bubble/webapp-module-bubble";
@@ -64,6 +65,7 @@
 @import "components/context-menu";
 @import "components/device-card";
 @import "components/device-remove";
+@import "components/ephemeral-timer";
 @import "components/asset/common/common.less";
 @import "components/asset/video-asset";
 @import "components/asset/file-asset";
diff --git a/bower.json b/bower.json
index a9f5fa6792c..641f879b089 100644
--- a/bower.json
+++ b/bower.json
@@ -7,7 +7,7 @@
     "cryptojs": "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/crypto-js/CryptoJS%20v3.1.2.zip",
     "highlight.js": "https://github.com/isagalaev/highlight.js.git#9.4.0",
     "dexie": "https://github.com/dfahlander/Dexie.js.git#1.4.1",
-    "generic-message-proto": "https://github.com/wireapp/generic-message-proto.git#1.17.0",
+    "generic-message-proto": "https://github.com/wireapp/generic-message-proto.git#1.18.0",
     "iframeTracker-jquery": "https://github.com/vincepare/iframeTracker-jquery.git#1.1.0",
     "jquery": "https://github.com/jquery/jquery.git#2.1.4",
     "keyboardjs": "https://github.com/RobertWHurst/KeyboardJS.git#2.2.1",
diff --git a/crowdin.yaml b/crowdin.yaml
index cfeb89178a2..9ed7cc7ee4d 100644
--- a/crowdin.yaml
+++ b/crowdin.yaml
@@ -4,6 +4,6 @@ base_path: .
 files:
   -
     source: '/app/script/localization/strings.coffee'
-    translation: '/app/script/localization/strings-%two_letters_code%.coffee'
+    translation: '/app/script/localization/strings-%locale%.coffee'
     ignore:
       - /**/?.pot
diff --git a/test/api/OpenGraphMocks.js b/test/api/OpenGraphMocks.js
index 79f88c5cc88..a97d0be5c34 100644
--- a/test/api/OpenGraphMocks.js
+++ b/test/api/OpenGraphMocks.js
@@ -33,11 +33,11 @@ window.OpenGraphMocks = {
 
   getWireMock: function() {
     return {
-      'title': 'Wire — modern, private communication. For iOS, Android, OS X, Windows and web.',
+      'title': 'Wire · Modern communication, full privacy. For iOS, Android, macOS, Windows and web.',
       'type': 'website',
       'url': 'https://wire.com/',
       'image': {
-        'url': 'https://lh3.ggpht.com/gbxDT30ZwpwYMCF7ilrSaIpRQP3Z1Xdx2WUcyW5x_e8FDN8kA4CJGQQ0fFpVhKiGnPkAIOEf7S1_9cNi684Be-OY=s1024'
+        'url': 'https://lh3.ggpht.com/ElqTCcY1N0c3EAX27MRFoXynZlbTaJD2KEqYNXAPn5YQPZa6Bvsux4NCgEMoUhazdIWWelAU__Kzmr55j55EsgM=s1024'
       },
       'description': 'HD quality calls, private and group chats with inline photos, music and video. Secure and perfectly synced across your devices.'
     }
diff --git a/test/api/TestFactory.js b/test/api/TestFactory.js
index a391955179a..83b7a6f265a 100644
--- a/test/api/TestFactory.js
+++ b/test/api/TestFactory.js
@@ -124,6 +124,9 @@ window.TestFactory.prototype.exposeClientActors = function () {
       window.client_repository = new z.client.ClientRepository(client_service, window.cryptography_repository);
       window.client_repository.logger.level = self.settings.logging_level;
       window.client_repository.init(user);
+      var payload = {"cookie":"webapp@2153234453@temporary@1470926647664","time":"2016-10-07T16:01:42.133Z","location":{"lat":52.5233,"lon":13.4138},"address":"62.96.148.44","model":"Chrome (Temporary)","id":"132b3653b33f851f","type":"temporary","class":"desktop","label":"Windows 10","meta":{"is_verified":true,"primary_key":"local_identity"}};
+      var current_client = new z.client.Client(payload);
+      window.client_repository.current_client(current_client);
 
       resolve(window.client_repository);
     });
diff --git a/test/unit_tests/conversation/ConversationRepositorySpec.coffee b/test/unit_tests/conversation/ConversationRepositorySpec.coffee
index 2b9569822c0..a402290ec4d 100644
--- a/test/unit_tests/conversation/ConversationRepositorySpec.coffee
+++ b/test/unit_tests/conversation/ConversationRepositorySpec.coffee
@@ -433,6 +433,28 @@ describe 'z.conversation.ConversationRepository', ->
         done()
       .catch done.fail
 
+    it 'deletes message and skips delete message if message is ephemeral', (done) ->
+      other_user_id = z.util.create_random_uuid()
+      message_to_delete_et.from = other_user_id
+      message_to_delete_et.expire_after_millis true
+
+      event =
+        conversation: conversation_et.id
+        id: z.util.create_random_uuid()
+        data:
+          message_id: message_to_delete_et.id
+        from: other_user_id
+        time: new Date().toISOString()
+        type: z.event.Client.CONVERSATION.MESSAGE_DELETE
+
+      expect(conversation_et.get_message_by_id(message_to_delete_et.id)).toBeDefined()
+      conversation_repository._on_message_deleted conversation_et, event
+      .then ->
+        expect(conversation_et.get_message_by_id(message_to_delete_et.id)).not.toBeDefined()
+        expect(conversation_repository._add_delete_message).not.toHaveBeenCalled()
+        done()
+      .catch done.fail
+
   describe 'get_number_of_pending_uploads', ->
 
     it 'should return number of pending uploads if there are pending uploads', ->
diff --git a/test/unit_tests/entity/ConversationSpec.coffee b/test/unit_tests/entity/ConversationSpec.coffee
index 3d14332cbe7..69d75271658 100644
--- a/test/unit_tests/entity/ConversationSpec.coffee
+++ b/test/unit_tests/entity/ConversationSpec.coffee
@@ -567,7 +567,7 @@ describe 'Conversation', ->
       user_et.email 'hello@wire.com'
       expect(conversation_et.is_with_bot()).toBe false
 
-  describe 'get_last_added_text_message', ->
+  describe 'get_last_editable_message', ->
 
     self_user_et = undefined
 
@@ -579,21 +579,21 @@ describe 'Conversation', ->
       conversation_et.remove_messages()
 
     it 'returns undefined if conversation has no messages', ->
-      expect(conversation_et.get_last_added_text_message()).not.toBeDefined()
+      expect(conversation_et.get_last_editable_message()).not.toBeDefined()
 
     it 'returns undefined if last message is not text and not added by self user', ->
       message_et = new z.entity.PingMessage()
       message_et.id = z.util.create_random_uuid()
       message_et.user new z.entity.User()
       conversation_et.add_message message_et
-      expect(conversation_et.get_last_added_text_message()).not.toBeDefined()
+      expect(conversation_et.get_last_editable_message()).not.toBeDefined()
 
     it 'returns undefined if last message is not text and not added by self user', ->
       message_et = new z.entity.PingMessage()
       message_et.id = z.util.create_random_uuid()
       message_et.user new z.entity.User()
       conversation_et.add_message message_et
-      expect(conversation_et.get_last_added_text_message()).not.toBeDefined()
+      expect(conversation_et.get_last_editable_message()).not.toBeDefined()
 
     it 'returns undefined if last message is text and not send by self user', ->
       message_et = new z.entity.ContentMessage()
@@ -601,7 +601,7 @@ describe 'Conversation', ->
       message_et.id = z.util.create_random_uuid()
       message_et.user new z.entity.User()
       conversation_et.add_message message_et
-      expect(conversation_et.get_last_added_text_message()).not.toBeDefined()
+      expect(conversation_et.get_last_editable_message()).not.toBeDefined()
 
     it 'returns message if last message is text and send by self user', ->
       message_et = new z.entity.ContentMessage()
@@ -609,7 +609,7 @@ describe 'Conversation', ->
       message_et.id = z.util.create_random_uuid()
       message_et.user self_user_et
       conversation_et.add_message message_et
-      expect(conversation_et.get_last_added_text_message()).toBeDefined()
+      expect(conversation_et.get_last_editable_message()).toBeDefined()
 
     it 'returns message if last message is text and send by self user', ->
       message_et = new z.entity.ContentMessage()
@@ -623,8 +623,8 @@ describe 'Conversation', ->
       ping_message_et.user new z.entity.User()
       conversation_et.add_message ping_message_et
 
-      expect(conversation_et.get_last_added_text_message()).toBeDefined()
-      expect(conversation_et.get_last_added_text_message().id).toBe message_et.id
+      expect(conversation_et.get_last_editable_message()).toBeDefined()
+      expect(conversation_et.get_last_editable_message().id).toBe message_et.id
 
     it 'returns message if last message is text and send by self user', ->
       message_et = new z.entity.ContentMessage()
@@ -639,8 +639,25 @@ describe 'Conversation', ->
       next_message_et.user self_user_et
       conversation_et.add_message next_message_et
 
-      expect(conversation_et.get_last_added_text_message()).toBeDefined()
-      expect(conversation_et.get_last_added_text_message().id).toBe next_message_et.id
+      expect(conversation_et.get_last_editable_message()).toBeDefined()
+      expect(conversation_et.get_last_editable_message().id).toBe next_message_et.id
+
+    it 'returns message if last message is text and ephemeral', ->
+      message_et = new z.entity.ContentMessage()
+      message_et.add_asset new z.entity.Text()
+      message_et.id = z.util.create_random_uuid()
+      message_et.user self_user_et
+      conversation_et.add_message message_et
+
+      ephemeral_message_et = new z.entity.ContentMessage()
+      ephemeral_message_et.add_asset new z.entity.Text()
+      ephemeral_message_et.id = z.util.create_random_uuid()
+      ephemeral_message_et.user self_user_et
+      ephemeral_message_et.expire_after_millis true
+      conversation_et.add_message ephemeral_message_et
+
+      expect(conversation_et.get_last_editable_message()).toBeDefined()
+      expect(conversation_et.get_last_editable_message().id).toBe message_et.id
 
   describe 'get_last_delivered_message', ->
 
diff --git a/test/unit_tests/event/EventRepositorySpec.coffee b/test/unit_tests/event/EventRepositorySpec.coffee
index 975b1d4cbdd..e70fecbc702 100644
--- a/test/unit_tests/event/EventRepositorySpec.coffee
+++ b/test/unit_tests/event/EventRepositorySpec.coffee
@@ -62,7 +62,6 @@ describe 'Event Repository', ->
 
   describe 'update_from_notification_stream', ->
     beforeEach ->
-      spyOn(cryptography_repository, 'save_encrypted_event')
       spyOn(event_repository, '_handle_notification').and.callThrough()
       spyOn(event_repository, '_buffer_web_socket_notification').and.callThrough()
       spyOn(event_repository, '_handle_buffered_notifications').and.callThrough()
@@ -109,14 +108,12 @@ describe 'Event Repository', ->
   describe '_handle_event', ->
     beforeEach ->
       event_repository.notification_handling_state z.event.NotificationHandlingState.WEB_SOCKET
-      spyOn(cryptography_repository, 'save_encrypted_event').and.returnValue Promise.resolve({data: 'dummy content'})
       spyOn(cryptography_repository, 'save_unencrypted_event').and.returnValue Promise.resolve({data: 'dummy content'})
       spyOn(event_repository, '_distribute_event')
 
     it 'should not save but distribute user events', (done) ->
       event_repository._handle_event {type: z.event.Backend.USER.UPDATE}, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then ->
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).not.toHaveBeenCalled()
         expect(event_repository._distribute_event).toHaveBeenCalled()
         done()
@@ -125,7 +122,6 @@ describe 'Event Repository', ->
     it 'should not save but distribute call events', (done) ->
       event_repository._handle_event {type: z.event.Backend.CALL.FLOW_ACTIVE}, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then ->
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).not.toHaveBeenCalled()
         expect(event_repository._distribute_event).toHaveBeenCalled()
         done()
@@ -134,7 +130,6 @@ describe 'Event Repository', ->
     it 'should not save but distribute conversation.create event', (done) ->
       event_repository._handle_event {type: z.event.Backend.CONVERSATION.CREATE}, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then ->
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).not.toHaveBeenCalled()
         expect(event_repository._distribute_event).toHaveBeenCalled()
         done()
@@ -148,7 +143,6 @@ describe 'Event Repository', ->
       event_repository._handle_event event, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then (result) ->
         expect(result).toBeTruthy()
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).not.toHaveBeenCalled()
         expect(event_repository._distribute_event).not.toHaveBeenCalled()
         done()
@@ -162,7 +156,6 @@ describe 'Event Repository', ->
       event_repository._handle_event event, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then (result) ->
         expect(result).toBeTruthy()
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).not.toHaveBeenCalled()
         expect(event_repository._distribute_event).not.toHaveBeenCalled()
         done()
@@ -176,7 +169,6 @@ describe 'Event Repository', ->
       event_repository._handle_event event, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then (result) ->
         expect(result).toBeTruthy()
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).not.toHaveBeenCalled()
         expect(event_repository._distribute_event).not.toHaveBeenCalled()
         done()
@@ -191,7 +183,6 @@ describe 'Event Repository', ->
       event_repository._handle_event event, z.event.EventRepository::NOTIFICATION_SOURCE.STREAM
       .then (result) ->
         expect(result).toBeTruthy()
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).not.toHaveBeenCalled()
         expect(event_repository._distribute_event).not.toHaveBeenCalled()
         done()
@@ -204,7 +195,6 @@ describe 'Event Repository', ->
 
       event_repository._handle_event event, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then ->
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).toHaveBeenCalled()
         expect(event_repository._distribute_event).toHaveBeenCalled()
         done()
@@ -217,7 +207,6 @@ describe 'Event Repository', ->
 
       event_repository._handle_event event, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then ->
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).toHaveBeenCalled()
         expect(event_repository._distribute_event).toHaveBeenCalled()
         done()
@@ -230,7 +219,6 @@ describe 'Event Repository', ->
 
       event_repository._handle_event event, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then ->
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).toHaveBeenCalled()
         expect(event_repository._distribute_event).toHaveBeenCalled()
         done()
@@ -243,7 +231,6 @@ describe 'Event Repository', ->
 
       event_repository._handle_event event, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then ->
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).toHaveBeenCalled()
         expect(event_repository._distribute_event).toHaveBeenCalled()
         done()
@@ -256,7 +243,6 @@ describe 'Event Repository', ->
 
       event_repository._handle_event event, z.event.EventRepository::NOTIFICATION_SOURCE.WEB_SOCKET
       .then ->
-        expect(cryptography_repository.save_encrypted_event).not.toHaveBeenCalled()
         expect(cryptography_repository.save_unencrypted_event).toHaveBeenCalled()
         expect(event_repository._distribute_event).toHaveBeenCalled()
         done()
diff --git a/test/unit_tests/service/ClientSpec.coffee b/test/unit_tests/service/ClientSpec.coffee
index 87a79129460..858a7363fd9 100644
--- a/test/unit_tests/service/ClientSpec.coffee
+++ b/test/unit_tests/service/ClientSpec.coffee
@@ -196,3 +196,33 @@ describe 'z.service.Client', ->
         expect(client.request_queue.length).toBe 1
         expect(client.execute_on_connectivity).toHaveBeenCalled()
         done()
+
+  describe 'send_json', ->
+    original_config = undefined
+
+    beforeEach ->
+      original_config =
+        callback: -> 'callback'
+        data: 'data'
+        headers:
+         'X-TEST-HEADER': 'header'
+        processData: true
+        timeout: 100
+        type: 'GET'
+        url: 'dummy/url'
+        withCredentials: true
+
+    it 'passes all params to send_request', (done) ->
+      spyOn(client, 'send_request').and.callFake (config) ->
+        expect(config.callback).toBe original_config.callback
+        expect(config.contentType).toBe 'application/json; charset=utf-8'
+        expect(config.headers['X-TEST-HEADER']).toBe original_config.headers['X-TEST-HEADER']
+        expect(config.headers['Content-Encoding']).toBe 'gzip'
+        expect(config.data).toBeDefined()
+        expect(config.processData).toBe original_config.processData
+        expect(config.timeout).toBe original_config.timeout
+        expect(config.type).toBe original_config.type
+        expect(config.url).toBe original_config.url
+        expect(config.withCredentials).toBe original_config.withCredentials
+        done()
+      client.send_json(original_config).catch(done.fail)
diff --git a/test/unit_tests/system_notification/SystemNotificationRepositorySpec.coffee b/test/unit_tests/system_notification/SystemNotificationRepositorySpec.coffee
index 79fc49dfca0..f6428da71f1 100644
--- a/test/unit_tests/system_notification/SystemNotificationRepositorySpec.coffee
+++ b/test/unit_tests/system_notification/SystemNotificationRepositorySpec.coffee
@@ -38,7 +38,7 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
 
       # Notification
       notification_content =
-        title: z.util.trunc_text conversation_et.display_name(), z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        title: z.util.truncate_text conversation_et.display_name(), z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
         options:
           body: ''
           data:
@@ -131,7 +131,7 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
         system_notification_repository.notify conversation_et, message_et
 
         title = "#{message_et.user().first_name()} in #{conversation_et.display_name()}"
-        notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
         result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
         expect(result).toEqual JSON.stringify notification_content
         expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
@@ -158,7 +158,7 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
         system_notification_repository.notify conversation_et, message_et
 
         title = "#{message_et.user().first_name()} in #{conversation_et.display_name()}"
-        notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
         result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
         expect(result).toEqual JSON.stringify notification_content
         expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
@@ -189,7 +189,7 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
         system_notification_repository.notify conversation_et, message_et
 
         title = "#{message_et.user().first_name()} in #{conversation_et.display_name()}"
-        notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
         result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
         expect(result).toEqual JSON.stringify notification_content
         expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
@@ -212,7 +212,7 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
         system_notification_repository.notify conversation_et, message_et
 
         title = "#{message_et.user().first_name()} in #{conversation_et.display_name()}"
-        notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
         result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
         expect(result).toEqual JSON.stringify notification_content
         expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
@@ -235,7 +235,36 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
         system_notification_repository.notify conversation_et, message_et
 
         title = "#{message_et.user().first_name()} in #{conversation_et.display_name()}"
-        notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
+        expect(result).toEqual JSON.stringify notification_content
+        expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
+
+    describe 'for ephemeral messages', ->
+      beforeEach ->
+        message_et.expire_after_millis 5000
+        notification_content.title = z.string.system_notification_ephemeral_title
+        notification_content.options.body = z.string.system_notification_ephemeral
+
+      it 'that contains text', ->
+        system_notification_repository.notify conversation_et, message_et
+
+        result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
+        expect(result).toEqual JSON.stringify notification_content
+        expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
+
+      it 'that contains an image', ->
+        message_et.assets.push new z.entity.Location()
+        system_notification_repository.notify conversation_et, message_et
+
+        result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
+        expect(result).toEqual JSON.stringify notification_content
+        expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
+
+      it 'that contains a location', ->
+        message_et.assets.push new z.entity.MediumImage()
+        system_notification_repository.notify conversation_et, message_et
+
         result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
         expect(result).toEqual JSON.stringify notification_content
         expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
@@ -243,7 +272,7 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
   describe 'shows a well-formed group notification', ->
     beforeEach ->
       title = "#{message_et.user().first_name()} in #{conversation_et.display_name()}"
-      notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+      notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
       notification_content.trigger = system_notification_repository._create_trigger conversation_et, message_et
 
     it 'if a group is created', ->
@@ -283,7 +312,7 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
       beforeEach ->
         message_et.type = z.event.Backend.CONVERSATION.MEMBER_JOIN
         title = "#{message_et.user().first_name()} in #{conversation_et.display_name()}"
-        notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
         notification_content.trigger = system_notification_repository._create_trigger conversation_et, message_et
 
       it 'with one user being added to the conversation', ->
@@ -320,7 +349,7 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
       beforeEach ->
         message_et.type = z.event.Backend.CONVERSATION.MEMBER_LEAVE
         title = "#{message_et.user().first_name()} in #{conversation_et.display_name()}"
-        notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+        notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
         notification_content.trigger = system_notification_repository._create_trigger conversation_et, message_et
 
       it 'with one user being removed from the conversation', ->
@@ -372,7 +401,7 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
       message_et.user user_et
 
       title = message_et.user().name()
-      notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+      notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
       notification_content.options.data.conversation_id = connection_et.conversation_id
       notification_content.options.tag = connection_et.conversation_id
       notification_content.trigger = system_notification_repository._create_trigger conversation_et, message_et
@@ -420,7 +449,17 @@ describe 'z.SystemNotification.SystemNotificationRepository', ->
       system_notification_repository.notify conversation_et, message_et
 
       title = "#{message_et.user().first_name()} in #{conversation_et.display_name()}"
-      notification_content.title = z.util.trunc_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+      notification_content.title = z.util.truncate_text title, z.config.BROWSER_NOTIFICATION.TITLE_LENGTH, false
+      result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
+      expect(result).toEqual JSON.stringify notification_content
+      expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
+
+    it 'as an ephemeral message', ->
+      message_et.expire_after_millis 5000
+      notification_content.title = z.string.system_notification_ephemeral_title
+      notification_content.options.body = z.string.system_notification_ephemeral
+      system_notification_repository.notify conversation_et, message_et
+
       result = JSON.stringify system_notification_repository._show_notification.calls.first().args[0]
       expect(result).toEqual JSON.stringify notification_content
       expect(system_notification_repository._show_notification).toHaveBeenCalledTimes 1
diff --git a/test/unit_tests/ui/ShortcutSpec.coffee b/test/unit_tests/ui/ShortcutSpec.coffee
index 188f534b408..43f4781d1d1 100644
--- a/test/unit_tests/ui/ShortcutSpec.coffee
+++ b/test/unit_tests/ui/ShortcutSpec.coffee
@@ -30,7 +30,7 @@ describe 'Shortcut', ->
       it 'can get shortcut for mac', ->
         z.util.Environment.os.mac = true
         mac_shortcut = z.ui.Shortcut.get_shortcut z.ui.ShortcutType.ADD_PEOPLE
-        expect(mac_shortcut).toBe map[z.ui.ShortcutType.ADD_PEOPLE].shortcut.webapp.osx
+        expect(mac_shortcut).toBe map[z.ui.ShortcutType.ADD_PEOPLE].shortcut.webapp.macos
 
       it 'can get shortcut for pc', ->
         z.util.Environment.os.mac = false
@@ -45,7 +45,7 @@ describe 'Shortcut', ->
       it 'can get shortcut for electron mac', ->
         z.util.Environment.os.mac = true
         mac_shortcut = z.ui.Shortcut.get_shortcut z.ui.ShortcutType.ADD_PEOPLE
-        expect(mac_shortcut).toBe map[z.ui.ShortcutType.ADD_PEOPLE].shortcut.electron.osx
+        expect(mac_shortcut).toBe map[z.ui.ShortcutType.ADD_PEOPLE].shortcut.electron.macos
 
       it 'can get shortcut for electron pc', ->
         z.util.Environment.os.mac = false
diff --git a/test/unit_tests/util/StringUtilSpec.coffee b/test/unit_tests/util/StringUtilSpec.coffee
new file mode 100644
index 00000000000..8a75a269ba1
--- /dev/null
+++ b/test/unit_tests/util/StringUtilSpec.coffee
@@ -0,0 +1,37 @@
+#
+# Wire
+# Copyright (C) 2016 Wire Swiss GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+
+# grunt test_init && grunt test_run:util/StringUtil
+
+describe 'z.util.StringUtil', ->
+
+  describe 'obfuscate', ->
+
+    it 'obfuscates a text preserving it\'s whitespaces', ->
+      text = 'You Are The Sunshine Of My Life'
+      obfuscated = z.util.StringUtil.obfuscate text
+      whitespaces = obfuscated.match /[\n\r\s]+/gi
+
+      expect(obfuscated).not.toBe text
+      expect(whitespaces.length).toBe 6
+
+    it 'obfuscates a text keeping its length', ->
+      text = 'Bacon ipsum dolor amet sausage landjaeger ball tip brisket filet mignon, t-bone tenderloin tri-tip beef drumstick fatback burgdoggen ground round meatball. Tri-tip spare ribs ground round bresaola ball tip tail, sirloin chicken doner boudin turkey leberkas bacon alcatra. '
+      obfuscated = z.util.StringUtil.obfuscate text
+      expect(obfuscated).not.toBe text
+      expect(obfuscated.length).toBe text.length
diff --git a/test/unit_tests/util/UtilSpec.coffee b/test/unit_tests/util/UtilSpec.coffee
index 543adc192bc..9cc522b95a0 100644
--- a/test/unit_tests/util/UtilSpec.coffee
+++ b/test/unit_tests/util/UtilSpec.coffee
@@ -438,24 +438,24 @@ describe 'z.util.array_is_last', ->
     actual = z.util.array_is_last array, d
     expect(actual).toBeFalsy()
 
-describe 'z.util.trunc_text', ->
+describe 'z.util.truncate_text', ->
   it 'returns the full string if it is shorter than the target length', ->
-    text = z.util.trunc_text "#{lorem_ipsum.substr 0, 80}", 90
+    text = z.util.truncate_text "#{lorem_ipsum.substr 0, 80}", 90
     expect(text.length).toBe 80
     expect(text.charAt 79).not.toBe '…'
 
   it 'returns a truncated string of correct length if it is longer than the target length', ->
-    text = z.util.trunc_text "#{lorem_ipsum.substr 0, 80}", 70
+    text = z.util.truncate_text "#{lorem_ipsum.substr 0, 80}", 70
     expect(text.length).toBe 64
     expect(text.charAt 63).toBe '…'
 
   it 'returns a truncated string of correct length if word boundary is disabled', ->
-    text = z.util.trunc_text "#{lorem_ipsum.substr 0, 80}", 70, false
+    text = z.util.truncate_text "#{lorem_ipsum.substr 0, 80}", 70, false
     expect(text.length).toBe 70
     expect(text.charAt 69).toBe '…'
 
   it 'returns a truncated string of correct length if word boundary is disabled and there are no whitespaces in the string', ->
-    text = z.util.trunc_text "#{lorem_ipsum.replace(/\s/g, '').substr 0, 80}", 70
+    text = z.util.truncate_text "#{lorem_ipsum.replace(/\s/g, '').substr 0, 80}", 70
     expect(text.length).toBe 70
     expect(text.charAt 69).toBe '…'
 
@@ -785,6 +785,21 @@ describe 'z.util.format_seconds', ->
   it 'should format undefined as 00:00', ->
     expect(z.util.format_seconds()).toBe '00:00'
 
+describe 'z.util.format_milliseconds_short', ->
+  it 'should format duration under 1 minute', ->
+    expect(z.util.format_milliseconds_short(5000)).toEqual [5, 's']
+    expect(z.util.format_milliseconds_short(15000)).toEqual [15, 's']
+
+  it 'should format duration over 1 minute', ->
+    expect(z.util.format_milliseconds_short(60000)).toEqual [1, 'm']
+    expect(z.util.format_milliseconds_short(900000)).toEqual [15, 'm']
+
+  it 'should format duration over 1 hour', ->
+    expect(z.util.format_milliseconds_short(1000 * 60 * 60 * 3)).toEqual [3, 'h']
+
+  it 'should format duration over 1 day', ->
+    expect(z.util.format_milliseconds_short(1000 * 60 * 60 * 24 * 3)).toEqual [3, 'd']
+
 describe 'z.util.is_same_location', ->
   it 'returns false if page was accessed directly', ->
     actual = z.util.is_same_location '', 'https://app.wire.com'
diff --git a/trans.py b/trans.py
index 2fddacc32e4..c3b67ce44d1 100755
--- a/trans.py
+++ b/trans.py
@@ -18,26 +18,44 @@
 #
 
 import os
+import shutil
 import sys
 
+SUPPORTED_LOCALE = [
+  'de',
+  'es',
+  'hr',
+  'fi',
+  'ro',
+  'ru',
+]
 home_dir = os.path.expanduser('~')
-user_config = os.path.join(home_dir, '.crowdin.yaml')
 
-os.system('crowdin-cli-py --identity={} upload sources'.format(user_config))
-os.system('crowdin-cli-py --identity={} download'.format(user_config))
+os.system('crowdin-cli --identity=keys/crowdin.yaml upload sources')
+os.system('crowdin-cli --identity=keys/crowdin.yaml download')
 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
+root = 'app/script/localization/'
+
+
+def remove_country(filename):
+  parts = filename.split('-')
+  if len(parts) == 3:
+    source = os.path.join(root, filename)
+    dest = os.path.join(root, '%s-%s.coffee' % (parts[0], parts[1]))
+    shutil.move(source, dest)
+
 
 def get_locale(filename):
   locale = filename.replace('strings-', '').replace('.coffee', '')
   return locale if len(locale) == 2 else None
 
-root = 'app/script/localization/'
 
 for filename in os.listdir(root):
+  remove_country(filename)
   locale = get_locale(filename)
   if locale:
-    if locale != 'de':
+    if locale not in SUPPORTED_LOCALE:
       file_to_delete = os.path.join(root, filename)
       sys.stdout.write('Removing unsupported locale "{}" ({})\n'.format(locale, file_to_delete))
       os.remove(file_to_delete)