From 0104c3ea078126444e3156bdb508bd36d65b6eb9 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 09:26:24 -0800
Subject: [PATCH 001/163] Animate GIF in viewer

---
 src/components/Viewer.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index a780ac2c2..5a4f86396 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -569,8 +569,15 @@ export default class Viewer extends Mixins(GlobalMixin) {
 
   /** Get base data object */
   private getItemData(photo: IPhoto) {
+    let previewUrl = getPreviewUrl(photo, false, 2048);
+
+    // Preview aren't animated
+    if (photo.mimetype === "image/gif") {
+      previewUrl = getDownloadLink(photo);
+    }
+
     return {
-      src: getPreviewUrl(photo, false, 2048),
+      src: previewUrl,
       width: photo.w || undefined,
       height: photo.h || undefined,
       thumbCropped: true,

From 0576b28f5ce3fc9de9c21062fd1bd01520abe955 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 12:46:43 -0800
Subject: [PATCH 002/163] Print per-file in index

---
 lib/Command/Index.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/Command/Index.php b/lib/Command/Index.php
index 551342072..cce9439ae 100644
--- a/lib/Command/Index.php
+++ b/lib/Command/Index.php
@@ -277,14 +277,6 @@ private function parseFolder(Folder &$folder, bool &$refresh): void
                 return;
             }
 
-            // Clear previous line and write new one
-            $line = 'Scanning folder '.$folderPath;
-            if ($this->previousLineLength) {
-                $this->output->write("\r".str_repeat(' ', $this->previousLineLength)."\r");
-            }
-            $this->output->write($line."\r");
-            $this->previousLineLength = \strlen($line);
-
             $nodes = $folder->getDirectoryListing();
 
             foreach ($nodes as &$node) {
@@ -305,6 +297,15 @@ private function parseFolder(Folder &$folder, bool &$refresh): void
 
     private function parseFile(File &$file, bool &$refresh): void
     {
+        // Clear previous line and write new one
+        $line = 'Scanning file '.$file->getPath();
+        if ($this->previousLineLength) {
+            $this->output->write("\r".str_repeat(' ', $this->previousLineLength)."\r");
+        }
+        $this->output->write($line."\r");
+        $this->previousLineLength = \strlen($line);
+
+        // Process the file
         $res = $this->timelineWrite->processFile($file, $refresh);
         if (2 === $res) {
             ++$this->nProcessed;

From 1d65a6dabe3840cb1da5caa307c64f4808a4de80 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 13:13:16 -0800
Subject: [PATCH 003/163] Store exif meta in db

---
 lib/Db/TimelineWrite.php                      | 29 ++++++++
 .../Version400604Date20221107205439.php       | 67 +++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 lib/Migration/Version400604Date20221107205439.php

diff --git a/lib/Db/TimelineWrite.php b/lib/Db/TimelineWrite.php
index 20c11b072..f97444426 100644
--- a/lib/Db/TimelineWrite.php
+++ b/lib/Db/TimelineWrite.php
@@ -97,6 +97,33 @@ public function processFile(
         $dateTaken = gmdate('Y-m-d H:i:s', $dateTaken);
         [$w, $h] = Exif::getDimensions($exif);
 
+        // Store raw metadata in the database
+        // We need to remove blacklisted fields to prevent leaking info
+        unset($exif['SourceFile']);
+        unset($exif['FileName']);
+        unset($exif['ExifToolVersion']);
+        unset($exif['Directory']);
+        unset($exif['FileSize']);
+        unset($exif['FileModifyDate']);
+        unset($exif['FileAccessDate']);
+        unset($exif['FileInodeChangeDate']);
+        unset($exif['FilePermissions']);
+
+        // Truncate any fields >2048 chars
+        foreach ($exif as $key => &$value) {
+            if (\is_string($value) && \strlen($value) > 2048) {
+                $exif[$key] = \substr($value, 0, 2048);
+            }
+        }
+
+        // Store JSON string
+        $exifJson = json_encode($exif);
+
+        // Store error if data > 64kb
+        if (\strlen($exifJson) > 65535) {
+            $exifJson = json_encode(['error' => 'Exif data too large']);
+        }
+
         if ($prevRow) {
             // Update existing row
             // No need to set objectid again
@@ -107,6 +134,7 @@ public function processFile(
                 ->set('isvideo', $query->createNamedParameter($isvideo, IQueryBuilder::PARAM_INT))
                 ->set('w', $query->createNamedParameter($w, IQueryBuilder::PARAM_INT))
                 ->set('h', $query->createNamedParameter($h, IQueryBuilder::PARAM_INT))
+                ->set('exif', $query->createNamedParameter($exifJson, IQueryBuilder::PARAM_STR))
                 ->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
             ;
             $query->executeStatement();
@@ -123,6 +151,7 @@ public function processFile(
                         'isvideo' => $query->createNamedParameter($isvideo, IQueryBuilder::PARAM_INT),
                         'w' => $query->createNamedParameter($w, IQueryBuilder::PARAM_INT),
                         'h' => $query->createNamedParameter($h, IQueryBuilder::PARAM_INT),
+                        'exif' => $query->createNamedParameter($exifJson, IQueryBuilder::PARAM_STR),
                     ])
                 ;
                 $query->executeStatement();
diff --git a/lib/Migration/Version400604Date20221107205439.php b/lib/Migration/Version400604Date20221107205439.php
new file mode 100644
index 000000000..5e6c0bbb2
--- /dev/null
+++ b/lib/Migration/Version400604Date20221107205439.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Your name <your@email.com>
+ * @author Your name <your@email.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Memories\Migration;
+
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Auto-generated migration step: Please modify to your needs!
+ */
+class Version400604Date20221107205439 extends SimpleMigrationStep
+{
+    /**
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void
+    {
+    }
+
+    /**
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options): ?ISchemaWrapper
+    {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		$table = $schema->getTable('memories');
+
+		$table->addColumn('exif', 'text', [
+			'notnull' => false,
+			'length' => 65535,
+			'default' => '',
+		]);
+
+		return $schema;
+    }
+
+    /**
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void
+    {
+    }
+}

From 0fbe35db7d24d6fb7bf03845f9011c7f671c7c61 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 13:25:52 -0800
Subject: [PATCH 004/163] Return exif in info call

---
 lib/Controller/ImageController.php             |  3 ++-
 lib/Db/TimelineQuery.php                       | 11 +++++++++--
 lib/Db/TimelineWrite.php                       | 12 ++----------
 .../Version400604Date20221107205439.php        | 18 +++++++++---------
 src/components/modal/EditDate.vue              |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/Controller/ImageController.php b/lib/Controller/ImageController.php
index ad9b7023c..d790ee83e 100644
--- a/lib/Controller/ImageController.php
+++ b/lib/Controller/ImageController.php
@@ -52,7 +52,8 @@ public function info(string $id): JSONResponse
         $file = $file[0];
 
         // Get the image info
-        $info = $this->timelineQuery->getInfoById($file->getId());
+        $basic = false !== $this->request->getParam('basic', false);
+        $info = $this->timelineQuery->getInfoById($file->getId(), $basic);
 
         return new JSONResponse($info, Http::STATUS_OK);
     }
diff --git a/lib/Db/TimelineQuery.php b/lib/Db/TimelineQuery.php
index 8974e5410..e5d4eb2ad 100644
--- a/lib/Db/TimelineQuery.php
+++ b/lib/Db/TimelineQuery.php
@@ -48,14 +48,18 @@ public function transformExtraFields(IQueryBuilder &$query, string $uid, array &
     {
     }
 
-    public function getInfoById(int $id): array
+    public function getInfoById(int $id, bool $basic): array
     {
         $qb = $this->connection->getQueryBuilder();
-        $qb->select('fileid', 'dayid', 'datetaken')
+        $qb->select('fileid', 'dayid', 'datetaken', 'w', 'h')
             ->from('memories')
             ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($id, \PDO::PARAM_INT)))
         ;
 
+        if (!$basic) {
+            $qb->addSelect('exif');
+        }
+
         $result = $qb->executeQuery();
         $row = $result->fetch();
         $result->closeCursor();
@@ -72,6 +76,9 @@ public function getInfoById(int $id): array
             'fileid' => (int) $row['fileid'],
             'dayid' => (int) $row['dayid'],
             'datetaken' => $utcTs,
+            'w' => (int) $row['w'],
+            'h' => (int) $row['h'],
+            'exif' => $basic ? [] : json_decode($row['exif'], true),
         ];
     }
 }
diff --git a/lib/Db/TimelineWrite.php b/lib/Db/TimelineWrite.php
index f97444426..bcd9145c7 100644
--- a/lib/Db/TimelineWrite.php
+++ b/lib/Db/TimelineWrite.php
@@ -99,20 +99,12 @@ public function processFile(
 
         // Store raw metadata in the database
         // We need to remove blacklisted fields to prevent leaking info
-        unset($exif['SourceFile']);
-        unset($exif['FileName']);
-        unset($exif['ExifToolVersion']);
-        unset($exif['Directory']);
-        unset($exif['FileSize']);
-        unset($exif['FileModifyDate']);
-        unset($exif['FileAccessDate']);
-        unset($exif['FileInodeChangeDate']);
-        unset($exif['FilePermissions']);
+        unset($exif['SourceFile'], $exif['FileName'], $exif['ExifToolVersion'], $exif['Directory'], $exif['FileSize'], $exif['FileModifyDate'], $exif['FileAccessDate'], $exif['FileInodeChangeDate'], $exif['FilePermissions']);
 
         // Truncate any fields >2048 chars
         foreach ($exif as $key => &$value) {
             if (\is_string($value) && \strlen($value) > 2048) {
-                $exif[$key] = \substr($value, 0, 2048);
+                $exif[$key] = substr($value, 0, 2048);
             }
         }
 
diff --git a/lib/Migration/Version400604Date20221107205439.php b/lib/Migration/Version400604Date20221107205439.php
index 5e6c0bbb2..c978652f0 100644
--- a/lib/Migration/Version400604Date20221107205439.php
+++ b/lib/Migration/Version400604Date20221107205439.php
@@ -44,18 +44,18 @@ public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array
      */
     public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options): ?ISchemaWrapper
     {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('memories');
+        $table = $schema->getTable('memories');
 
-		$table->addColumn('exif', 'text', [
-			'notnull' => false,
-			'length' => 65535,
-			'default' => '',
-		]);
+        $table->addColumn('exif', 'text', [
+            'notnull' => false,
+            'length' => 65535,
+            'default' => '',
+        ]);
 
-		return $schema;
+        return $schema;
     }
 
     /**
diff --git a/src/components/modal/EditDate.vue b/src/components/modal/EditDate.vue
index da5723d8f..ebf0f8c55 100644
--- a/src/components/modal/EditDate.vue
+++ b/src/components/modal/EditDate.vue
@@ -186,7 +186,7 @@ export default class EditDate extends Mixins(GlobalMixin) {
     const calls = photos.map((p) => async () => {
       try {
         const res = await axios.get<any>(
-          generateUrl(INFO_API_URL, { id: p.fileid })
+          generateUrl(INFO_API_URL, { id: p.fileid }) + "?basic=1"
         );
         if (typeof res.data.datetaken !== "number") {
           console.error("Invalid date for", p.fileid);

From 34155aae78d2ac871fae9eee6267d70b822f393c Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 13:55:11 -0800
Subject: [PATCH 005/163] metaview: dump raw exif

---
 src/App.vue                 | 35 +++++++++++++++++++++++++++++++++++
 src/components/Metadata.vue | 37 +++++++++++++++++++++++++++++++++++++
 src/components/Viewer.vue   |  1 +
 src/services/dav/base.ts    |  1 +
 src/types.ts                |  2 ++
 5 files changed, 76 insertions(+)
 create mode 100644 src/components/Metadata.vue

diff --git a/src/App.vue b/src/App.vue
index c8244f687..c0afe12cf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -106,6 +106,7 @@ import { getCurrentUser } from "@nextcloud/auth";
 import Timeline from "./components/Timeline.vue";
 import Settings from "./components/Settings.vue";
 import FirstStart from "./components/FirstStart.vue";
+import Metadata from "./components/Metadata.vue";
 import GlobalMixin from "./mixins/GlobalMixin";
 import UserConfig from "./mixins/UserConfig";
 
@@ -147,6 +148,8 @@ import MapIcon from "vue-material-design-icons/Map.vue";
 export default class App extends Mixins(GlobalMixin, UserConfig) {
   // Outer element
 
+  private metadataComponent!: Metadata;
+
   get ncVersion() {
     const version = (<any>window.OC).config.version.split(".");
     return Number(version[0]);
@@ -185,6 +188,38 @@ export default class App extends Mixins(GlobalMixin, UserConfig) {
     const colorPrimary =
       getComputedStyle(root).getPropertyValue("--color-primary");
     root.style.setProperty("--color-primary-select-light", `${colorPrimary}40`);
+
+    // Register sidebar metadata tab
+    const OCA = globalThis.OCA;
+    if (OCA.Files && OCA.Files.Sidebar) {
+      OCA.Files.Sidebar.registerTab(
+        new OCA.Files.Sidebar.Tab({
+          id: "memories-metadata",
+          name: this.t("memories", "Metadata"),
+          icon: "icon-details",
+
+          async mount(el, fileInfo, context) {
+            if (this.metadataComponent) {
+              this.metadataComponent.$destroy();
+            }
+            this.metadataComponent = new Metadata({
+              // Better integration with vue parent component
+              parent: context,
+            });
+            // Only mount after we have all the info we need
+            await this.metadataComponent.update(fileInfo);
+            this.metadataComponent.$mount(el);
+          },
+          update(fileInfo) {
+            this.metadataComponent.update(fileInfo);
+          },
+          destroy() {
+            this.metadataComponent.$destroy();
+            this.metadataComponent = null;
+          },
+        })
+      );
+    }
   }
 
   async beforeMount() {
diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
new file mode 100644
index 000000000..80de6acf7
--- /dev/null
+++ b/src/components/Metadata.vue
@@ -0,0 +1,37 @@
+<template>
+  <div class="outer">
+    <div v-for="prop of props" :key="prop">
+      <div class="prop">{{ prop }}</div>
+      <div class="value">{{ exif[prop] }}</div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from "vue-property-decorator";
+import GlobalMixin from "../mixins/GlobalMixin";
+
+import { generateUrl } from "@nextcloud/router";
+import axios from "@nextcloud/axios";
+
+import { IFileInfo } from "../types";
+
+@Component({
+  components: {},
+})
+export default class Metadata extends Mixins(GlobalMixin) {
+  private exif: { [prop: string]: any } = {};
+
+  get props() {
+    return Object.keys(this.exif);
+  }
+
+  public async update(fileInfo: IFileInfo) {
+    this.exif = {};
+    const res = await axios.get<any>(
+      generateUrl("/apps/memories/api/info/{id}", { id: fileInfo.id })
+    );
+    this.exif = res.data.exif || {};
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 5a4f86396..907a90f35 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -763,6 +763,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
   private async openSidebar(photo?: IPhoto) {
     const fInfo = await dav.getFiles([photo || this.currentPhoto]);
     globalThis.OCA?.Files?.Sidebar?.setFullScreenMode?.(true);
+    globalThis.OCA.Files.Sidebar.setActiveTab("memories-metadata");
     globalThis.OCA.Files.Sidebar.open(fInfo[0].filename);
   }
 
diff --git a/src/services/dav/base.ts b/src/services/dav/base.ts
index c991421f4..4365aedde 100644
--- a/src/services/dav/base.ts
+++ b/src/services/dav/base.ts
@@ -55,6 +55,7 @@ export async function getFiles(photos: IPhoto[]): Promise<IFileInfo[]> {
     photosWithFilename.map((photo) => {
       const prefixPath = `/files/${getCurrentUser()?.uid}`;
       return {
+        id: photo.fileid,
         fileid: photo.fileid,
         filename: photo.filename.replace(prefixPath, ""),
         originalFilename: photo.filename,
diff --git a/src/types.ts b/src/types.ts
index 83ec8ec79..e30eb360d 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,6 +1,8 @@
 import { VueConstructor } from "vue";
 
 export type IFileInfo = {
+  /** Same as fileid */
+  id: number;
   /** Database file ID */
   fileid: number;
   /** Full file name, e.g. /pi/test/Qx0dq7dvEXA.jpg */

From 0d0a6d8cf24bf77f8a8ad56688de0de5f39948a4 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 14:19:46 -0800
Subject: [PATCH 006/163] metaview: date

---
 src/components/Metadata.vue | 70 ++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 5 deletions(-)

diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index 80de6acf7..998dcf182 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -1,8 +1,15 @@
 <template>
   <div class="outer">
-    <div v-for="prop of props" :key="prop">
-      <div class="prop">{{ prop }}</div>
-      <div class="value">{{ exif[prop] }}</div>
+    <div class="top-field" v-if="dateOriginal">
+      <div class="icon">
+        <CalendarIcon :size="24" />
+      </div>
+      <div class="text">
+        {{ dateOriginalStr }} <br />
+        <span class="subtitle">
+          {{ dateOriginalTime }}
+        </span>
+      </div>
     </div>
   </div>
 </template>
@@ -13,11 +20,18 @@ import GlobalMixin from "../mixins/GlobalMixin";
 
 import { generateUrl } from "@nextcloud/router";
 import axios from "@nextcloud/axios";
+import moment from "moment";
+import * as utils from "../services/Utils";
+
+import CalendarIcon from "vue-material-design-icons/Calendar.vue";
 
 import { IFileInfo } from "../types";
+import { getCanonicalLocale } from "@nextcloud/l10n";
 
 @Component({
-  components: {},
+  components: {
+    CalendarIcon,
+  },
 })
 export default class Metadata extends Mixins(GlobalMixin) {
   private exif: { [prop: string]: any } = {};
@@ -26,6 +40,31 @@ export default class Metadata extends Mixins(GlobalMixin) {
     return Object.keys(this.exif);
   }
 
+  get dateOriginal() {
+    const dt = this.exif["DateTimeOriginal"] || this.exif["CreateDate"];
+    if (!dt) return null;
+
+    const m = moment(dt, "YYYY:MM:DD HH:mm:ss");
+    if (!m.isValid()) return null;
+    m.locale(getCanonicalLocale());
+    return m;
+  }
+
+  get dateOriginalStr() {
+    if (!this.dateOriginal) return null;
+    return utils.getLongDateStr(this.dateOriginal.toDate(), true);
+  }
+
+  get dateOriginalTime() {
+    if (!this.dateOriginal) return null;
+
+    // Try to get timezone
+    let tz = this.exif["OffsetTimeOriginal"] || this.exif["OffsetTime"];
+    tz = tz ? "GMT" + tz : "";
+
+    return this.dateOriginal.format("h:mm A") + " " + tz;
+  }
+
   public async update(fileInfo: IFileInfo) {
     this.exif = {};
     const res = await axios.get<any>(
@@ -34,4 +73,25 @@ export default class Metadata extends Mixins(GlobalMixin) {
     this.exif = res.data.exif || {};
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.top-field {
+  margin: 5px 10px;
+
+  .icon {
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 10px;
+    color: var(--color-text-lighter);
+  }
+  .text {
+    display: inline-block;
+    vertical-align: middle;
+
+    .subtitle {
+      font-size: 0.95em;
+    }
+  }
+}
+</style>
\ No newline at end of file

From 14cdab5d7920fb0a65503a4a4c2496ef4db0ec4f Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 14:46:09 -0800
Subject: [PATCH 007/163] metaview: add camera

---
 src/components/Metadata.vue | 97 +++++++++++++++++++++++++++++++------
 1 file changed, 81 insertions(+), 16 deletions(-)

diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index 998dcf182..5c998a60d 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -1,13 +1,15 @@
 <template>
   <div class="outer">
-    <div class="top-field" v-if="dateOriginal">
+    <div class="top-field" v-for="field of topFields" :key="field.title">
       <div class="icon">
-        <CalendarIcon :size="24" />
+        <component :is="field.icon" :size="24" />
       </div>
       <div class="text">
-        {{ dateOriginalStr }} <br />
+        {{ field.title }} <br />
         <span class="subtitle">
-          {{ dateOriginalTime }}
+          <span class="part" v-for="part in field.subtitle" :key="part">
+            {{ part }}
+          </span>
         </span>
       </div>
     </div>
@@ -24,20 +26,49 @@ import moment from "moment";
 import * as utils from "../services/Utils";
 
 import CalendarIcon from "vue-material-design-icons/Calendar.vue";
+import CameraIrisIcon from "vue-material-design-icons/CameraIris.vue";
 
 import { IFileInfo } from "../types";
 import { getCanonicalLocale } from "@nextcloud/l10n";
 
 @Component({
-  components: {
-    CalendarIcon,
-  },
+  components: {},
 })
 export default class Metadata extends Mixins(GlobalMixin) {
   private exif: { [prop: string]: any } = {};
 
-  get props() {
-    return Object.keys(this.exif);
+  public async update(fileInfo: IFileInfo) {
+    this.exif = {};
+    const res = await axios.get<any>(
+      generateUrl("/apps/memories/api/info/{id}", { id: fileInfo.id })
+    );
+    this.exif = res.data.exif || {};
+  }
+
+  get topFields() {
+    let list: {
+      title: string;
+      subtitle: string[];
+      icon: any;
+    }[] = [];
+
+    if (this.dateOriginal) {
+      list.push({
+        title: this.dateOriginalStr,
+        subtitle: this.dateOriginalTime,
+        icon: CalendarIcon,
+      });
+    }
+
+    if (this.camera) {
+      list.push({
+        title: this.camera,
+        subtitle: this.cameraSub,
+        icon: CameraIrisIcon,
+      });
+    }
+
+    return list;
   }
 
   get dateOriginal() {
@@ -62,22 +93,56 @@ export default class Metadata extends Mixins(GlobalMixin) {
     let tz = this.exif["OffsetTimeOriginal"] || this.exif["OffsetTime"];
     tz = tz ? "GMT" + tz : "";
 
-    return this.dateOriginal.format("h:mm A") + " " + tz;
+    let parts = [];
+    parts.push(this.dateOriginal.format("h:mm A"));
+    if (tz) parts.push(tz);
+
+    return parts;
   }
 
-  public async update(fileInfo: IFileInfo) {
-    this.exif = {};
-    const res = await axios.get<any>(
-      generateUrl("/apps/memories/api/info/{id}", { id: fileInfo.id })
+  get camera() {
+    const make = this.exif["Make"];
+    const model = this.exif["Model"];
+    if (!make || !model) return null;
+    return `${make} ${model}`;
+  }
+
+  get cameraSub() {
+    const f = this.exif["FNumber"] || this.exif["Aperture"];
+    const s = this.shutterSpeed;
+    const len = this.exif["FocalLength"];
+    const iso = this.exif["ISO"];
+
+    const parts = [];
+    if (f) parts.push(`f/${f}`);
+    if (s) parts.push(`${s}`);
+    if (len) parts.push(`${len}mm`);
+    if (iso) parts.push(`ISO${iso}`);
+    return parts;
+  }
+
+  /** Convert shutter speed decimal to 1/x format */
+  get shutterSpeed() {
+    const speed = Number(
+      this.exif["ShutterSpeedValue"] ||
+        this.exif["ShutterSpeed"] ||
+        this.exif["ExposureTime"]
     );
-    this.exif = res.data.exif || {};
+    if (!speed) return null;
+
+    if (speed < 1) {
+      return `1/${Math.round(1 / speed)}`;
+    } else {
+      return `${Math.round(speed * 10) / 10}`;
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
 .top-field {
-  margin: 5px 10px;
+  margin: 10px;
+  margin-bottom: 25px;
 
   .icon {
     display: inline-block;

From 118283297ab2cceb985aeb2c82e4d6e699b032e1 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 14:54:35 -0800
Subject: [PATCH 008/163] metaview: fileinfo

---
 src/components/Metadata.vue | 48 ++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index 5c998a60d..5249b47c1 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -25,23 +25,28 @@ import axios from "@nextcloud/axios";
 import moment from "moment";
 import * as utils from "../services/Utils";
 
-import CalendarIcon from "vue-material-design-icons/Calendar.vue";
-import CameraIrisIcon from "vue-material-design-icons/CameraIris.vue";
-
 import { IFileInfo } from "../types";
 import { getCanonicalLocale } from "@nextcloud/l10n";
 
+import CalendarIcon from "vue-material-design-icons/Calendar.vue";
+import CameraIrisIcon from "vue-material-design-icons/CameraIris.vue";
+import ImageIcon from "vue-material-design-icons/Image.vue";
+
 @Component({
   components: {},
 })
 export default class Metadata extends Mixins(GlobalMixin) {
+  private fileInfo: IFileInfo = null;
   private exif: { [prop: string]: any } = {};
+  private baseInfo: any = {};
 
   public async update(fileInfo: IFileInfo) {
+    this.fileInfo = fileInfo;
     this.exif = {};
     const res = await axios.get<any>(
       generateUrl("/apps/memories/api/info/{id}", { id: fileInfo.id })
     );
+    this.baseInfo = res.data;
     this.exif = res.data.exif || {};
   }
 
@@ -68,9 +73,18 @@ export default class Metadata extends Mixins(GlobalMixin) {
       });
     }
 
+    if (this.imageInfo) {
+      list.push({
+        title: this.imageInfo,
+        subtitle: this.imageInfoSub,
+        icon: ImageIcon,
+      });
+    }
+
     return list;
   }
 
+  /** Date taken info */
   get dateOriginal() {
     const dt = this.exif["DateTimeOriginal"] || this.exif["CreateDate"];
     if (!dt) return null;
@@ -100,6 +114,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
     return parts;
   }
 
+  /** Camera make and model info */
   get camera() {
     const make = this.exif["Make"];
     const model = this.exif["Model"];
@@ -136,6 +151,30 @@ export default class Metadata extends Mixins(GlobalMixin) {
       return `${Math.round(speed * 10) / 10}`;
     }
   }
+
+  /** Image info */
+  get imageInfo() {
+    return this.fileInfo.basename || (<any>this.fileInfo).name;
+  }
+
+  get imageInfoSub() {
+    let parts = [];
+    let mp = Number(this.exif["Megapixels"]);
+
+    if (this.baseInfo.w && this.baseInfo.h) {
+      parts.push(`${this.baseInfo.w}x${this.baseInfo.h}`);
+
+      if (!mp) {
+        mp = (this.baseInfo.w * this.baseInfo.h) / 1000000;
+      }
+    }
+
+    if (mp) {
+      parts.unshift(`${mp.toFixed(1)}MP`);
+    }
+
+    return parts;
+  }
 }
 </script>
 
@@ -156,6 +195,9 @@ export default class Metadata extends Mixins(GlobalMixin) {
 
     .subtitle {
       font-size: 0.95em;
+      .part {
+        margin-right: 5px;
+      }
     }
   }
 }

From eb656b8701f11fa47b1fd0db175e311a11ece9e7 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 15:22:24 -0800
Subject: [PATCH 009/163] viewer: push route if not found (fix #172)

---
 src/components/Viewer.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 907a90f35..3c601e8df 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -607,16 +607,21 @@ export default class Viewer extends Mixins(GlobalMixin) {
 
   /** Set the route hash to the given photo */
   private setRouteHash(photo: IPhoto | undefined) {
-    if (!photo && !this.isOpen) {
+    if (!photo && !this.isOpen && this.$route.hash?.startsWith("#v")) {
       return this.$router.back();
     }
 
     const hash = photo ? utils.getViewerHash(photo) : "";
+    const route = {
+      ...this.$route,
+      hash,
+    };
     if (hash !== this.$route.hash) {
-      this.$router.replace({
-        ...this.$route,
-        hash,
-      });
+      if (this.$route.hash) {
+        this.$router.replace(route);
+      } else {
+        this.$router.push(route);
+      }
     }
   }
 

From 134c95d35a8d4e1c206e9d10f4a334bced908249 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 15:49:50 -0800
Subject: [PATCH 010/163] metaview: add loc

---
 lib/Controller/PageController.php |  3 ++
 src/components/Metadata.vue       | 50 ++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 39c9241fd..e75ff103f 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -95,6 +95,9 @@ public function main()
         $policy->addAllowedWorkerSrcDomain("'self'");
         $policy->addAllowedScriptDomain("'self'");
 
+        // Allow nominatim for metadata
+        $policy->addAllowedConnectDomain('nominatim.openstreetmap.org');
+
         $response = new TemplateResponse($this->appName, 'main');
         $response->setContentSecurityPolicy($policy);
 
diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index 5249b47c1..cd185b1f1 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -31,6 +31,7 @@ import { getCanonicalLocale } from "@nextcloud/l10n";
 import CalendarIcon from "vue-material-design-icons/Calendar.vue";
 import CameraIrisIcon from "vue-material-design-icons/CameraIris.vue";
 import ImageIcon from "vue-material-design-icons/Image.vue";
+import LocationIcon from "vue-material-design-icons/MapMarker.vue";
 
 @Component({
   components: {},
@@ -39,15 +40,25 @@ export default class Metadata extends Mixins(GlobalMixin) {
   private fileInfo: IFileInfo = null;
   private exif: { [prop: string]: any } = {};
   private baseInfo: any = {};
+  private nominatim: any = null;
+  private state = 0;
 
   public async update(fileInfo: IFileInfo) {
+    this.state = Math.random();
     this.fileInfo = fileInfo;
     this.exif = {};
+
+    let state = this.state;
     const res = await axios.get<any>(
       generateUrl("/apps/memories/api/info/{id}", { id: fileInfo.id })
     );
+    if (state !== this.state) return;
+
     this.baseInfo = res.data;
     this.exif = res.data.exif || {};
+
+    // Lazy loading
+    this.getNominatim().catch();
   }
 
   get topFields() {
@@ -81,6 +92,14 @@ export default class Metadata extends Mixins(GlobalMixin) {
       });
     }
 
+    if (this.nominatim) {
+      list.push({
+        title: this.address,
+        subtitle: [],
+        icon: LocationIcon,
+      });
+    }
+
     return list;
   }
 
@@ -148,7 +167,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
     if (speed < 1) {
       return `1/${Math.round(1 / speed)}`;
     } else {
-      return `${Math.round(speed * 10) / 10}`;
+      return `${Math.round(speed * 10) / 10}s`;
     }
   }
 
@@ -175,6 +194,35 @@ export default class Metadata extends Mixins(GlobalMixin) {
 
     return parts;
   }
+
+  get address() {
+    if (!this.nominatim) return null;
+    const n = this.nominatim;
+    const country = n.address.country_code?.toUpperCase();
+
+    if (n.address?.city && n.address.state) {
+      return `${n.address.city}, ${n.address.state}, ${country}`;
+    } else if (n.address?.state) {
+      return `${n.address.state}, ${country}`;
+    } else if (n.address?.country) {
+      return n.address.country;
+    } else {
+      return n.display_name;
+    }
+  }
+
+  async getNominatim() {
+    const lat = this.exif["GPSLatitude"];
+    const lon = this.exif["GPSLongitude"];
+    if (!lat || !lon) return null;
+
+    const state = this.state;
+    const n = await axios.get(
+      `https://nominatim.openstreetmap.org/reverse?lat=${lat}&lon=${lon}&format=json`
+    );
+    if (state !== this.state) return;
+    this.nominatim = n.data;
+  }
 }
 </script>
 

From 660f7e3f5bacaf629f90628ec1cd82b1fd4d3fc6 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 16:01:48 -0800
Subject: [PATCH 011/163] nominatim: zoom for reverse

---
 src/components/Metadata.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index cd185b1f1..5bd7563f0 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -218,7 +218,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
 
     const state = this.state;
     const n = await axios.get(
-      `https://nominatim.openstreetmap.org/reverse?lat=${lat}&lon=${lon}&format=json`
+      `https://nominatim.openstreetmap.org/reverse?lat=${lat}&lon=${lon}&format=json&zoom=18`
     );
     if (state !== this.state) return;
     this.nominatim = n.data;

From 0b4ee8348bc47471660a4755e1ba36bb5eb41016 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 16:26:56 -0800
Subject: [PATCH 012/163] osm

---
 lib/Controller/PageController.php |  1 +
 src/components/Metadata.vue       | 68 +++++++++++++++++++++++++++----
 2 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index e75ff103f..23d5a7211 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -97,6 +97,7 @@ public function main()
 
         // Allow nominatim for metadata
         $policy->addAllowedConnectDomain('nominatim.openstreetmap.org');
+        $policy->addAllowedFrameDomain('www.openstreetmap.org');
 
         $response = new TemplateResponse($this->appName, 'main');
         $response->setContentSecurityPolicy($policy);
diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index 5bd7563f0..c0bbc4222 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -5,14 +5,29 @@
         <component :is="field.icon" :size="24" />
       </div>
       <div class="text">
-        {{ field.title }} <br />
-        <span class="subtitle">
-          <span class="part" v-for="part in field.subtitle" :key="part">
-            {{ part }}
+        <template v-if="field.href">
+          <a :href="field.href" target="_blank" rel="noopener noreferrer">
+            {{ field.title }}
+          </a>
+        </template>
+        <template v-else>
+          {{ field.title }}
+        </template>
+
+        <template v-if="field.subtitle.length">
+          <br />
+          <span class="subtitle">
+            <span class="part" v-for="part in field.subtitle" :key="part">
+              {{ part }}
+            </span>
           </span>
-        </span>
+        </template>
       </div>
     </div>
+
+    <div v-if="lat && lon" class="map">
+      <iframe class="fill-block" :src="mapUrl" />
+    </div>
   </div>
 </template>
 
@@ -47,6 +62,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
     this.state = Math.random();
     this.fileInfo = fileInfo;
     this.exif = {};
+    this.nominatim = null;
 
     let state = this.state;
     const res = await axios.get<any>(
@@ -66,6 +82,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
       title: string;
       subtitle: string[];
       icon: any;
+      href?: string;
     }[] = [];
 
     if (this.dateOriginal) {
@@ -92,11 +109,12 @@ export default class Metadata extends Mixins(GlobalMixin) {
       });
     }
 
-    if (this.nominatim) {
+    if (this.address) {
       list.push({
         title: this.address,
         subtitle: [],
         icon: LocationIcon,
+        href: this.mapFullUrl,
       });
     }
 
@@ -196,7 +214,10 @@ export default class Metadata extends Mixins(GlobalMixin) {
   }
 
   get address() {
-    if (!this.nominatim) return null;
+    if (!this.lat || !this.lon) return null;
+
+    if (!this.nominatim) return this.t("memories", "Loading …");
+
     const n = this.nominatim;
     const country = n.address.country_code?.toUpperCase();
 
@@ -211,9 +232,33 @@ export default class Metadata extends Mixins(GlobalMixin) {
     }
   }
 
+  get lat() {
+    return this.exif["GPSLatitude"];
+  }
+
+  get lon() {
+    return this.exif["GPSLongitude"];
+  }
+
+  get mapUrl() {
+    const boxSize = 0.007;
+    const bbox = [
+      this.lon - boxSize,
+      this.lat - boxSize,
+      this.lon + boxSize,
+      this.lat + boxSize,
+    ];
+    const m = `${this.lat},${this.lon}`;
+    return `https://www.openstreetmap.org/export/embed.html?bbox=${bbox.join()}&marker=${m}`;
+  }
+
+  get mapFullUrl() {
+    return `https://www.openstreetmap.org/?mlat=${this.lat}&mlon=${this.lon}#map=18/${this.lat}/${this.lon}`;
+  }
+
   async getNominatim() {
-    const lat = this.exif["GPSLatitude"];
-    const lon = this.exif["GPSLongitude"];
+    const lat = this.lat;
+    const lon = this.lon;
     if (!lat || !lon) return null;
 
     const state = this.state;
@@ -249,4 +294,9 @@ export default class Metadata extends Mixins(GlobalMixin) {
     }
   }
 }
+
+.map {
+  width: 100%;
+  height: 200px;
+}
 </style>
\ No newline at end of file

From eeb6f31d90e1578f30647df3731aad5422f7aae4 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 16:28:52 -0800
Subject: [PATCH 013/163] metaview: fix bbox

---
 src/components/Metadata.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index c0bbc4222..640c81242 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -241,7 +241,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
   }
 
   get mapUrl() {
-    const boxSize = 0.007;
+    const boxSize = 0.0075;
     const bbox = [
       this.lon - boxSize,
       this.lat - boxSize,

From c64e8a590fdd3f4d76a127785e647139d4abe6ab Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 16:33:45 -0800
Subject: [PATCH 014/163] metaview: rename tab

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index c0afe12cf..2aba1a9e7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -195,7 +195,7 @@ export default class App extends Mixins(GlobalMixin, UserConfig) {
       OCA.Files.Sidebar.registerTab(
         new OCA.Files.Sidebar.Tab({
           id: "memories-metadata",
-          name: this.t("memories", "Metadata"),
+          name: this.t("memories", "EXIF"),
           icon: "icon-details",
 
           async mount(el, fileInfo, context) {

From be413433485007b9d0e4d9347e3e21808f45128e Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 17:29:58 -0800
Subject: [PATCH 015/163] metaview: add date editor

---
 src/components/Metadata.vue         | 57 ++++++++++++++++++++++++++---
 src/components/SelectionManager.vue |  7 ++++
 src/components/Timeline.vue         |  3 ++
 src/components/Viewer.vue           | 24 +++++++++---
 src/components/modal/EditDate.vue   |  6 ++-
 src/main.ts                         |  4 ++
 6 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index 640c81242..960bb27db 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -4,6 +4,7 @@
       <div class="icon">
         <component :is="field.icon" :size="24" />
       </div>
+
       <div class="text">
         <template v-if="field.href">
           <a :href="field.href" target="_blank" rel="noopener noreferrer">
@@ -23,6 +24,18 @@
           </span>
         </template>
       </div>
+
+      <div class="edit" v-if="field.edit">
+        <NcActions :inline="1">
+          <NcActionButton
+            :aria-label="t('memories', 'Edit')"
+            @click="field.edit()"
+          >
+            {{ t("memories", "Edit") }}
+            <template #icon> <EditIcon :size="20" /> </template>
+          </NcActionButton>
+        </NcActions>
+      </div>
     </div>
 
     <div v-if="lat && lon" class="map">
@@ -35,21 +48,29 @@
 import { Component, Mixins } from "vue-property-decorator";
 import GlobalMixin from "../mixins/GlobalMixin";
 
+import { NcActions, NcActionButton } from "@nextcloud/vue";
 import { generateUrl } from "@nextcloud/router";
 import axios from "@nextcloud/axios";
+import { subscribe, unsubscribe } from "@nextcloud/event-bus";
+import { getCanonicalLocale } from "@nextcloud/l10n";
 import moment from "moment";
+
 import * as utils from "../services/Utils";
 
 import { IFileInfo } from "../types";
-import { getCanonicalLocale } from "@nextcloud/l10n";
 
+import EditIcon from "vue-material-design-icons/Pencil.vue";
 import CalendarIcon from "vue-material-design-icons/Calendar.vue";
 import CameraIrisIcon from "vue-material-design-icons/CameraIris.vue";
 import ImageIcon from "vue-material-design-icons/Image.vue";
 import LocationIcon from "vue-material-design-icons/MapMarker.vue";
 
 @Component({
-  components: {},
+  components: {
+    NcActions,
+    NcActionButton,
+    EditIcon,
+  },
 })
 export default class Metadata extends Mixins(GlobalMixin) {
   private fileInfo: IFileInfo = null;
@@ -77,12 +98,27 @@ export default class Metadata extends Mixins(GlobalMixin) {
     this.getNominatim().catch();
   }
 
+  mounted() {
+    subscribe("files:file:updated", this.handleFileUpdated);
+  }
+
+  beforeDestroy() {
+    unsubscribe("files:file:updated", this.handleFileUpdated);
+  }
+
+  private handleFileUpdated({ fileid }) {
+    if (fileid && this.fileInfo?.id === fileid) {
+      this.update(this.fileInfo);
+    }
+  }
+
   get topFields() {
     let list: {
       title: string;
       subtitle: string[];
       icon: any;
       href?: string;
+      edit?: () => void;
     }[] = [];
 
     if (this.dateOriginal) {
@@ -90,6 +126,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
         title: this.dateOriginalStr,
         subtitle: this.dateOriginalTime,
         icon: CalendarIcon,
+        edit: () => globalThis.editDate(globalThis.currentViewerPhoto),
       });
     }
 
@@ -275,16 +312,24 @@ export default class Metadata extends Mixins(GlobalMixin) {
 .top-field {
   margin: 10px;
   margin-bottom: 25px;
+  display: flex;
+  align-items: center;
 
-  .icon {
+  .icon,
+  .edit {
     display: inline-block;
-    vertical-align: middle;
     margin-right: 10px;
-    color: var(--color-text-lighter);
+
+    :deep .material-design-icon {
+      color: var(--color-text-lighter);
+    }
+  }
+  .edit {
+    transform: translateX(10px);
   }
   .text {
     display: inline-block;
-    vertical-align: middle;
+    flex: 1;
 
     .subtitle {
       font-size: 0.95em;
diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
index c62b62f31..532c5a885 100644
--- a/src/components/SelectionManager.vue
+++ b/src/components/SelectionManager.vue
@@ -179,6 +179,13 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
         if: () => this.$route.name === "people",
       },
     ];
+
+    // Ugly: globally exposed functions
+    globalThis.editDate = (photo: IPhoto) => {
+      const sel = new Map<number, IPhoto>();
+      sel.set(photo.fileid, photo);
+      this.editDateSelection(sel);
+    };
   }
 
   @Watch("show")
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index c3e112d60..19050a590 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -236,6 +236,9 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
       await this.refresh();
     }
 
+    // The viewer might change the route immediately again
+    await this.$nextTick();
+
     // Check if hash has changed
     const viewerIsOpen = (this.$refs.viewer as any).isOpen;
     if (from?.hash !== to.hash && to.hash?.startsWith("#v") && !viewerIsOpen) {
diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 3c601e8df..8dddc41d7 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -269,7 +269,8 @@ export default class Viewer extends Mixins(GlobalMixin) {
       if (e.target instanceof HTMLElement) {
         if (
           e.target.closest("aside.app-sidebar") ||
-          e.target.closest(".v-popper__popper")
+          e.target.closest(".v-popper__popper") ||
+          e.target.closest(".modal-mask")
         ) {
           return;
         }
@@ -349,8 +350,10 @@ export default class Viewer extends Mixins(GlobalMixin) {
     // Update vue route for deep linking
     this.photoswipe.on("slideActivate", (e) => {
       this.currIndex = this.photoswipe.currIndex;
-      this.setRouteHash(e.slide?.data?.photo);
-      this.updateTitle(e.slide?.data?.photo);
+      const photo = e.slide?.data?.photo;
+      this.setRouteHash(photo);
+      this.updateTitle(photo);
+      globalThis.currentViewerPhoto = photo;
     });
 
     // Video support
@@ -607,10 +610,19 @@ export default class Viewer extends Mixins(GlobalMixin) {
 
   /** Set the route hash to the given photo */
   private setRouteHash(photo: IPhoto | undefined) {
-    if (!photo && !this.isOpen && this.$route.hash?.startsWith("#v")) {
-      return this.$router.back();
+    if (!photo) {
+      if (!this.isOpen && this.$route.hash?.startsWith("#v")) {
+        this.$router.back();
+
+        // Ensure this does not have the hash, otherwise replace it
+        if (this.$route.hash?.startsWith("#v")) {
+          this.$router.replace({
+            hash: "",
+          });
+        }
+      }
+      return;
     }
-
     const hash = photo ? utils.getViewerHash(photo) : "";
     const route = {
       ...this.$route,
diff --git a/src/components/modal/EditDate.vue b/src/components/modal/EditDate.vue
index ebf0f8c55..985ec7a69 100644
--- a/src/components/modal/EditDate.vue
+++ b/src/components/modal/EditDate.vue
@@ -137,6 +137,7 @@ import { IPhoto } from "../../types";
 import { NcButton, NcTextField } from "@nextcloud/vue";
 import { showError } from "@nextcloud/dialogs";
 import { generateUrl } from "@nextcloud/router";
+import { emit } from "@nextcloud/event-bus";
 import Modal from "./Modal.vue";
 import axios from "@nextcloud/axios";
 import * as utils from "../../services/Utils";
@@ -267,12 +268,14 @@ export default class EditDate extends Mixins(GlobalMixin) {
     // Make PATCH request to update date
     try {
       this.processing = true;
+      const fileid = this.photos[0].fileid;
       const res = await axios.patch<any>(
-        generateUrl(EDIT_API_URL, { id: this.photos[0].fileid }),
+        generateUrl(EDIT_API_URL, { id: fileid }),
         {
           date: this.getExifFormat(this.getDate()),
         }
       );
+      emit("files:file:updated", { fileid });
       this.emitRefresh(true);
       this.close();
     } catch (e) {
@@ -339,6 +342,7 @@ export default class EditDate extends Mixins(GlobalMixin) {
             date: this.getExifFormat(pDateNew),
           }
         );
+        emit("files:file:updated", { fileid: p.fileid });
       } catch (e) {
         if (e.response?.data?.message) {
           showError(e.response.data.message);
diff --git a/src/main.ts b/src/main.ts
index 6bdab6681..a59d656d1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -29,12 +29,16 @@ import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
 
 import App from "./App.vue";
 import router from "./router";
+import { IPhoto } from "./types";
 
 // Global exposed variables
 declare global {
   var vuerouter: typeof router;
   var OC: Nextcloud.v24.OC;
   var OCP: Nextcloud.v24.OCP;
+
+  var editDate: (photo: IPhoto) => void;
+  var currentViewerPhoto: IPhoto;
 }
 globalThis.vuerouter = router;
 

From ad70b0b96d170d98e7033d1df5187d0506bbbbbb Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 17:35:45 -0800
Subject: [PATCH 016/163] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12f3a0789..24701ea15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This file is manually updated. Please file an issue if something is missing.
 
+## v4.7.0, v3.7.0
+
+- **Note**: you must run `occ memories:index -f` to take advantage of new features.
+- **Feature**: show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
+
 ## v4.6.1, v3.6.1 (2022-11-07)
 
 - **Feature**: Native sharing from the viewer (images only)

From 55ccc7b0aa978c13c4fcbf73e22d23b3cc0cc266 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Tue, 8 Nov 2022 03:12:01 +0000
Subject: [PATCH 017/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/af.js         |  2 +-
 l10n/af.json       |  2 +-
 l10n/ar.js         |  2 +-
 l10n/ar.json       |  2 +-
 l10n/ast.js        |  2 +-
 l10n/ast.json      |  2 +-
 l10n/bg.js         |  2 +-
 l10n/bg.json       |  2 +-
 l10n/br.js         |  2 +-
 l10n/br.json       |  2 +-
 l10n/bs.js         | 16 ----------------
 l10n/bs.json       | 14 --------------
 l10n/ca.js         |  2 +-
 l10n/ca.json       |  2 +-
 l10n/cs.js         |  2 +-
 l10n/cs.json       |  2 +-
 l10n/cy_GB.js      |  2 +-
 l10n/cy_GB.json    |  2 +-
 l10n/da.js         |  2 +-
 l10n/da.json       |  2 +-
 l10n/de.js         |  4 +++-
 l10n/de.json       |  4 +++-
 l10n/de_DE.js      |  4 +++-
 l10n/de_DE.json    |  4 +++-
 l10n/el.js         |  2 +-
 l10n/el.json       |  2 +-
 l10n/en_GB.js      |  5 +++--
 l10n/en_GB.json    |  5 +++--
 l10n/eo.js         |  2 +-
 l10n/eo.json       |  2 +-
 l10n/es.js         |  5 ++++-
 l10n/es.json       |  5 ++++-
 l10n/es_AR.js      |  2 +-
 l10n/es_AR.json    |  2 +-
 l10n/es_CL.js      |  5 +++--
 l10n/es_CL.json    |  5 +++--
 l10n/es_CO.js      |  3 ++-
 l10n/es_CO.json    |  3 ++-
 l10n/es_CR.js      |  3 ++-
 l10n/es_CR.json    |  3 ++-
 l10n/es_DO.js      |  3 ++-
 l10n/es_DO.json    |  3 ++-
 l10n/es_EC.js      |  3 ++-
 l10n/es_EC.json    |  3 ++-
 l10n/es_GT.js      |  3 ++-
 l10n/es_GT.json    |  3 ++-
 l10n/es_HN.js      |  3 ++-
 l10n/es_HN.json    |  3 ++-
 l10n/es_MX.js      |  3 ++-
 l10n/es_MX.json    |  3 ++-
 l10n/es_NI.js      |  3 ++-
 l10n/es_NI.json    |  3 ++-
 l10n/es_PA.js      |  3 ++-
 l10n/es_PA.json    |  3 ++-
 l10n/es_PE.js      |  3 ++-
 l10n/es_PE.json    |  3 ++-
 l10n/es_PR.js      |  3 ++-
 l10n/es_PR.json    |  3 ++-
 l10n/es_PY.js      |  3 ++-
 l10n/es_PY.json    |  3 ++-
 l10n/es_SV.js      |  3 ++-
 l10n/es_SV.json    |  3 ++-
 l10n/es_UY.js      |  3 ++-
 l10n/es_UY.json    |  3 ++-
 l10n/et_EE.js      |  3 ++-
 l10n/et_EE.json    |  3 ++-
 l10n/eu.js         | 14 +++++++++++++-
 l10n/eu.json       | 14 +++++++++++++-
 l10n/fa.js         |  2 +-
 l10n/fa.json       |  2 +-
 l10n/fi.js         | 10 +++++++++-
 l10n/fi.json       | 10 +++++++++-
 l10n/fr.js         | 14 +++++++++++++-
 l10n/fr.json       | 14 +++++++++++++-
 l10n/gd.js         |  1 +
 l10n/gd.json       |  1 +
 l10n/gl.js         |  7 +++++--
 l10n/gl.json       |  7 +++++--
 l10n/he.js         |  7 +++++--
 l10n/he.json       |  7 +++++--
 l10n/hr.js         |  7 +++++--
 l10n/hr.json       |  7 +++++--
 l10n/hu.js         | 17 ++++++++++++++++-
 l10n/hu.json       | 17 ++++++++++++++++-
 l10n/hy.js         |  1 +
 l10n/hy.json       |  1 +
 l10n/ia.js         |  1 +
 l10n/ia.json       |  1 +
 l10n/id.js         |  1 +
 l10n/id.json       |  1 +
 l10n/is.js         |  7 +++++--
 l10n/is.json       |  7 +++++--
 l10n/it.js         |  7 +++++--
 l10n/it.json       |  7 +++++--
 l10n/ja.js         | 12 ++++++++++--
 l10n/ja.json       | 12 ++++++++++--
 l10n/ka_GE.js      |  4 +++-
 l10n/ka_GE.json    |  4 +++-
 l10n/kab.js        |  1 +
 l10n/kab.json      |  1 +
 l10n/km.js         |  1 +
 l10n/km.json       |  1 +
 l10n/kn.js         | 15 ---------------
 l10n/kn.json       | 13 -------------
 l10n/ko.js         |  6 ++++--
 l10n/ko.json       |  6 ++++--
 l10n/lb.js         |  1 +
 l10n/lb.json       |  1 +
 l10n/lo.js         |  3 ++-
 l10n/lo.json       |  3 ++-
 l10n/lt_LT.js      |  8 +++++++-
 l10n/lt_LT.json    |  8 +++++++-
 l10n/lv.js         |  7 ++++++-
 l10n/lv.json       |  7 ++++++-
 l10n/mk.js         | 14 +++++++++++++-
 l10n/mk.json       | 14 +++++++++++++-
 l10n/mn.js         |  7 +++++--
 l10n/mn.json       |  7 +++++--
 l10n/ms_MY.js      |  1 +
 l10n/ms_MY.json    |  1 +
 l10n/nb.js         | 15 +++++++++++++--
 l10n/nb.json       | 15 +++++++++++++--
 l10n/nl.js         |  9 +++++++--
 l10n/nl.json       |  9 +++++++--
 l10n/nn_NO.js      |  1 +
 l10n/nn_NO.json    |  1 +
 l10n/oc.js         |  7 +++++--
 l10n/oc.json       |  7 +++++--
 l10n/pl.js         | 22 +++++++++++++++++++++-
 l10n/pl.json       | 22 +++++++++++++++++++++-
 l10n/pt_BR.js      | 22 +++++++++++++++++++++-
 l10n/pt_BR.json    | 22 +++++++++++++++++++++-
 l10n/pt_PT.js      |  6 +++++-
 l10n/pt_PT.json    |  6 +++++-
 l10n/ro.js         |  8 ++++++--
 l10n/ro.json       |  8 ++++++--
 l10n/ru.js         | 12 +++++++++++-
 l10n/ru.json       | 12 +++++++++++-
 l10n/sc.js         | 11 +++++++++--
 l10n/sc.json       | 11 +++++++++--
 l10n/si.js         |  5 ++++-
 l10n/si.json       |  5 ++++-
 l10n/sk.js         | 25 ++++++++++++++++++++++++-
 l10n/sk.json       | 25 ++++++++++++++++++++++++-
 l10n/sl.js         | 11 +++++++++--
 l10n/sl.json       | 11 +++++++++--
 l10n/sq.js         |  8 +++++++-
 l10n/sq.json       |  8 +++++++-
 l10n/sr.js         | 10 ++++++++--
 l10n/sr.json       | 10 ++++++++--
 l10n/sr@latin.js   |  5 ++++-
 l10n/sr@latin.json |  5 ++++-
 l10n/sv.js         | 10 +++++++++-
 l10n/sv.json       | 10 +++++++++-
 l10n/ta.js         |  2 ++
 l10n/ta.json       |  2 ++
 l10n/th.js         |  7 ++++++-
 l10n/th.json       |  7 ++++++-
 l10n/tk.js         |  2 ++
 l10n/tk.json       |  2 ++
 l10n/tr.js         | 30 +++++++++++++++++++++++++++++-
 l10n/tr.json       | 30 +++++++++++++++++++++++++++++-
 l10n/ug.js         |  2 ++
 l10n/ug.json       |  2 ++
 l10n/uk.js         | 31 ++++++++++++++++++++++++++++++-
 l10n/uk.json       | 31 ++++++++++++++++++++++++++++++-
 l10n/ur_PK.js      |  5 ++++-
 l10n/ur_PK.json    |  5 ++++-
 l10n/vi.js         | 10 ++++++++--
 l10n/vi.json       | 10 ++++++++--
 l10n/zh_CN.js      | 10 +++++++++-
 l10n/zh_CN.json    | 10 +++++++++-
 l10n/zh_HK.js      | 35 ++++++++++++++++++++++++++++++++++-
 l10n/zh_HK.json    | 35 ++++++++++++++++++++++++++++++++++-
 l10n/zh_TW.js      | 36 +++++++++++++++++++++++++++++++++++-
 l10n/zh_TW.json    | 36 +++++++++++++++++++++++++++++++++++-
 176 files changed, 1036 insertions(+), 242 deletions(-)
 delete mode 100644 l10n/bs.js
 delete mode 100644 l10n/bs.json
 delete mode 100644 l10n/kn.js
 delete mode 100644 l10n/kn.json

diff --git a/l10n/af.js b/l10n/af.js
index a2e273190..f0f0a36dd 100644
--- a/l10n/af.js
+++ b/l10n/af.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Tags" : "Etikette",
     "Maps" : "Kaarte",
     "Settings" : "Instellings",
+    "Loading …" : "Laai …",
     "Cancel" : "Kanselleer",
     "Delete" : "Skrap",
     "Download" : "Laai af",
@@ -22,7 +23,6 @@ OC.L10N.register(
     "Hour" : "Uur",
     "Name" : "Naam",
     "Update" : "Werk by",
-    "Loading …" : "Laai …",
     "Refresh" : "Verfris"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/af.json b/l10n/af.json
index 0c523a9d3..3d393e4da 100644
--- a/l10n/af.json
+++ b/l10n/af.json
@@ -6,6 +6,7 @@
     "Tags" : "Etikette",
     "Maps" : "Kaarte",
     "Settings" : "Instellings",
+    "Loading …" : "Laai …",
     "Cancel" : "Kanselleer",
     "Delete" : "Skrap",
     "Download" : "Laai af",
@@ -20,7 +21,6 @@
     "Hour" : "Uur",
     "Name" : "Naam",
     "Update" : "Werk by",
-    "Loading …" : "Laai …",
     "Refresh" : "Verfris"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ar.js b/l10n/ar.js
index 53f180e0c..63eefc8e8 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Tags" : "الوسوم",
     "Maps" : "الخرائط",
     "Settings" : "الإعدادات",
+    "Loading …" : "جاري التحميل …",
     "Cancel" : "إلغاء",
     "Delete" : "إزالة",
     "Download" : "تنزيل",
@@ -23,7 +24,6 @@ OC.L10N.register(
     "Hour" : "الساعة",
     "Name" : "الاسم",
     "Update" : "تحديث",
-    "Loading …" : "جاري التحميل …",
     "Refresh" : "إنعاش"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/l10n/ar.json b/l10n/ar.json
index bffbd4f84..80b4f6b0c 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -7,6 +7,7 @@
     "Tags" : "الوسوم",
     "Maps" : "الخرائط",
     "Settings" : "الإعدادات",
+    "Loading …" : "جاري التحميل …",
     "Cancel" : "إلغاء",
     "Delete" : "إزالة",
     "Download" : "تنزيل",
@@ -21,7 +22,6 @@
     "Hour" : "الساعة",
     "Name" : "الاسم",
     "Update" : "تحديث",
-    "Loading …" : "جاري التحميل …",
     "Refresh" : "إنعاش"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/l10n/ast.js b/l10n/ast.js
index daa7bf2d2..d64396642 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
     "Settings" : "Settings",
+    "Loading …" : "Cargando...",
     "Cancel" : "Encaboxar",
     "Delete" : "Desaniciar",
     "Download" : "Baxar",
@@ -21,7 +22,6 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nome",
     "Update" : "Anovar",
-    "Loading …" : "Cargando...",
     "Refresh" : "Refrescar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ast.json b/l10n/ast.json
index 8747bff1e..024a07df4 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -6,6 +6,7 @@
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
     "Settings" : "Settings",
+    "Loading …" : "Cargando...",
     "Cancel" : "Encaboxar",
     "Delete" : "Desaniciar",
     "Download" : "Baxar",
@@ -19,7 +20,6 @@
     "Hour" : "Hora",
     "Name" : "Nome",
     "Update" : "Anovar",
-    "Loading …" : "Cargando...",
     "Refresh" : "Refrescar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/bg.js b/l10n/bg.js
index 654cce3ef..825d6afe2 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -24,6 +24,7 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Изберете основата /началото/ на вашата времева линия ",
     "The selected folder does not seem to be valid. Try again." : "Избраната папка изглежда не е валидна. Опитайте отново.",
     "Found {total} photos in {path}" : "Намерени са {total} снимки в {path}",
+    "Loading …" : "Зареждане …",
     "Cancel" : "Отказ",
     "Delete" : "Изтриване",
     "Remove from album" : "Премахване от албума",
@@ -104,7 +105,6 @@ OC.L10N.register(
     "Rename person" : "Преименуване на лице",
     "Update" : "Обновяване",
     "Failed to rename {oldName} to {name}." : "Неуспешно преименуване от {oldName} на {name}.",
-    "Loading …" : "Зареждане …",
     "Merge {name} with person" : "Обединяване на {name} с лице",
     "Are you sure you want to merge {name} with {newName}?" : "Сигурни ли сте, че искате да обедините {name} с {newName}?",
     "Too many failures, aborting" : "Твърде много грешки от общ характер, прекъсване",
diff --git a/l10n/bg.json b/l10n/bg.json
index f962fda9f..37441b5f9 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -22,6 +22,7 @@
     "Choose the root of your timeline" : "Изберете основата /началото/ на вашата времева линия ",
     "The selected folder does not seem to be valid. Try again." : "Избраната папка изглежда не е валидна. Опитайте отново.",
     "Found {total} photos in {path}" : "Намерени са {total} снимки в {path}",
+    "Loading …" : "Зареждане …",
     "Cancel" : "Отказ",
     "Delete" : "Изтриване",
     "Remove from album" : "Премахване от албума",
@@ -102,7 +103,6 @@
     "Rename person" : "Преименуване на лице",
     "Update" : "Обновяване",
     "Failed to rename {oldName} to {name}." : "Неуспешно преименуване от {oldName} на {name}.",
-    "Loading …" : "Зареждане …",
     "Merge {name} with person" : "Обединяване на {name} с лице",
     "Are you sure you want to merge {name} with {newName}?" : "Сигурни ли сте, че искате да обедините {name} с {newName}?",
     "Too many failures, aborting" : "Твърде много грешки от общ характер, прекъсване",
diff --git a/l10n/br.js b/l10n/br.js
index 5bb373af2..9ec8dd6d5 100644
--- a/l10n/br.js
+++ b/l10n/br.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Videos" : "Videoioù",
     "Tags" : "Klavioù",
     "Settings" : "Arventennoù",
+    "Loading …" : "O Kargañ ...",
     "Cancel" : "Arrest",
     "Delete" : "Lemel",
     "Download" : "Pellgargañ",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Day" : "Deiz",
     "Name" : "Anv",
     "Update" : "Hizivaat",
-    "Loading …" : "O Kargañ ...",
     "Refresh" : "Freskaat"
 },
 "nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);");
diff --git a/l10n/br.json b/l10n/br.json
index f6d28c7c7..96eadc607 100644
--- a/l10n/br.json
+++ b/l10n/br.json
@@ -3,6 +3,7 @@
     "Videos" : "Videoioù",
     "Tags" : "Klavioù",
     "Settings" : "Arventennoù",
+    "Loading …" : "O Kargañ ...",
     "Cancel" : "Arrest",
     "Delete" : "Lemel",
     "Download" : "Pellgargañ",
@@ -16,7 +17,6 @@
     "Day" : "Deiz",
     "Name" : "Anv",
     "Update" : "Hizivaat",
-    "Loading …" : "O Kargañ ...",
     "Refresh" : "Freskaat"
 },"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"
 }
\ No newline at end of file
diff --git a/l10n/bs.js b/l10n/bs.js
deleted file mode 100644
index 9ff64dd73..000000000
--- a/l10n/bs.js
+++ /dev/null
@@ -1,16 +0,0 @@
-OC.L10N.register(
-    "memories",
-    {
-    "Favorites" : "Favoriti",
-    "Settings" : "Podešavanje",
-    "Cancel" : "Otkaži",
-    "Delete" : "Obriši",
-    "Download" : "Preuzmi",
-    "Favorite" : "Favorit",
-    "Save" : "Spremi",
-    "Month" : "Mjesec",
-    "Day" : "Dan",
-    "Name" : "Ime",
-    "Update" : "Ažuriraj"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/bs.json b/l10n/bs.json
deleted file mode 100644
index 5bd557a0f..000000000
--- a/l10n/bs.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{ "translations": {
-    "Favorites" : "Favoriti",
-    "Settings" : "Podešavanje",
-    "Cancel" : "Otkaži",
-    "Delete" : "Obriši",
-    "Download" : "Preuzmi",
-    "Favorite" : "Favorit",
-    "Save" : "Spremi",
-    "Month" : "Mjesec",
-    "Day" : "Dan",
-    "Name" : "Ime",
-    "Update" : "Ažuriraj"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}
\ No newline at end of file
diff --git a/l10n/ca.js b/l10n/ca.js
index ca331ab8f..dd959006c 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
     "Settings" : "Paràmetres",
+    "Loading …" : "Carregant …",
     "Cancel" : "Cancel·la",
     "Delete" : "Suprimeix",
     "Download" : "Baixa",
@@ -30,7 +31,6 @@ OC.L10N.register(
     "Minute" : "Minut",
     "Name" : "Cognom",
     "Update" : "Actualitzar",
-    "Loading …" : "Carregant …",
     "Refresh" : "Actualitza",
     "Share folder" : "Comparteix la carpeta"
 },
diff --git a/l10n/ca.json b/l10n/ca.json
index 4370277ba..dcd417c82 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -10,6 +10,7 @@
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
     "Settings" : "Paràmetres",
+    "Loading …" : "Carregant …",
     "Cancel" : "Cancel·la",
     "Delete" : "Suprimeix",
     "Download" : "Baixa",
@@ -28,7 +29,6 @@
     "Minute" : "Minut",
     "Name" : "Cognom",
     "Update" : "Actualitzar",
-    "Loading …" : "Carregant …",
     "Refresh" : "Actualitza",
     "Share folder" : "Comparteix la carpeta"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/l10n/cs.js b/l10n/cs.js
index 60842dbbe..a7806f48a 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Zvolte kořen vaší časové osy",
     "The selected folder does not seem to be valid. Try again." : "Vybraná složka se nezdá být platná. Zkuste to znovu.",
     "Found {total} photos in {path}" : "V {path} nalezeno {total} fotek",
+    "Loading …" : "Načítání…",
     "Cancel" : "Storno",
     "Delete" : "Smazat",
     "Remove from album" : "Odebrat z alba",
@@ -105,7 +106,6 @@ OC.L10N.register(
     "Rename person" : "Přejmenovat osobu",
     "Update" : "Aktualizovat",
     "Failed to rename {oldName} to {name}." : "Nepodařilo se přejmenovat {oldName} na {name}.",
-    "Loading …" : "Načítání…",
     "Merge {name} with person" : "Sloučit {name} s osobou",
     "Are you sure you want to merge {name} with {newName}?" : "Opravdu chcete sloučit {name} s {newName}?",
     "Too many failures, aborting" : "Příliš mnoho nezdarů – přerušuje se",
diff --git a/l10n/cs.json b/l10n/cs.json
index 5e8f92232..9d0933ee5 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -23,6 +23,7 @@
     "Choose the root of your timeline" : "Zvolte kořen vaší časové osy",
     "The selected folder does not seem to be valid. Try again." : "Vybraná složka se nezdá být platná. Zkuste to znovu.",
     "Found {total} photos in {path}" : "V {path} nalezeno {total} fotek",
+    "Loading …" : "Načítání…",
     "Cancel" : "Storno",
     "Delete" : "Smazat",
     "Remove from album" : "Odebrat z alba",
@@ -103,7 +104,6 @@
     "Rename person" : "Přejmenovat osobu",
     "Update" : "Aktualizovat",
     "Failed to rename {oldName} to {name}." : "Nepodařilo se přejmenovat {oldName} na {name}.",
-    "Loading …" : "Načítání…",
     "Merge {name} with person" : "Sloučit {name} s osobou",
     "Are you sure you want to merge {name} with {newName}?" : "Opravdu chcete sloučit {name} s {newName}?",
     "Too many failures, aborting" : "Příliš mnoho nezdarů – přerušuje se",
diff --git a/l10n/cy_GB.js b/l10n/cy_GB.js
index 15880cadf..ab41043f2 100644
--- a/l10n/cy_GB.js
+++ b/l10n/cy_GB.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Archive" : "Archif",
     "Tags" : "Tagiau",
     "Settings" : "Gosodiadau",
+    "Loading …" : "Yn llwytho …",
     "Cancel" : "Diddymu",
     "Delete" : "Dileu",
     "Download" : "Llwytho i lawr",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Time" : "Amser",
     "Name" : "Enw",
     "Update" : "Diweddaru",
-    "Loading …" : "Yn llwytho …",
     "Refresh" : "Ail-lwytho"
 },
 "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/l10n/cy_GB.json b/l10n/cy_GB.json
index 6a8bc5474..d792e9e3d 100644
--- a/l10n/cy_GB.json
+++ b/l10n/cy_GB.json
@@ -4,6 +4,7 @@
     "Archive" : "Archif",
     "Tags" : "Tagiau",
     "Settings" : "Gosodiadau",
+    "Loading …" : "Yn llwytho …",
     "Cancel" : "Diddymu",
     "Delete" : "Dileu",
     "Download" : "Llwytho i lawr",
@@ -17,7 +18,6 @@
     "Time" : "Amser",
     "Name" : "Enw",
     "Update" : "Diweddaru",
-    "Loading …" : "Yn llwytho …",
     "Refresh" : "Ail-lwytho"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/da.js b/l10n/da.js
index 00c46a2a1..3b509fba1 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Tags" : "Mærker",
     "Maps" : "Kort",
     "Settings" : "Indstillinger",
+    "Loading …" : "Loading …",
     "Cancel" : "Annuller",
     "Delete" : "Slet",
     "Download" : "Download",
@@ -46,7 +47,6 @@ OC.L10N.register(
     "Hour" : "Time",
     "Name" : "Navn",
     "Update" : "Opdater",
-    "Loading …" : "Loading …",
     "Refresh" : "Opdater",
     "Share folder" : "Del mappe",
     "Failed to delete files." : "Kunne ikke slette filer.",
diff --git a/l10n/da.json b/l10n/da.json
index 95b374833..b24f3a15b 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -12,6 +12,7 @@
     "Tags" : "Mærker",
     "Maps" : "Kort",
     "Settings" : "Indstillinger",
+    "Loading …" : "Loading …",
     "Cancel" : "Annuller",
     "Delete" : "Slet",
     "Download" : "Download",
@@ -44,7 +45,6 @@
     "Hour" : "Time",
     "Name" : "Navn",
     "Update" : "Opdater",
-    "Loading …" : "Loading …",
     "Refresh" : "Opdater",
     "Share folder" : "Del mappe",
     "Failed to delete files." : "Kunne ikke slette filer.",
diff --git a/l10n/de.js b/l10n/de.js
index ca5fed816..a2046e5b0 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "You can always change this later in settings" : "Du kannst das auch noch später in den Einstellungen ändern.",
     "Choose the root of your timeline" : "Wähle den Start deiner Zeitleiste aus",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuche es nochmal.",
+    "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
     "Download" : "Herunterladen",
@@ -93,7 +94,6 @@ OC.L10N.register(
     "Rename person" : "Person umbenennen",
     "Update" : "Aktualisieren",
     "Failed to rename {oldName} to {name}." : "{oldName} konnte nicht in {name} umbenannt werden.",
-    "Loading …" : "Lade …",
     "Merge {name} with person" : "{name} mit Person zusammenführen",
     "Are you sure you want to merge {name} with {newName}?" : "Bist du sicher, dass du {name} mit {newName} zusammenführen möchtest?",
     "Too many failures, aborting" : "Zu viele Fehler, Abbruch",
@@ -107,6 +107,8 @@ OC.L10N.register(
     "Share folder" : "Ordner teilen",
     "Move left" : "Nach links verschieben",
     "Move right" : "Nach rechts verschieben",
+    "is not an image" : "Ist kein Bild",
+    "Rectangle" : "Rechteck",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
     "General Failure" : "Allgemeiner Fehler",
diff --git a/l10n/de.json b/l10n/de.json
index 1bb72c546..f81657882 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -20,6 +20,7 @@
     "You can always change this later in settings" : "Du kannst das auch noch später in den Einstellungen ändern.",
     "Choose the root of your timeline" : "Wähle den Start deiner Zeitleiste aus",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuche es nochmal.",
+    "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
     "Download" : "Herunterladen",
@@ -91,7 +92,6 @@
     "Rename person" : "Person umbenennen",
     "Update" : "Aktualisieren",
     "Failed to rename {oldName} to {name}." : "{oldName} konnte nicht in {name} umbenannt werden.",
-    "Loading …" : "Lade …",
     "Merge {name} with person" : "{name} mit Person zusammenführen",
     "Are you sure you want to merge {name} with {newName}?" : "Bist du sicher, dass du {name} mit {newName} zusammenführen möchtest?",
     "Too many failures, aborting" : "Zu viele Fehler, Abbruch",
@@ -105,6 +105,8 @@
     "Share folder" : "Ordner teilen",
     "Move left" : "Nach links verschieben",
     "Move right" : "Nach rechts verschieben",
+    "is not an image" : "Ist kein Bild",
+    "Rectangle" : "Rechteck",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
     "General Failure" : "Allgemeiner Fehler",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 4da2531c1..5281af145 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Start Ihrer Zeitleiste auswählen",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuchen Sie es nochmal.",
     "Found {total} photos in {path}" : "{total} Fotos gefunden in {path}",
+    "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
     "Remove from album" : "Aus dem Album entfernen",
@@ -105,7 +106,6 @@ OC.L10N.register(
     "Rename person" : "Person umbenennen",
     "Update" : "Aktualisieren",
     "Failed to rename {oldName} to {name}." : "Fehler beim Umbenennen von {oldName} in {name}.",
-    "Loading …" : "Lade …",
     "Merge {name} with person" : "{name} mit Person zusammenführen",
     "Are you sure you want to merge {name} with {newName}?" : "Sind Sie sicher, dass Sie {name} mit {newName} zusammenführen möchten?",
     "Too many failures, aborting" : "Zu viele Fehler, Abbruch",
@@ -125,6 +125,8 @@ OC.L10N.register(
     "Share folder" : "Ordner teilen",
     "Move left" : "Nach links verschieben",
     "Move right" : "Nach rechts verschieben",
+    "is not an image" : "Ist kein Bild",
+    "Rectangle" : "Rechteck",
     "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index c447181fe..72ca58517 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -23,6 +23,7 @@
     "Choose the root of your timeline" : "Start Ihrer Zeitleiste auswählen",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuchen Sie es nochmal.",
     "Found {total} photos in {path}" : "{total} Fotos gefunden in {path}",
+    "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
     "Remove from album" : "Aus dem Album entfernen",
@@ -103,7 +104,6 @@
     "Rename person" : "Person umbenennen",
     "Update" : "Aktualisieren",
     "Failed to rename {oldName} to {name}." : "Fehler beim Umbenennen von {oldName} in {name}.",
-    "Loading …" : "Lade …",
     "Merge {name} with person" : "{name} mit Person zusammenführen",
     "Are you sure you want to merge {name} with {newName}?" : "Sind Sie sicher, dass Sie {name} mit {newName} zusammenführen möchten?",
     "Too many failures, aborting" : "Zu viele Fehler, Abbruch",
@@ -123,6 +123,8 @@
     "Share folder" : "Ordner teilen",
     "Move left" : "Nach links verschieben",
     "Move right" : "Nach rechts verschieben",
+    "is not an image" : "Ist kein Bild",
+    "Rectangle" : "Rechteck",
     "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
diff --git a/l10n/el.js b/l10n/el.js
index 703cff723..a59760138 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Tags" : "Ετικέτες",
     "Maps" : "Χάρτες",
     "Settings" : "Ρυθμίσεις",
+    "Loading …" : "Φόρτωση …",
     "Cancel" : "Ακύρωση",
     "Delete" : "Διαγραφή",
     "Download" : "Λήψη",
@@ -30,7 +31,6 @@ OC.L10N.register(
     "Minute" : "Λεπτά",
     "Name" : "Όνομα",
     "Update" : "Ενημέρωση",
-    "Loading …" : "Φόρτωση …",
     "Refresh" : "Ανανέωση",
     "Share folder" : "Διαμοιρασμός φακέλου"
 },
diff --git a/l10n/el.json b/l10n/el.json
index 59bf3fa9a..465b8331c 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -10,6 +10,7 @@
     "Tags" : "Ετικέτες",
     "Maps" : "Χάρτες",
     "Settings" : "Ρυθμίσεις",
+    "Loading …" : "Φόρτωση …",
     "Cancel" : "Ακύρωση",
     "Delete" : "Διαγραφή",
     "Download" : "Λήψη",
@@ -28,7 +29,6 @@
     "Minute" : "Λεπτά",
     "Name" : "Όνομα",
     "Update" : "Ενημέρωση",
-    "Loading …" : "Φόρτωση …",
     "Refresh" : "Ανανέωση",
     "Share folder" : "Διαμοιρασμός φακέλου"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 1b4e9c819..14be8fd88 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Tags" : "Tags",
     "Maps" : "Maps",
     "Settings" : "Settings",
+    "Loading …" : "Loading …",
     "Cancel" : "Cancel",
     "Delete" : "Delete",
     "Download" : "Download",
@@ -23,7 +24,7 @@ OC.L10N.register(
     "Hour" : "Hour",
     "Name" : "Surname",
     "Update" : "Update",
-    "Loading …" : "Loading …",
-    "Refresh" : "Refresh"
+    "Refresh" : "Refresh",
+    "Image" : "Image"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index eae72fc21..efc395518 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -6,6 +6,7 @@
     "Tags" : "Tags",
     "Maps" : "Maps",
     "Settings" : "Settings",
+    "Loading …" : "Loading …",
     "Cancel" : "Cancel",
     "Delete" : "Delete",
     "Download" : "Download",
@@ -21,7 +22,7 @@
     "Hour" : "Hour",
     "Name" : "Surname",
     "Update" : "Update",
-    "Loading …" : "Loading …",
-    "Refresh" : "Refresh"
+    "Refresh" : "Refresh",
+    "Image" : "Image"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/eo.js b/l10n/eo.js
index 24f756009..2a35d7224 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Tags" : "Etikedoj",
     "Maps" : "Mapoj",
     "Settings" : "Agordoj",
+    "Loading …" : "Ŝargas …",
     "Cancel" : "Nuligi",
     "Delete" : "Forigi",
     "Download" : "Elŝuti",
@@ -23,7 +24,6 @@ OC.L10N.register(
     "Hour" : "Horo",
     "Name" : "Nomo",
     "Update" : "Ĝisdatigi",
-    "Loading …" : "Ŝargas …",
     "Refresh" : "Aktualigi"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/eo.json b/l10n/eo.json
index 61518c7eb..793de0012 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -7,6 +7,7 @@
     "Tags" : "Etikedoj",
     "Maps" : "Mapoj",
     "Settings" : "Agordoj",
+    "Loading …" : "Ŝargas …",
     "Cancel" : "Nuligi",
     "Delete" : "Forigi",
     "Download" : "Elŝuti",
@@ -21,7 +22,6 @@
     "Hour" : "Horo",
     "Name" : "Nomo",
     "Update" : "Ĝisdatigi",
-    "Loading …" : "Ŝargas …",
     "Refresh" : "Aktualigi"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
index b21d66b6a..d4f84f16a 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Seleccione la raíz de su línea de tiempo",
     "The selected folder does not seem to be valid. Try again." : "La carpeta seleccionada no parece ser válida. Intente de nuevo.",
     "Found {total} photos in {path}" : "Se encontraron {total} fotos en {path}",
+    "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Remove from album" : "Quitar del álbum",
@@ -105,7 +106,6 @@ OC.L10N.register(
     "Rename person" : "Renombrar persona",
     "Update" : "Actualizar",
     "Failed to rename {oldName} to {name}." : "Fallo al renombrar {oldName} a {name}",
-    "Loading …" : "Cargando …",
     "Merge {name} with person" : "Unir {name} con persona",
     "Are you sure you want to merge {name} with {newName}?" : "¿Está seguro de quiere unir {name} con {newName}?",
     "Too many failures, aborting" : "Demasiados fallos, abortando",
@@ -125,6 +125,9 @@ OC.L10N.register(
     "Share folder" : "Compartir carpeta",
     "Move left" : "Mover a la izquierda",
     "Move right" : "Mover a la derecha",
+    "is not an image" : "no es una imágen",
+    "Image" : "Imagen",
+    "Rectangle" : "Rectángulo",
     "Shared Folder" : "Carpeta compartida",
     "Failed to create {albumName}." : "Fallo al crear {albumName}",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Fallo al renombrar {currentAlbumName} a {newAlbumName}.",
diff --git a/l10n/es.json b/l10n/es.json
index a6ed7f4a9..ddc227acb 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -23,6 +23,7 @@
     "Choose the root of your timeline" : "Seleccione la raíz de su línea de tiempo",
     "The selected folder does not seem to be valid. Try again." : "La carpeta seleccionada no parece ser válida. Intente de nuevo.",
     "Found {total} photos in {path}" : "Se encontraron {total} fotos en {path}",
+    "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Remove from album" : "Quitar del álbum",
@@ -103,7 +104,6 @@
     "Rename person" : "Renombrar persona",
     "Update" : "Actualizar",
     "Failed to rename {oldName} to {name}." : "Fallo al renombrar {oldName} a {name}",
-    "Loading …" : "Cargando …",
     "Merge {name} with person" : "Unir {name} con persona",
     "Are you sure you want to merge {name} with {newName}?" : "¿Está seguro de quiere unir {name} con {newName}?",
     "Too many failures, aborting" : "Demasiados fallos, abortando",
@@ -123,6 +123,9 @@
     "Share folder" : "Compartir carpeta",
     "Move left" : "Mover a la izquierda",
     "Move right" : "Mover a la derecha",
+    "is not an image" : "no es una imágen",
+    "Image" : "Imagen",
+    "Rectangle" : "Rectángulo",
     "Shared Folder" : "Carpeta compartida",
     "Failed to create {albumName}." : "Fallo al crear {albumName}",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Fallo al renombrar {currentAlbumName} a {newAlbumName}.",
diff --git a/l10n/es_AR.js b/l10n/es_AR.js
index aac115e47..5fe830c88 100644
--- a/l10n/es_AR.js
+++ b/l10n/es_AR.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Download" : "Descargar",
@@ -24,7 +25,6 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Loading …" : "Cargando …",
     "Refresh" : "Recargar"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_AR.json b/l10n/es_AR.json
index e9cc7aa71..3669447f5 100644
--- a/l10n/es_AR.json
+++ b/l10n/es_AR.json
@@ -7,6 +7,7 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Download" : "Descargar",
@@ -22,7 +23,6 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Loading …" : "Cargando …",
     "Refresh" : "Recargar"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_CL.js b/l10n/es_CL.js
index a873290ad..7273c36ef 100644
--- a/l10n/es_CL.js
+++ b/l10n/es_CL.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
@@ -23,7 +24,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Loading …" : "Cargando …",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_CL.json b/l10n/es_CL.json
index 65431a10a..a3bcebc5d 100644
--- a/l10n/es_CL.json
+++ b/l10n/es_CL.json
@@ -6,6 +6,7 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
@@ -21,7 +22,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Loading …" : "Cargando …",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_CO.js b/l10n/es_CO.js
index bab00dfe0..617d2b315 100644
--- a/l10n/es_CO.js
+++ b/l10n/es_CO.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_CO.json b/l10n/es_CO.json
index 7beed7c86..2eaf178a6 100644
--- a/l10n/es_CO.json
+++ b/l10n/es_CO.json
@@ -21,6 +21,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_CR.js b/l10n/es_CR.js
index bab00dfe0..617d2b315 100644
--- a/l10n/es_CR.js
+++ b/l10n/es_CR.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_CR.json b/l10n/es_CR.json
index 7beed7c86..2eaf178a6 100644
--- a/l10n/es_CR.json
+++ b/l10n/es_CR.json
@@ -21,6 +21,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_DO.js b/l10n/es_DO.js
index bab00dfe0..617d2b315 100644
--- a/l10n/es_DO.js
+++ b/l10n/es_DO.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_DO.json b/l10n/es_DO.json
index 7beed7c86..2eaf178a6 100644
--- a/l10n/es_DO.json
+++ b/l10n/es_DO.json
@@ -21,6 +21,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
index a1353d0f9..78b7f08e9 100644
--- a/l10n/es_EC.js
+++ b/l10n/es_EC.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
index 22348969b..0bfe384d9 100644
--- a/l10n/es_EC.json
+++ b/l10n/es_EC.json
@@ -21,6 +21,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index 32d899398..d45f5ceec 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index a51af3cdf..b643018d8 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -21,6 +21,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
index bab00dfe0..617d2b315 100644
--- a/l10n/es_HN.js
+++ b/l10n/es_HN.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
index 7beed7c86..2eaf178a6 100644
--- a/l10n/es_HN.json
+++ b/l10n/es_HN.json
@@ -21,6 +21,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index b60dbd597..d58963080 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -24,6 +24,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index 7d438695d..07d1d3272 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -22,6 +22,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_NI.js b/l10n/es_NI.js
index 34f53ff08..78a3e317e 100644
--- a/l10n/es_NI.js
+++ b/l10n/es_NI.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_NI.json b/l10n/es_NI.json
index cbd2d7012..1d6fc85c2 100644
--- a/l10n/es_NI.json
+++ b/l10n/es_NI.json
@@ -20,6 +20,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
index 34f53ff08..78a3e317e 100644
--- a/l10n/es_PA.js
+++ b/l10n/es_PA.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
index cbd2d7012..1d6fc85c2 100644
--- a/l10n/es_PA.json
+++ b/l10n/es_PA.json
@@ -20,6 +20,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_PE.js b/l10n/es_PE.js
index 4b50b7e7c..52fb7cffb 100644
--- a/l10n/es_PE.js
+++ b/l10n/es_PE.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_PE.json b/l10n/es_PE.json
index b5bc3af91..38ec4f7f3 100644
--- a/l10n/es_PE.json
+++ b/l10n/es_PE.json
@@ -20,6 +20,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
index 34f53ff08..78a3e317e 100644
--- a/l10n/es_PR.js
+++ b/l10n/es_PR.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
index cbd2d7012..1d6fc85c2 100644
--- a/l10n/es_PR.json
+++ b/l10n/es_PR.json
@@ -20,6 +20,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_PY.js b/l10n/es_PY.js
index 34f53ff08..78a3e317e 100644
--- a/l10n/es_PY.js
+++ b/l10n/es_PY.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_PY.json b/l10n/es_PY.json
index cbd2d7012..1d6fc85c2 100644
--- a/l10n/es_PY.json
+++ b/l10n/es_PY.json
@@ -20,6 +20,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
index bab00dfe0..617d2b315 100644
--- a/l10n/es_SV.js
+++ b/l10n/es_SV.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
index 7beed7c86..2eaf178a6 100644
--- a/l10n/es_SV.json
+++ b/l10n/es_SV.json
@@ -21,6 +21,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
index 34f53ff08..78a3e317e 100644
--- a/l10n/es_UY.js
+++ b/l10n/es_UY.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
index cbd2d7012..1d6fc85c2 100644
--- a/l10n/es_UY.json
+++ b/l10n/es_UY.json
@@ -20,6 +20,7 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index 3ac3b3b3c..f36dd1d53 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Hour" : "Tund",
     "Name" : "Nimi",
     "Update" : "Uuenda",
-    "Refresh" : "Värskenda"
+    "Refresh" : "Värskenda",
+    "Position" : "Asukoht"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index f6bc164a5..657bb765b 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -21,6 +21,7 @@
     "Hour" : "Tund",
     "Name" : "Nimi",
     "Update" : "Uuenda",
-    "Refresh" : "Värskenda"
+    "Refresh" : "Värskenda",
+    "Position" : "Asukoht"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/eu.js b/l10n/eu.js
index 7fa110220..9f4e1cf53 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Tags" : "Etiketak",
     "Maps" : "Mapak",
     "Settings" : "Ezarpenak",
+    "Loading …" : "Kargatzen …",
     "Cancel" : "Utzi",
     "Delete" : "Ezabatu",
     "Download" : "Deskargatu",
@@ -81,12 +82,23 @@ OC.L10N.register(
     "Name" : "Izena",
     "Rename person" : "Berridatzi pertsonaren izena",
     "Update" : "Eguneratu",
-    "Loading …" : "Kargatzen …",
     "Failed to move {name}." : "{name} mugitzeak huts egin du.",
     "Refresh" : "Freskatu",
     "Delete album" : "Ezabatu albuma",
     "Merge with different person" : "Bateratu beste pertsona batekin",
     "Share folder" : "Partekatu karpeta",
+    "Are you sure you want to continue?" : "Ziur zaude jarraitu nahi duzula?",
+    "Show original image" : "Erakutsi jatorrizko irudia",
+    "Toggle zoom menu" : "Aldatu zoom menua",
+    "Resize" : "Tamaina aldatu",
+    "is not an image" : "ez da irudi bat",
+    "Ellipse" : "Elipsea",
+    "Image" : "Irudia",
+    "Rectangle" : "Laukizuzena",
+    "Corner Radius" : "Izkinako erradioa",
+    "Position" : "Kokalekua",
+    "Saved image size (width x height)" : "Gordetako irudiaren tamaina (zabalera x altuera)",
+    "Actual size (100%)" : "Benetako tamaina (% 100)",
     "Failed to create {albumName}." : "Ezin izan da {albumName} sortu.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Ezin izan da {currentAlbumName} berrizendatu {newAlbumName} gisa.",
     "General Failure" : "Hutsegite orokorra",
diff --git a/l10n/eu.json b/l10n/eu.json
index 5ea2b3d22..5cd6b3d0a 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -12,6 +12,7 @@
     "Tags" : "Etiketak",
     "Maps" : "Mapak",
     "Settings" : "Ezarpenak",
+    "Loading …" : "Kargatzen …",
     "Cancel" : "Utzi",
     "Delete" : "Ezabatu",
     "Download" : "Deskargatu",
@@ -79,12 +80,23 @@
     "Name" : "Izena",
     "Rename person" : "Berridatzi pertsonaren izena",
     "Update" : "Eguneratu",
-    "Loading …" : "Kargatzen …",
     "Failed to move {name}." : "{name} mugitzeak huts egin du.",
     "Refresh" : "Freskatu",
     "Delete album" : "Ezabatu albuma",
     "Merge with different person" : "Bateratu beste pertsona batekin",
     "Share folder" : "Partekatu karpeta",
+    "Are you sure you want to continue?" : "Ziur zaude jarraitu nahi duzula?",
+    "Show original image" : "Erakutsi jatorrizko irudia",
+    "Toggle zoom menu" : "Aldatu zoom menua",
+    "Resize" : "Tamaina aldatu",
+    "is not an image" : "ez da irudi bat",
+    "Ellipse" : "Elipsea",
+    "Image" : "Irudia",
+    "Rectangle" : "Laukizuzena",
+    "Corner Radius" : "Izkinako erradioa",
+    "Position" : "Kokalekua",
+    "Saved image size (width x height)" : "Gordetako irudiaren tamaina (zabalera x altuera)",
+    "Actual size (100%)" : "Benetako tamaina (% 100)",
     "Failed to create {albumName}." : "Ezin izan da {albumName} sortu.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Ezin izan da {currentAlbumName} berrizendatu {newAlbumName} gisa.",
     "General Failure" : "Hutsegite orokorra",
diff --git a/l10n/fa.js b/l10n/fa.js
index 33659f6c8..68b375721 100644
--- a/l10n/fa.js
+++ b/l10n/fa.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Tags" : "برچسب ها",
     "Maps" : "نقشه‌ها",
     "Settings" : "تنظیمات",
+    "Loading …" : "بارگذاری …",
     "Cancel" : "لغو",
     "Delete" : "حذف",
     "Download" : "بارگیری",
@@ -25,7 +26,6 @@ OC.L10N.register(
     "Time" : "زمان",
     "Name" : "نام",
     "Update" : "یه‌روزرسانی",
-    "Loading …" : "بارگذاری …",
     "Refresh" : "تازه‌سازی",
     "Share folder" : "اشتراک‌گذاری پوشه"
 },
diff --git a/l10n/fa.json b/l10n/fa.json
index 1001454c0..4870dbfbf 100644
--- a/l10n/fa.json
+++ b/l10n/fa.json
@@ -8,6 +8,7 @@
     "Tags" : "برچسب ها",
     "Maps" : "نقشه‌ها",
     "Settings" : "تنظیمات",
+    "Loading …" : "بارگذاری …",
     "Cancel" : "لغو",
     "Delete" : "حذف",
     "Download" : "بارگیری",
@@ -23,7 +24,6 @@
     "Time" : "زمان",
     "Name" : "نام",
     "Update" : "یه‌روزرسانی",
-    "Loading …" : "بارگذاری …",
     "Refresh" : "تازه‌سازی",
     "Share folder" : "اشتراک‌گذاری پوشه"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/l10n/fi.js b/l10n/fi.js
index 873fcf170..e2b5fc3e1 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Tags" : "Tunnisteet",
     "Maps" : "Kartat",
     "Settings" : "Asetukset",
+    "A better photos experience awaits you" : "Parempi kuvakokemus odottaa sinua",
     "Choose the root folder of your timeline to begin" : "Valitse aikajanan juurihakemisto aloittaaksesi",
     "If you just installed Memories, run:" : "Jos olet juuri asentanut Muistot, suorita:",
     "Continue to Memories" : "Jatka Muistoihin",
@@ -23,6 +24,7 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Valitse aikajanan juurihakemisto",
     "The selected folder does not seem to be valid. Try again." : "Valittu hakemisto ei ole kelvollinen. Yritä uudelleen.",
     "Found {total} photos in {path}" : "{total} kuvaa löytyi polusta {path}",
+    "Loading …" : "Ladataan…",
     "Cancel" : "Peruuta",
     "Delete" : "Poista",
     "Remove from album" : "Poista albumista",
@@ -75,6 +77,7 @@ OC.L10N.register(
     "Create album" : "Luo albumi",
     "Add selection to album {albumName}" : "Lisää valinta albumiin {albumName}",
     "Create a new album." : "Luo uusi albumi.",
+    "_Share with %n user_::_Share with %n users_" : ["Jaa %n käyttäjän kanssa","Jaa %n käyttäjän kanssa"],
     "_%n item_::_%n items_" : ["%n kohde","%n kohdetta"],
     "Share Album" : "Jaa albumi",
     "Year" : "Vuosi",
@@ -95,7 +98,6 @@ OC.L10N.register(
     "Rename person" : "Nimeä henkilö uudelleen",
     "Update" : "Päivitä",
     "Failed to rename {oldName} to {name}." : "Uudelleen nimeäminen nimestä {oldName} nimeen {name} epäonnistui.",
-    "Loading …" : "Ladataan…",
     "Too many failures, aborting" : "Liian monta epäonnistumista, lopetetaan",
     "Share Folder" : "Jaa kansio",
     "You cannot share the root folder" : "Et voi jakaa juurikansiota",
@@ -107,6 +109,12 @@ OC.L10N.register(
     "Share folder" : "Jaa kansio",
     "Move left" : "Siirry vasemmalle",
     "Move right" : "Siirry oikealle",
+    "Are you sure you want to continue?" : "Haluatko varmasti jatkaa?",
+    "Show original image" : "Näytä alkuperäinen kuva",
+    "Resize" : "Muuta kokoa",
+    "Image" : "Kuva",
+    "Position" : "Sijainti",
+    "Actual size (100%)" : "Todellinen koko (100 %)",
     "Shared Folder" : "Jaa kansio",
     "Failed to create {albumName}." : "Albumin {albumName} luominen epäonnistui.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Albumin {currentAlbumName} nimen muuttaminen muotoon {newAlbumName} epäonnistui.",
diff --git a/l10n/fi.json b/l10n/fi.json
index 9994d00d0..7f5be971f 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -12,6 +12,7 @@
     "Tags" : "Tunnisteet",
     "Maps" : "Kartat",
     "Settings" : "Asetukset",
+    "A better photos experience awaits you" : "Parempi kuvakokemus odottaa sinua",
     "Choose the root folder of your timeline to begin" : "Valitse aikajanan juurihakemisto aloittaaksesi",
     "If you just installed Memories, run:" : "Jos olet juuri asentanut Muistot, suorita:",
     "Continue to Memories" : "Jatka Muistoihin",
@@ -21,6 +22,7 @@
     "Choose the root of your timeline" : "Valitse aikajanan juurihakemisto",
     "The selected folder does not seem to be valid. Try again." : "Valittu hakemisto ei ole kelvollinen. Yritä uudelleen.",
     "Found {total} photos in {path}" : "{total} kuvaa löytyi polusta {path}",
+    "Loading …" : "Ladataan…",
     "Cancel" : "Peruuta",
     "Delete" : "Poista",
     "Remove from album" : "Poista albumista",
@@ -73,6 +75,7 @@
     "Create album" : "Luo albumi",
     "Add selection to album {albumName}" : "Lisää valinta albumiin {albumName}",
     "Create a new album." : "Luo uusi albumi.",
+    "_Share with %n user_::_Share with %n users_" : ["Jaa %n käyttäjän kanssa","Jaa %n käyttäjän kanssa"],
     "_%n item_::_%n items_" : ["%n kohde","%n kohdetta"],
     "Share Album" : "Jaa albumi",
     "Year" : "Vuosi",
@@ -93,7 +96,6 @@
     "Rename person" : "Nimeä henkilö uudelleen",
     "Update" : "Päivitä",
     "Failed to rename {oldName} to {name}." : "Uudelleen nimeäminen nimestä {oldName} nimeen {name} epäonnistui.",
-    "Loading …" : "Ladataan…",
     "Too many failures, aborting" : "Liian monta epäonnistumista, lopetetaan",
     "Share Folder" : "Jaa kansio",
     "You cannot share the root folder" : "Et voi jakaa juurikansiota",
@@ -105,6 +107,12 @@
     "Share folder" : "Jaa kansio",
     "Move left" : "Siirry vasemmalle",
     "Move right" : "Siirry oikealle",
+    "Are you sure you want to continue?" : "Haluatko varmasti jatkaa?",
+    "Show original image" : "Näytä alkuperäinen kuva",
+    "Resize" : "Muuta kokoa",
+    "Image" : "Kuva",
+    "Position" : "Sijainti",
+    "Actual size (100%)" : "Todellinen koko (100 %)",
     "Shared Folder" : "Jaa kansio",
     "Failed to create {albumName}." : "Albumin {albumName} luominen epäonnistui.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Albumin {currentAlbumName} nimen muuttaminen muotoon {newAlbumName} epäonnistui.",
diff --git a/l10n/fr.js b/l10n/fr.js
index 73d053504..f73f7b7cd 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
     "Settings" : "Paramètres",
+    "Loading …" : "Chargement …",
     "Cancel" : "Annuler",
     "Delete" : "Supprimer",
     "Download" : "Télécharger",
@@ -79,11 +80,22 @@ OC.L10N.register(
     "Rename person" : "Renommer la personne",
     "Update" : "Mise à jour",
     "Failed to rename {oldName} to {name}." : "Échec du renommage de {oldName} en {name}.",
-    "Loading …" : "Chargement …",
     "Refresh" : "Actualiser",
     "Delete album" : "Supprimer l'album",
     "Merge with different person" : "Fusionner avec une différente personne",
     "Share folder" : "Partager le dossier",
+    "Are you sure you want to continue?" : "Êtes-vous sûr de vouloir continuer ?",
+    "Show original image" : "Afficher l'image originale",
+    "Toggle zoom menu" : "Afficher/Masquer le menu de zoom",
+    "Resize" : "Redimensionner",
+    "is not an image" : "n'est pas une image",
+    "Ellipse" : "Ellipse",
+    "Image" : "Image",
+    "Rectangle" : "Rectangle",
+    "Corner Radius" : "Rayon d'angle",
+    "Position" : "Position",
+    "Saved image size (width x height)" : "Taille de l'image sauvegardée (largeur x hauteur)",
+    "Actual size (100%)" : "Taille actuelle (100%)",
     "Failed to create {albumName}." : "Échec de la création de {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Échec du renommage de {currentAlbumName} en {newAlbumName}.",
     "General Failure" : "Échec général",
diff --git a/l10n/fr.json b/l10n/fr.json
index ea27e6cd0..9a472ca86 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -12,6 +12,7 @@
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
     "Settings" : "Paramètres",
+    "Loading …" : "Chargement …",
     "Cancel" : "Annuler",
     "Delete" : "Supprimer",
     "Download" : "Télécharger",
@@ -77,11 +78,22 @@
     "Rename person" : "Renommer la personne",
     "Update" : "Mise à jour",
     "Failed to rename {oldName} to {name}." : "Échec du renommage de {oldName} en {name}.",
-    "Loading …" : "Chargement …",
     "Refresh" : "Actualiser",
     "Delete album" : "Supprimer l'album",
     "Merge with different person" : "Fusionner avec une différente personne",
     "Share folder" : "Partager le dossier",
+    "Are you sure you want to continue?" : "Êtes-vous sûr de vouloir continuer ?",
+    "Show original image" : "Afficher l'image originale",
+    "Toggle zoom menu" : "Afficher/Masquer le menu de zoom",
+    "Resize" : "Redimensionner",
+    "is not an image" : "n'est pas une image",
+    "Ellipse" : "Ellipse",
+    "Image" : "Image",
+    "Rectangle" : "Rectangle",
+    "Corner Radius" : "Rayon d'angle",
+    "Position" : "Position",
+    "Saved image size (width x height)" : "Taille de l'image sauvegardée (largeur x hauteur)",
+    "Actual size (100%)" : "Taille actuelle (100%)",
     "Failed to create {albumName}." : "Échec de la création de {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Échec du renommage de {currentAlbumName} en {newAlbumName}.",
     "General Failure" : "Échec général",
diff --git a/l10n/gd.js b/l10n/gd.js
index 0cf472514..94dc3adfe 100644
--- a/l10n/gd.js
+++ b/l10n/gd.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Videos" : "Videothan",
     "Tags" : "Tagaichean",
     "Settings" : "Roghainnean",
+    "Edit" : "Deasaich",
     "Cancel" : "Sguir dheth",
     "Delete" : "Sguab às",
     "Download" : "Luchdaich a-nuas",
diff --git a/l10n/gd.json b/l10n/gd.json
index 2bec054ef..36466d674 100644
--- a/l10n/gd.json
+++ b/l10n/gd.json
@@ -3,6 +3,7 @@
     "Videos" : "Videothan",
     "Tags" : "Tagaichean",
     "Settings" : "Roghainnean",
+    "Edit" : "Deasaich",
     "Cancel" : "Sguir dheth",
     "Delete" : "Sguab às",
     "Download" : "Luchdaich a-nuas",
diff --git a/l10n/gl.js b/l10n/gl.js
index db62cae2d..d752d3548 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -10,6 +10,8 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Axustes",
+    "Edit" : "Editar",
+    "Loading …" : "Cargando…",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Download" : "Descargar",
@@ -28,7 +30,8 @@ OC.L10N.register(
     "Minute" : "Minuto",
     "Name" : "Nome",
     "Update" : "Actualizar",
-    "Loading …" : "Cargando…",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Image" : "Imaxe",
+    "Position" : "Posicion"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/gl.json b/l10n/gl.json
index 7a9617d16..5a2697c0a 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -8,6 +8,8 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Axustes",
+    "Edit" : "Editar",
+    "Loading …" : "Cargando…",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Download" : "Descargar",
@@ -26,7 +28,8 @@
     "Minute" : "Minuto",
     "Name" : "Nome",
     "Update" : "Actualizar",
-    "Loading …" : "Cargando…",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Image" : "Imaxe",
+    "Position" : "Posicion"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/he.js b/l10n/he.js
index 3aff5e33c..b4120872f 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -9,6 +9,8 @@ OC.L10N.register(
     "Tags" : "תגיות",
     "Maps" : "מפות",
     "Settings" : "הגדרות",
+    "Edit" : "עריכה",
+    "Loading …" : "בטעינה…",
     "Cancel" : "ביטול",
     "Delete" : "מחיקה",
     "Download" : "הורדה",
@@ -27,7 +29,8 @@ OC.L10N.register(
     "Minute" : "דקה",
     "Name" : "שם",
     "Update" : "עדכון",
-    "Loading …" : "בטעינה…",
-    "Refresh" : "רענון"
+    "Refresh" : "רענון",
+    "Image" : "תמונה",
+    "Position" : "מיקום"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
diff --git a/l10n/he.json b/l10n/he.json
index 1a0c32fb0..3850c5fa3 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -7,6 +7,8 @@
     "Tags" : "תגיות",
     "Maps" : "מפות",
     "Settings" : "הגדרות",
+    "Edit" : "עריכה",
+    "Loading …" : "בטעינה…",
     "Cancel" : "ביטול",
     "Delete" : "מחיקה",
     "Download" : "הורדה",
@@ -25,7 +27,8 @@
     "Minute" : "דקה",
     "Name" : "שם",
     "Update" : "עדכון",
-    "Loading …" : "בטעינה…",
-    "Refresh" : "רענון"
+    "Refresh" : "רענון",
+    "Image" : "תמונה",
+    "Position" : "מיקום"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/hr.js b/l10n/hr.js
index fa5268118..1ba42e874 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -10,6 +10,8 @@ OC.L10N.register(
     "Tags" : "Oznake",
     "Maps" : "Karte",
     "Settings" : "Postavke",
+    "Edit" : "Uredi",
+    "Loading …" : "Učitavanje…",
     "Cancel" : "Odustani",
     "Delete" : "Izbriši",
     "Download" : "Preuzmi",
@@ -28,8 +30,9 @@ OC.L10N.register(
     "Minute" : "Minuta",
     "Name" : "Naziv",
     "Update" : "Ažuriraj",
-    "Loading …" : "Učitavanje…",
     "Refresh" : "Osvježi",
-    "Share folder" : "Dijeli mapu"
+    "Share folder" : "Dijeli mapu",
+    "Image" : "Slika",
+    "Position" : "Položaj"
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/l10n/hr.json b/l10n/hr.json
index feccf68ae..9d0098db3 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -8,6 +8,8 @@
     "Tags" : "Oznake",
     "Maps" : "Karte",
     "Settings" : "Postavke",
+    "Edit" : "Uredi",
+    "Loading …" : "Učitavanje…",
     "Cancel" : "Odustani",
     "Delete" : "Izbriši",
     "Download" : "Preuzmi",
@@ -26,8 +28,9 @@
     "Minute" : "Minuta",
     "Name" : "Naziv",
     "Update" : "Ažuriraj",
-    "Loading …" : "Učitavanje…",
     "Refresh" : "Osvježi",
-    "Share folder" : "Dijeli mapu"
+    "Share folder" : "Dijeli mapu",
+    "Image" : "Slika",
+    "Position" : "Položaj"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/hu.js b/l10n/hu.js
index 77a1c6eb1..ef375ed2c 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Tags" : "Címkék",
     "Maps" : "Térképek",
     "Settings" : "Beállítások",
+    "Edit" : "Szerkesztés",
+    "Loading …" : "Betöltés…",
     "Cancel" : "Mégse",
     "Delete" : "Törlés",
     "Download" : "Letöltés",
@@ -76,11 +78,24 @@ OC.L10N.register(
     "Name" : "Név",
     "Rename person" : "Személy átnevezése",
     "Update" : "Frissítés",
-    "Loading …" : "Betöltés…",
     "Refresh" : "Frissítés",
     "Delete album" : "Album törlése",
     "Merge with different person" : "Összevonás egy másik személlyel",
     "Share folder" : "Mappa megosztása",
+    "Are you sure you want to continue?" : "Biztos, hogy folytatja?",
+    "Show original image" : "Eredeti kép megjelenítése",
+    "Toggle zoom menu" : "Nagyítási menü be/ki",
+    "Resize" : "Átméretezés",
+    "is not an image" : "nem kép",
+    "Ellipse" : "Ellipszis",
+    "Hue" : "Fényerő",
+    "Image" : "Kép",
+    "Rectangle" : "Téglalap",
+    "Corner Radius" : "Saroklekerekítés sugara",
+    "Horizontal" : "Vízszintes",
+    "Position" : "Pozíció",
+    "Saved image size (width x height)" : "Mentett kép mérete (szélesség×magasság)",
+    "Actual size (100%)" : "Tényleges méret (100%)",
     "Failed to create {albumName}." : "A(z) {albumName} létrehozása sikertelen.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "A(z) {currentAlbumName} átnevezése a következőre sikertelen: {newAlbumName}.",
     "Failed to delete files." : "A fájlok törlése sikertelen.",
diff --git a/l10n/hu.json b/l10n/hu.json
index 135d3de49..6b0ef90f1 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -12,6 +12,8 @@
     "Tags" : "Címkék",
     "Maps" : "Térképek",
     "Settings" : "Beállítások",
+    "Edit" : "Szerkesztés",
+    "Loading …" : "Betöltés…",
     "Cancel" : "Mégse",
     "Delete" : "Törlés",
     "Download" : "Letöltés",
@@ -74,11 +76,24 @@
     "Name" : "Név",
     "Rename person" : "Személy átnevezése",
     "Update" : "Frissítés",
-    "Loading …" : "Betöltés…",
     "Refresh" : "Frissítés",
     "Delete album" : "Album törlése",
     "Merge with different person" : "Összevonás egy másik személlyel",
     "Share folder" : "Mappa megosztása",
+    "Are you sure you want to continue?" : "Biztos, hogy folytatja?",
+    "Show original image" : "Eredeti kép megjelenítése",
+    "Toggle zoom menu" : "Nagyítási menü be/ki",
+    "Resize" : "Átméretezés",
+    "is not an image" : "nem kép",
+    "Ellipse" : "Ellipszis",
+    "Hue" : "Fényerő",
+    "Image" : "Kép",
+    "Rectangle" : "Téglalap",
+    "Corner Radius" : "Saroklekerekítés sugara",
+    "Horizontal" : "Vízszintes",
+    "Position" : "Pozíció",
+    "Saved image size (width x height)" : "Mentett kép mérete (szélesség×magasság)",
+    "Actual size (100%)" : "Tényleges méret (100%)",
     "Failed to create {albumName}." : "A(z) {albumName} létrehozása sikertelen.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "A(z) {currentAlbumName} átnevezése a következőre sikertelen: {newAlbumName}.",
     "Failed to delete files." : "A fájlok törlése sikertelen.",
diff --git a/l10n/hy.js b/l10n/hy.js
index 27e841c74..f02352b3e 100644
--- a/l10n/hy.js
+++ b/l10n/hy.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Favorites" : "Սիրվածներ",
     "Settings" : "կարգավորումներ",
+    "Edit" : "մշակել",
     "Cancel" : "ընդհատել",
     "Delete" : "հեռացնել",
     "Download" : "Ներբեռնել",
diff --git a/l10n/hy.json b/l10n/hy.json
index 550a252df..6fe5bf64b 100644
--- a/l10n/hy.json
+++ b/l10n/hy.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Favorites" : "Սիրվածներ",
     "Settings" : "կարգավորումներ",
+    "Edit" : "մշակել",
     "Cancel" : "ընդհատել",
     "Delete" : "հեռացնել",
     "Download" : "Ներբեռնել",
diff --git a/l10n/ia.js b/l10n/ia.js
index 081864755..e87cc3f18 100644
--- a/l10n/ia.js
+++ b/l10n/ia.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Tags" : "Etiquettas",
     "Maps" : "Mappas",
     "Settings" : "Configurationes",
+    "Edit" : "Modificar",
     "Cancel" : "Cancellar",
     "Delete" : "Deler",
     "Download" : "Discargar",
diff --git a/l10n/ia.json b/l10n/ia.json
index 76d8e8986..9a15db2f7 100644
--- a/l10n/ia.json
+++ b/l10n/ia.json
@@ -3,6 +3,7 @@
     "Tags" : "Etiquettas",
     "Maps" : "Mappas",
     "Settings" : "Configurationes",
+    "Edit" : "Modificar",
     "Cancel" : "Cancellar",
     "Delete" : "Deler",
     "Download" : "Discargar",
diff --git a/l10n/id.js b/l10n/id.js
index adffde027..f0233b57e 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Tags" : "Tag",
     "Maps" : "Peta",
     "Settings" : "Setelan",
+    "Edit" : "Sunting",
     "Cancel" : "Membatalkan",
     "Delete" : "Hapus",
     "Download" : "Unduh",
diff --git a/l10n/id.json b/l10n/id.json
index 7ac0e5f3a..844701335 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -7,6 +7,7 @@
     "Tags" : "Tag",
     "Maps" : "Peta",
     "Settings" : "Setelan",
+    "Edit" : "Sunting",
     "Cancel" : "Membatalkan",
     "Delete" : "Hapus",
     "Download" : "Unduh",
diff --git a/l10n/is.js b/l10n/is.js
index a92a140c3..285237735 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Tags" : "Merki",
     "Maps" : "Landakort",
     "Settings" : "Stillingar",
+    "Edit" : "Breyta",
+    "Loading …" : "Hleð inn …",
     "Cancel" : "Hætta við",
     "Delete" : "Eyða",
     "Download" : "Sækja",
@@ -29,7 +31,8 @@ OC.L10N.register(
     "Minute" : "Mínúta",
     "Name" : "Heiti",
     "Update" : "Uppfæra",
-    "Loading …" : "Hleð inn …",
-    "Refresh" : "Endurnýja"
+    "Refresh" : "Endurnýja",
+    "Image" : "Mynd",
+    "Position" : "Staða"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/l10n/is.json b/l10n/is.json
index 1c65ca76c..5be889b05 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -9,6 +9,8 @@
     "Tags" : "Merki",
     "Maps" : "Landakort",
     "Settings" : "Stillingar",
+    "Edit" : "Breyta",
+    "Loading …" : "Hleð inn …",
     "Cancel" : "Hætta við",
     "Delete" : "Eyða",
     "Download" : "Sækja",
@@ -27,7 +29,8 @@
     "Minute" : "Mínúta",
     "Name" : "Heiti",
     "Update" : "Uppfæra",
-    "Loading …" : "Hleð inn …",
-    "Refresh" : "Endurnýja"
+    "Refresh" : "Endurnýja",
+    "Image" : "Mynd",
+    "Position" : "Staða"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/l10n/it.js b/l10n/it.js
index e7352036f..8e1559591 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Tags" : "Etichette",
     "Maps" : "Mappe",
     "Settings" : "Impostazioni",
+    "Edit" : "Modifica",
+    "Loading …" : "Caricamento …",
     "Cancel" : "Annulla",
     "Delete" : "Elimina",
     "Download" : "Scarica",
@@ -49,10 +51,11 @@ OC.L10N.register(
     "Name" : "Nome",
     "Rename person" : "Rinomina persona",
     "Update" : "Aggiorna",
-    "Loading …" : "Caricamento …",
     "Refresh" : "Aggiorna",
     "Delete album" : "Elimina album",
     "Merge with different person" : "Unisci ad un'altra persona",
-    "Share folder" : "Condividi cartella"
+    "Share folder" : "Condividi cartella",
+    "Image" : "Immagine",
+    "Position" : "Posizione"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/it.json b/l10n/it.json
index b3717be73..12528702a 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -10,6 +10,8 @@
     "Tags" : "Etichette",
     "Maps" : "Mappe",
     "Settings" : "Impostazioni",
+    "Edit" : "Modifica",
+    "Loading …" : "Caricamento …",
     "Cancel" : "Annulla",
     "Delete" : "Elimina",
     "Download" : "Scarica",
@@ -47,10 +49,11 @@
     "Name" : "Nome",
     "Rename person" : "Rinomina persona",
     "Update" : "Aggiorna",
-    "Loading …" : "Caricamento …",
     "Refresh" : "Aggiorna",
     "Delete album" : "Elimina album",
     "Merge with different person" : "Unisci ad un'altra persona",
-    "Share folder" : "Condividi cartella"
+    "Share folder" : "Condividi cartella",
+    "Image" : "Immagine",
+    "Position" : "Posizione"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/ja.js b/l10n/ja.js
index 34d0e75ce..f57299f18 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Tags" : "タグ",
     "Maps" : "地図",
     "Settings" : "設定",
+    "Edit" : "編集",
+    "Loading …" : "読み込み中…",
     "Cancel" : "キャンセル",
     "Delete" : "削除",
     "Download" : "ダウンロード",
@@ -36,8 +38,14 @@ OC.L10N.register(
     "Minute" : "分",
     "Name" : "名前",
     "Update" : "更新",
-    "Loading …" : "読み込み中…",
     "Refresh" : "更新",
-    "Share folder" : "フォルダーを共有"
+    "Share folder" : "フォルダーを共有",
+    "Are you sure you want to continue?" : "本当に続けてよろしいですか？",
+    "Show original image" : "オリジナル画像を表示する",
+    "Zoom out" : "縮小",
+    "Resize" : "リサイズ",
+    "is not an image" : "画像ではありません",
+    "Image" : "画像",
+    "Position" : "位置"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ja.json b/l10n/ja.json
index de442f6f3..e2b4923c3 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -9,6 +9,8 @@
     "Tags" : "タグ",
     "Maps" : "地図",
     "Settings" : "設定",
+    "Edit" : "編集",
+    "Loading …" : "読み込み中…",
     "Cancel" : "キャンセル",
     "Delete" : "削除",
     "Download" : "ダウンロード",
@@ -34,8 +36,14 @@
     "Minute" : "分",
     "Name" : "名前",
     "Update" : "更新",
-    "Loading …" : "読み込み中…",
     "Refresh" : "更新",
-    "Share folder" : "フォルダーを共有"
+    "Share folder" : "フォルダーを共有",
+    "Are you sure you want to continue?" : "本当に続けてよろしいですか？",
+    "Show original image" : "オリジナル画像を表示する",
+    "Zoom out" : "縮小",
+    "Resize" : "リサイズ",
+    "is not an image" : "画像ではありません",
+    "Image" : "画像",
+    "Position" : "位置"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js
index f8a5ba462..b4b1c01e1 100644
--- a/l10n/ka_GE.js
+++ b/l10n/ka_GE.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Tags" : "ტეგები",
     "Maps" : "რუკები",
     "Settings" : "პარამეტრები",
+    "Edit" : "შეცვლა",
     "Cancel" : "უარყოფა",
     "Delete" : "წაშლა",
     "Download" : "ჩამოტვირთვა",
@@ -22,6 +23,7 @@ OC.L10N.register(
     "Hour" : "საათი",
     "Name" : "სახელი",
     "Update" : "განახლება",
-    "Refresh" : "განახლება"
+    "Refresh" : "განახლება",
+    "Position" : "პოზიცია"
 },
 "nplurals=2; plural=(n!=1);");
diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json
index 261a10a20..1d49782a6 100644
--- a/l10n/ka_GE.json
+++ b/l10n/ka_GE.json
@@ -6,6 +6,7 @@
     "Tags" : "ტეგები",
     "Maps" : "რუკები",
     "Settings" : "პარამეტრები",
+    "Edit" : "შეცვლა",
     "Cancel" : "უარყოფა",
     "Delete" : "წაშლა",
     "Download" : "ჩამოტვირთვა",
@@ -20,6 +21,7 @@
     "Hour" : "საათი",
     "Name" : "სახელი",
     "Update" : "განახლება",
-    "Refresh" : "განახლება"
+    "Refresh" : "განახლება",
+    "Position" : "პოზიცია"
 },"pluralForm" :"nplurals=2; plural=(n!=1);"
 }
\ No newline at end of file
diff --git a/l10n/kab.js b/l10n/kab.js
index a20a95e89..4a51f7a29 100644
--- a/l10n/kab.js
+++ b/l10n/kab.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Videos" : "Tividyutin",
     "Tags" : "Tibzimin",
     "Settings" : "Iɣewwaṛen",
+    "Edit" : "Ẓreg",
     "Cancel" : "Sefsex",
     "Delete" : "Kkes",
     "Download" : "Sider",
diff --git a/l10n/kab.json b/l10n/kab.json
index 7f0662c1f..c064068a5 100644
--- a/l10n/kab.json
+++ b/l10n/kab.json
@@ -3,6 +3,7 @@
     "Videos" : "Tividyutin",
     "Tags" : "Tibzimin",
     "Settings" : "Iɣewwaṛen",
+    "Edit" : "Ẓreg",
     "Cancel" : "Sefsex",
     "Delete" : "Kkes",
     "Download" : "Sider",
diff --git a/l10n/km.js b/l10n/km.js
index 1862d36e8..64e5305ac 100644
--- a/l10n/km.js
+++ b/l10n/km.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Tags" : "ស្លាក",
     "Maps" : "ផែនទី",
     "Settings" : "ការកំណត់",
+    "Edit" : "កែប្រែ",
     "Cancel" : "បោះបង់",
     "Delete" : "លុប",
     "Download" : "ទាញយក",
diff --git a/l10n/km.json b/l10n/km.json
index 900c06359..97930a028 100644
--- a/l10n/km.json
+++ b/l10n/km.json
@@ -3,6 +3,7 @@
     "Tags" : "ស្លាក",
     "Maps" : "ផែនទី",
     "Settings" : "ការកំណត់",
+    "Edit" : "កែប្រែ",
     "Cancel" : "បោះបង់",
     "Delete" : "លុប",
     "Download" : "ទាញយក",
diff --git a/l10n/kn.js b/l10n/kn.js
deleted file mode 100644
index acd90b951..000000000
--- a/l10n/kn.js
+++ /dev/null
@@ -1,15 +0,0 @@
-OC.L10N.register(
-    "memories",
-    {
-    "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
-    "Maps" : "ನಕಾಶೆ",
-    "Settings" : "ಆಯ್ಕೆ",
-    "Cancel" : "ರದ್ದು",
-    "Delete" : "ಅಳಿಸಿ",
-    "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
-    "Favorite" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
-    "Save" : "ಉಳಿಸಿ",
-    "Time" : "ಸಮಯ",
-    "Name" : "ಹೆಸರು"
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/l10n/kn.json b/l10n/kn.json
deleted file mode 100644
index 20f8cad7e..000000000
--- a/l10n/kn.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{ "translations": {
-    "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
-    "Maps" : "ನಕಾಶೆ",
-    "Settings" : "ಆಯ್ಕೆ",
-    "Cancel" : "ರದ್ದು",
-    "Delete" : "ಅಳಿಸಿ",
-    "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
-    "Favorite" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
-    "Save" : "ಉಳಿಸಿ",
-    "Time" : "ಸಮಯ",
-    "Name" : "ಹೆಸರು"
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/l10n/ko.js b/l10n/ko.js
index 2ff4e1f21..eee75c382 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -9,6 +9,8 @@ OC.L10N.register(
     "Tags" : "태그",
     "Maps" : "지도",
     "Settings" : "설정",
+    "Edit" : "편집",
+    "Loading …" : "불러오는 중 …",
     "Cancel" : "취소",
     "Delete" : "삭제",
     "Download" : "다운로드",
@@ -26,7 +28,7 @@ OC.L10N.register(
     "Hour" : "시간",
     "Name" : "이름",
     "Update" : "업데이트",
-    "Loading …" : "불러오는 중 …",
-    "Refresh" : "새로 고침"
+    "Refresh" : "새로 고침",
+    "Position" : "위치"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ko.json b/l10n/ko.json
index 59cd980c0..151677c8c 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -7,6 +7,8 @@
     "Tags" : "태그",
     "Maps" : "지도",
     "Settings" : "설정",
+    "Edit" : "편집",
+    "Loading …" : "불러오는 중 …",
     "Cancel" : "취소",
     "Delete" : "삭제",
     "Download" : "다운로드",
@@ -24,7 +26,7 @@
     "Hour" : "시간",
     "Name" : "이름",
     "Update" : "업데이트",
-    "Loading …" : "불러오는 중 …",
-    "Refresh" : "새로 고침"
+    "Refresh" : "새로 고침",
+    "Position" : "위치"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/lb.js b/l10n/lb.js
index 3cb030efd..83b0c0d6f 100644
--- a/l10n/lb.js
+++ b/l10n/lb.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Tags" : "Tags",
     "Maps" : "Kaarten",
     "Settings" : "Astellungen",
+    "Edit" : "Änneren",
     "Cancel" : "Ofbriechen",
     "Delete" : "Läschen",
     "Download" : "Eroflueden",
diff --git a/l10n/lb.json b/l10n/lb.json
index 5e4d0139a..1e2dc4751 100644
--- a/l10n/lb.json
+++ b/l10n/lb.json
@@ -3,6 +3,7 @@
     "Tags" : "Tags",
     "Maps" : "Kaarten",
     "Settings" : "Astellungen",
+    "Edit" : "Änneren",
     "Cancel" : "Ofbriechen",
     "Delete" : "Läschen",
     "Download" : "Eroflueden",
diff --git a/l10n/lo.js b/l10n/lo.js
index bbd8c0c9e..69b0ba35a 100644
--- a/l10n/lo.js
+++ b/l10n/lo.js
@@ -5,6 +5,8 @@ OC.L10N.register(
     "Videos" : "ວິດີໂອ",
     "Tags" : "ປ້າຍກຳກັບ",
     "Settings" : "ການຕັ້ງຄ່າ",
+    "Edit" : "ແກ້ໄຂ",
+    "Loading …" : "ກຳລັງໂຫຼດ",
     "Cancel" : "ຍົກເລີກ",
     "Delete" : "ລຶບ",
     "Download" : "ດາວໂຫລດ",
@@ -13,7 +15,6 @@ OC.L10N.register(
     "Back" : "ຫຼັງ",
     "Save" : "ບັນທຶກ",
     "Name" : "ຊື່",
-    "Loading …" : "ກຳລັງໂຫຼດ",
     "Refresh" : "Refresh"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/lo.json b/l10n/lo.json
index ee4820220..3fe1c8c01 100644
--- a/l10n/lo.json
+++ b/l10n/lo.json
@@ -3,6 +3,8 @@
     "Videos" : "ວິດີໂອ",
     "Tags" : "ປ້າຍກຳກັບ",
     "Settings" : "ການຕັ້ງຄ່າ",
+    "Edit" : "ແກ້ໄຂ",
+    "Loading …" : "ກຳລັງໂຫຼດ",
     "Cancel" : "ຍົກເລີກ",
     "Delete" : "ລຶບ",
     "Download" : "ດາວໂຫລດ",
@@ -11,7 +13,6 @@
     "Back" : "ຫຼັງ",
     "Save" : "ບັນທຶກ",
     "Name" : "ຊື່",
-    "Loading …" : "ກຳລັງໂຫຼດ",
     "Refresh" : "Refresh"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index bb2e1d660..48578144d 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -15,6 +15,8 @@ OC.L10N.register(
     "Maps" : "Žemėlapiai",
     "Settings" : "Nustatymai",
     "Click here to start" : "Spustelėkite čia, norėdami pradėti",
+    "Edit" : "Taisyti",
+    "Loading …" : "Įkeliama…",
     "Cancel" : "Atsisakyti",
     "Delete" : "Ištrinti",
     "Remove from album" : "Šalinti iš albumo",
@@ -77,7 +79,6 @@ OC.L10N.register(
     "Rename person" : "Pervadinti žmogų",
     "Update" : "Atnaujinti",
     "Failed to rename {oldName} to {name}." : "Nepavyko pervadinti {oldName} į {name}.",
-    "Loading …" : "Įkeliama…",
     "Are you sure you want to merge {name} with {newName}?" : "Ar tikrai norite sulieti {name} su {newName}?",
     "Too many failures, aborting" : "Per daug nesėkmių, nutraukiama",
     "Error while moving {basename}" : "Klaida perkeliant {basename}",
@@ -89,6 +90,11 @@ OC.L10N.register(
     "Share folder" : "Bendrinti aplanką",
     "Move left" : "Perkelti kairėn",
     "Move right" : "Perkelti dešinėn",
+    "Are you sure you want to continue?" : "Ar tikrai norite tęsti?",
+    "Undo" : "Atšaukti",
+    "Resize" : "Keisti dydį",
+    "Image" : "Paveikslas",
+    "Position" : "Vieta",
     "Failed to create {albumName}." : "Nepavyko sukurti {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepavyko pervadinti {currentAlbumName} į {newAlbumName}.",
     "General Failure" : "Bendrinė nesėkmė",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index 80f1ba209..a71e3ca55 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -13,6 +13,8 @@
     "Maps" : "Žemėlapiai",
     "Settings" : "Nustatymai",
     "Click here to start" : "Spustelėkite čia, norėdami pradėti",
+    "Edit" : "Taisyti",
+    "Loading …" : "Įkeliama…",
     "Cancel" : "Atsisakyti",
     "Delete" : "Ištrinti",
     "Remove from album" : "Šalinti iš albumo",
@@ -75,7 +77,6 @@
     "Rename person" : "Pervadinti žmogų",
     "Update" : "Atnaujinti",
     "Failed to rename {oldName} to {name}." : "Nepavyko pervadinti {oldName} į {name}.",
-    "Loading …" : "Įkeliama…",
     "Are you sure you want to merge {name} with {newName}?" : "Ar tikrai norite sulieti {name} su {newName}?",
     "Too many failures, aborting" : "Per daug nesėkmių, nutraukiama",
     "Error while moving {basename}" : "Klaida perkeliant {basename}",
@@ -87,6 +88,11 @@
     "Share folder" : "Bendrinti aplanką",
     "Move left" : "Perkelti kairėn",
     "Move right" : "Perkelti dešinėn",
+    "Are you sure you want to continue?" : "Ar tikrai norite tęsti?",
+    "Undo" : "Atšaukti",
+    "Resize" : "Keisti dydį",
+    "Image" : "Paveikslas",
+    "Position" : "Vieta",
     "Failed to create {albumName}." : "Nepavyko sukurti {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepavyko pervadinti {currentAlbumName} į {newAlbumName}.",
     "General Failure" : "Bendrinė nesėkmė",
diff --git a/l10n/lv.js b/l10n/lv.js
index ad7818f2d..a7f2c2d51 100644
--- a/l10n/lv.js
+++ b/l10n/lv.js
@@ -8,19 +8,24 @@ OC.L10N.register(
     "Tags" : "Birkas",
     "Maps" : "Karte",
     "Settings" : "Iestatījumi",
+    "Edit" : "Rediģēt",
     "Cancel" : "Atcelt",
     "Delete" : "Dzēst",
     "Download" : "Lejupielādēt",
     "Favorite" : "Favorīts",
     "View in folder" : "Skatīt mapē",
+    "Sidebar" : "Sānjosla",
     "Back" : "Atpakaļ",
     "Save" : "Saglabāt",
+    "Create album" : "Izveidot albumu",
     "Month" : "Mēnesis",
     "Day" : "Diena",
     "Time" : "Laiks",
     "Hour" : "Stunda",
     "Name" : "Vārds",
     "Update" : "Atjaunināt",
-    "Refresh" : "Atsvaidzināt"
+    "Refresh" : "Atsvaidzināt",
+    "Undo" : "Atsaukt",
+    "Image" : "Attēli"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/l10n/lv.json b/l10n/lv.json
index e9036afad..3b874bf80 100644
--- a/l10n/lv.json
+++ b/l10n/lv.json
@@ -6,19 +6,24 @@
     "Tags" : "Birkas",
     "Maps" : "Karte",
     "Settings" : "Iestatījumi",
+    "Edit" : "Rediģēt",
     "Cancel" : "Atcelt",
     "Delete" : "Dzēst",
     "Download" : "Lejupielādēt",
     "Favorite" : "Favorīts",
     "View in folder" : "Skatīt mapē",
+    "Sidebar" : "Sānjosla",
     "Back" : "Atpakaļ",
     "Save" : "Saglabāt",
+    "Create album" : "Izveidot albumu",
     "Month" : "Mēnesis",
     "Day" : "Diena",
     "Time" : "Laiks",
     "Hour" : "Stunda",
     "Name" : "Vārds",
     "Update" : "Atjaunināt",
-    "Refresh" : "Atsvaidzināt"
+    "Refresh" : "Atsvaidzināt",
+    "Undo" : "Atsaukt",
+    "Image" : "Attēli"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/mk.js b/l10n/mk.js
index fac85f206..7a8d11112 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Tags" : "Ознаки",
     "Maps" : "Мапи",
     "Settings" : "Параметри",
+    "Edit" : "Уреди",
+    "Loading …" : "Се вчитува…",
     "Cancel" : "Откажи",
     "Delete" : "Избриши",
     "Download" : "Преземи",
@@ -40,11 +42,21 @@ OC.L10N.register(
     "Name" : "Име",
     "Rename person" : "Преименувај личност",
     "Update" : "Ажурирај",
-    "Loading …" : "Се вчитува…",
     "Refresh" : "Освежи",
     "Delete album" : "Избриши албум",
     "Merge with different person" : "Спој со друга личност",
     "Share folder" : "Сподели папка",
+    "Are you sure you want to continue?" : "Дали си сигурен дека сакаш да продолжиш?",
+    "Undo" : "Назад",
+    "Show original image" : "Прикажи ја оргиналната слика",
+    "Zoom out" : "Од зумирај",
+    "Toggle zoom menu" : "Прикажи мени за зумирање",
+    "Resize" : "Промени големина",
+    "is not an image" : "не е слика",
+    "Ellipse" : "Елипса",
+    "Image" : "Слика",
+    "Position" : "Позиција",
+    "Actual size (100%)" : "Актуелна големина (100%)",
     "Failed to create {albumName}." : "Неуспешно креирање {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименување на {currentAlbumName} во {newAlbumName}.",
     "Failed to favorite {fileName}." : "Неуспешно додавање во омилени {fileName}."
diff --git a/l10n/mk.json b/l10n/mk.json
index b48c182db..f364ea194 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -10,6 +10,8 @@
     "Tags" : "Ознаки",
     "Maps" : "Мапи",
     "Settings" : "Параметри",
+    "Edit" : "Уреди",
+    "Loading …" : "Се вчитува…",
     "Cancel" : "Откажи",
     "Delete" : "Избриши",
     "Download" : "Преземи",
@@ -38,11 +40,21 @@
     "Name" : "Име",
     "Rename person" : "Преименувај личност",
     "Update" : "Ажурирај",
-    "Loading …" : "Се вчитува…",
     "Refresh" : "Освежи",
     "Delete album" : "Избриши албум",
     "Merge with different person" : "Спој со друга личност",
     "Share folder" : "Сподели папка",
+    "Are you sure you want to continue?" : "Дали си сигурен дека сакаш да продолжиш?",
+    "Undo" : "Назад",
+    "Show original image" : "Прикажи ја оргиналната слика",
+    "Zoom out" : "Од зумирај",
+    "Toggle zoom menu" : "Прикажи мени за зумирање",
+    "Resize" : "Промени големина",
+    "is not an image" : "не е слика",
+    "Ellipse" : "Елипса",
+    "Image" : "Слика",
+    "Position" : "Позиција",
+    "Actual size (100%)" : "Актуелна големина (100%)",
     "Failed to create {albumName}." : "Неуспешно креирање {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименување на {currentAlbumName} во {newAlbumName}.",
     "Failed to favorite {fileName}." : "Неуспешно додавање во омилени {fileName}."
diff --git a/l10n/mn.js b/l10n/mn.js
index 7e370493c..d134579d8 100644
--- a/l10n/mn.js
+++ b/l10n/mn.js
@@ -8,6 +8,8 @@ OC.L10N.register(
     "Tags" : "Tag-үүд",
     "Maps" : "Газрын зураг",
     "Settings" : "Тохиргоо",
+    "Edit" : "засварлах",
+    "Loading …" : "Уншиж байна...",
     "Cancel" : "болиулах",
     "Delete" : "Устгах",
     "Download" : "Татах",
@@ -21,7 +23,8 @@ OC.L10N.register(
     "Time" : "Цаг",
     "Name" : "Нэр",
     "Update" : "Шинэчлэх",
-    "Loading …" : "Уншиж байна...",
-    "Refresh" : "Сэргээх"
+    "Refresh" : "Сэргээх",
+    "Undo" : "буцах",
+    "Position" : "Байр"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/mn.json b/l10n/mn.json
index 64af25f9a..2ffc8ffd9 100644
--- a/l10n/mn.json
+++ b/l10n/mn.json
@@ -6,6 +6,8 @@
     "Tags" : "Tag-үүд",
     "Maps" : "Газрын зураг",
     "Settings" : "Тохиргоо",
+    "Edit" : "засварлах",
+    "Loading …" : "Уншиж байна...",
     "Cancel" : "болиулах",
     "Delete" : "Устгах",
     "Download" : "Татах",
@@ -19,7 +21,8 @@
     "Time" : "Цаг",
     "Name" : "Нэр",
     "Update" : "Шинэчлэх",
-    "Loading …" : "Уншиж байна...",
-    "Refresh" : "Сэргээх"
+    "Refresh" : "Сэргээх",
+    "Undo" : "буцах",
+    "Position" : "Байр"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ms_MY.js b/l10n/ms_MY.js
index 0c0e967d7..6e021516c 100644
--- a/l10n/ms_MY.js
+++ b/l10n/ms_MY.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Favorites" : "Favorites",
     "Settings" : "Tetapan",
+    "Edit" : "Sunting",
     "Cancel" : "Batal",
     "Delete" : "Padam",
     "Download" : "Muat turun",
diff --git a/l10n/ms_MY.json b/l10n/ms_MY.json
index a606c783a..e5dfbe6c3 100644
--- a/l10n/ms_MY.json
+++ b/l10n/ms_MY.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Favorites" : "Favorites",
     "Settings" : "Tetapan",
+    "Edit" : "Sunting",
     "Cancel" : "Batal",
     "Delete" : "Padam",
     "Download" : "Muat turun",
diff --git a/l10n/nb.js b/l10n/nb.js
index 766c108ff..3776a5096 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Tags" : "Merkelapper",
     "Maps" : "Kart",
     "Settings" : "Innstillinger",
+    "Edit" : "Rediger",
+    "Loading …" : "Laster ...",
     "Cancel" : "Avbryt",
     "Delete" : "Slett",
     "Download" : "Last ned",
@@ -28,8 +30,17 @@ OC.L10N.register(
     "Hour" : "Time",
     "Name" : "Navn",
     "Update" : "Oppdater",
-    "Loading …" : "Laster ...",
     "Refresh" : "Oppdater",
-    "Share folder" : "Del mappe"
+    "Share folder" : "Del mappe",
+    "Are you sure you want to continue?" : "Er du sikker på at du vil fortsette?",
+    "Undo" : "Angre",
+    "Show original image" : "Vis originalbilde",
+    "Zoom out" : "Zoom ut",
+    "Resize" : "Endre størrelse",
+    "Image" : "Bilde",
+    "Choose watermark type" : "Velg vannmerke-type",
+    "Horizontal" : "Horisontal",
+    "Position" : "Posisjon",
+    "Name is required." : "Navn er påkrevd."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/nb.json b/l10n/nb.json
index 93dc45c49..f063ca8ea 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -9,6 +9,8 @@
     "Tags" : "Merkelapper",
     "Maps" : "Kart",
     "Settings" : "Innstillinger",
+    "Edit" : "Rediger",
+    "Loading …" : "Laster ...",
     "Cancel" : "Avbryt",
     "Delete" : "Slett",
     "Download" : "Last ned",
@@ -26,8 +28,17 @@
     "Hour" : "Time",
     "Name" : "Navn",
     "Update" : "Oppdater",
-    "Loading …" : "Laster ...",
     "Refresh" : "Oppdater",
-    "Share folder" : "Del mappe"
+    "Share folder" : "Del mappe",
+    "Are you sure you want to continue?" : "Er du sikker på at du vil fortsette?",
+    "Undo" : "Angre",
+    "Show original image" : "Vis originalbilde",
+    "Zoom out" : "Zoom ut",
+    "Resize" : "Endre størrelse",
+    "Image" : "Bilde",
+    "Choose watermark type" : "Velg vannmerke-type",
+    "Horizontal" : "Horisontal",
+    "Position" : "Posisjon",
+    "Name is required." : "Navn er påkrevd."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/nl.js b/l10n/nl.js
index 1117989cb..3d999adb3 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Tags" : "Tags",
     "Maps" : "Kaarten",
     "Settings" : "Instellingen",
+    "Edit" : "Bewerk",
+    "Loading …" : "Laden …",
     "Cancel" : "Annuleren",
     "Delete" : "Verwijder",
     "Download" : "Download",
@@ -30,8 +32,11 @@ OC.L10N.register(
     "Minute" : "Minuut",
     "Name" : "Naam",
     "Update" : "Update",
-    "Loading …" : "Laden …",
     "Refresh" : "Verversen",
-    "Share folder" : "Map delen"
+    "Share folder" : "Map delen",
+    "Undo" : "Ongedaan maken",
+    "Image" : "Afbeelding",
+    "Position" : "Positie",
+    "Name is required." : "Naam is verplicht."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/nl.json b/l10n/nl.json
index c04dc08a7..fefe81a8e 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -10,6 +10,8 @@
     "Tags" : "Tags",
     "Maps" : "Kaarten",
     "Settings" : "Instellingen",
+    "Edit" : "Bewerk",
+    "Loading …" : "Laden …",
     "Cancel" : "Annuleren",
     "Delete" : "Verwijder",
     "Download" : "Download",
@@ -28,8 +30,11 @@
     "Minute" : "Minuut",
     "Name" : "Naam",
     "Update" : "Update",
-    "Loading …" : "Laden …",
     "Refresh" : "Verversen",
-    "Share folder" : "Map delen"
+    "Share folder" : "Map delen",
+    "Undo" : "Ongedaan maken",
+    "Image" : "Afbeelding",
+    "Position" : "Positie",
+    "Name is required." : "Naam is verplicht."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/nn_NO.js b/l10n/nn_NO.js
index 4296e3d11..f36e7f14d 100644
--- a/l10n/nn_NO.js
+++ b/l10n/nn_NO.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Videos" : "Video",
     "Tags" : "Emneord",
     "Settings" : "Innstillingar",
+    "Edit" : "Rediger",
     "Cancel" : "Avbryt",
     "Delete" : "Slett",
     "Download" : "Last ned",
diff --git a/l10n/nn_NO.json b/l10n/nn_NO.json
index 4b150e5e0..9b8cb81bf 100644
--- a/l10n/nn_NO.json
+++ b/l10n/nn_NO.json
@@ -3,6 +3,7 @@
     "Videos" : "Video",
     "Tags" : "Emneord",
     "Settings" : "Innstillingar",
+    "Edit" : "Rediger",
     "Cancel" : "Avbryt",
     "Delete" : "Slett",
     "Download" : "Last ned",
diff --git a/l10n/oc.js b/l10n/oc.js
index 07e4974d1..dcaa020ee 100644
--- a/l10n/oc.js
+++ b/l10n/oc.js
@@ -9,6 +9,8 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Paramètres",
+    "Edit" : "Modificar",
+    "Loading …" : "Cargament…",
     "Cancel" : "Anullar",
     "Delete" : "Suprimir",
     "Download" : "Telecargar",
@@ -25,7 +27,8 @@ OC.L10N.register(
     "Minute" : "Minuta",
     "Name" : "Nom",
     "Update" : "Actualizar",
-    "Loading …" : "Cargament…",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Undo" : "Desfar",
+    "Position" : "Posicion"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/oc.json b/l10n/oc.json
index 326d61389..41313f106 100644
--- a/l10n/oc.json
+++ b/l10n/oc.json
@@ -7,6 +7,8 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Paramètres",
+    "Edit" : "Modificar",
+    "Loading …" : "Cargament…",
     "Cancel" : "Anullar",
     "Delete" : "Suprimir",
     "Download" : "Telecargar",
@@ -23,7 +25,8 @@
     "Minute" : "Minuta",
     "Name" : "Nom",
     "Update" : "Actualizar",
-    "Loading …" : "Cargament…",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Undo" : "Desfar",
+    "Position" : "Posicion"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/pl.js b/l10n/pl.js
index 1d9831f48..80c9c2168 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Tags" : "Etykiety",
     "Maps" : "Mapy",
     "Settings" : "Ustawienia",
+    "Edit" : "Edytuj",
+    "Loading …" : "Wczytywanie…",
     "Cancel" : "Anuluj",
     "Delete" : "Usuń",
     "Download" : "Pobierz",
@@ -75,11 +77,29 @@ OC.L10N.register(
     "Name" : "Nazwa",
     "Rename person" : "Zmień nazwę osoby",
     "Update" : "Aktualizuj",
-    "Loading …" : "Wczytywanie…",
     "Refresh" : "Odśwież",
     "Delete album" : "Usuń album",
     "Merge with different person" : "Połącz z inną osobą",
     "Share folder" : "Udostępnij katalog",
+    "Are you sure you want to continue?" : "Jesteś pewien, że chcesz kontynuować?",
+    "Undo" : "Cofnij",
+    "Show original image" : "Pokaż oryginalny obraz",
+    "Zoom out" : "Pomniejsz",
+    "Toggle zoom menu" : "Przełącz menu powiększania",
+    "Resize" : "Zmień rozmiar",
+    "is not an image" : "nie jest obrazem",
+    "Ellipse" : "Elipsa",
+    "Hue" : "Odcień",
+    "Image" : "Obraz",
+    "Rectangle" : "Prostokąt",
+    "Corner Radius" : "Promień narożnika",
+    "Reset to original image size" : "Przywróć oryginalny rozmiar obrazu",
+    "Choose watermark type" : "Wybierz typ znaku wodnego",
+    "Horizontal" : "Poziomo",
+    "Position" : "Stanowisko",
+    "Name is required." : "Nazwa jest wymagana.",
+    "Saved image size (width x height)" : "Rozmiar zapisanego obrazu (szerokość x wysokość)",
+    "Actual size (100%)" : "Rzeczywisty rozmiar (100%)",
     "Failed to create {albumName}." : "Nie udało się utworzyć {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nie udało się zmienić nazwy {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Ogólna awaria",
diff --git a/l10n/pl.json b/l10n/pl.json
index 3ac18eaa2..f26118b08 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -12,6 +12,8 @@
     "Tags" : "Etykiety",
     "Maps" : "Mapy",
     "Settings" : "Ustawienia",
+    "Edit" : "Edytuj",
+    "Loading …" : "Wczytywanie…",
     "Cancel" : "Anuluj",
     "Delete" : "Usuń",
     "Download" : "Pobierz",
@@ -73,11 +75,29 @@
     "Name" : "Nazwa",
     "Rename person" : "Zmień nazwę osoby",
     "Update" : "Aktualizuj",
-    "Loading …" : "Wczytywanie…",
     "Refresh" : "Odśwież",
     "Delete album" : "Usuń album",
     "Merge with different person" : "Połącz z inną osobą",
     "Share folder" : "Udostępnij katalog",
+    "Are you sure you want to continue?" : "Jesteś pewien, że chcesz kontynuować?",
+    "Undo" : "Cofnij",
+    "Show original image" : "Pokaż oryginalny obraz",
+    "Zoom out" : "Pomniejsz",
+    "Toggle zoom menu" : "Przełącz menu powiększania",
+    "Resize" : "Zmień rozmiar",
+    "is not an image" : "nie jest obrazem",
+    "Ellipse" : "Elipsa",
+    "Hue" : "Odcień",
+    "Image" : "Obraz",
+    "Rectangle" : "Prostokąt",
+    "Corner Radius" : "Promień narożnika",
+    "Reset to original image size" : "Przywróć oryginalny rozmiar obrazu",
+    "Choose watermark type" : "Wybierz typ znaku wodnego",
+    "Horizontal" : "Poziomo",
+    "Position" : "Stanowisko",
+    "Name is required." : "Nazwa jest wymagana.",
+    "Saved image size (width x height)" : "Rozmiar zapisanego obrazu (szerokość x wysokość)",
+    "Actual size (100%)" : "Rzeczywisty rozmiar (100%)",
     "Failed to create {albumName}." : "Nie udało się utworzyć {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nie udało się zmienić nazwy {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Ogólna awaria",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 9b0a69522..d737359b8 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -24,6 +24,8 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Escolha a raiz da sua linha do tempo",
     "The selected folder does not seem to be valid. Try again." : "A pasta selecionada não parece ser válida. Tente novamente.",
     "Found {total} photos in {path}" : "Encontrou {total} fotos em {path}",
+    "Edit" : "Editar",
+    "Loading …" : "Carregando …",
     "Cancel" : "Cancelar",
     "Delete" : "Excluir",
     "Remove from album" : "Remover do album",
@@ -96,7 +98,6 @@ OC.L10N.register(
     "Rename person" : "Renomear pessoa",
     "Update" : "Atualizar",
     "Failed to rename {oldName} to {name}." : "Falha ao renomear {oldName} para {name}.",
-    "Loading …" : "Carregando …",
     "Merge {name} with person" : "Unir {name} com pessoa",
     "Are you sure you want to merge {name} with {newName}?" : "Tem certeza que deseja unir {name} com {newName}?",
     "Too many failures, aborting" : "Abortando, falhas demais",
@@ -111,6 +112,25 @@ OC.L10N.register(
     "Share folder" : "Compartilhar pasta",
     "Move left" : "Mover para a esquerda",
     "Move right" : "Mover para a direita",
+    "Are you sure you want to continue?" : "Tem certeza que deseja continuar?",
+    "Undo" : "Desfazer",
+    "Show original image" : "Mostrar imagem original",
+    "Zoom out" : "Diminuir zoom",
+    "Toggle zoom menu" : "Habilitar menu de zoom",
+    "Resize" : "Redimensionar",
+    "is not an image" : "não é uma imagem",
+    "Ellipse" : "Elipse",
+    "Hue" : "Cor",
+    "Image" : "Imagem",
+    "Rectangle" : "Retângulo",
+    "Corner Radius" : "Raio do canto",
+    "Reset to original image size" : "Voltar ao tamanho original",
+    "Choose watermark type" : "Escolha o tipo de marca d'água",
+    "Horizontal" : "Horizontal",
+    "Position" : "Posição",
+    "Name is required." : "O nome é obrigatório.",
+    "Saved image size (width x height)" : "Imagem salva (largura x altura)",
+    "Actual size (100%)" : "Tamanho real (100%)",
     "Failed to create {albumName}." : "Falha ao criar {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Falha ao renomear {currentAlbumName} para {newAlbumName}.",
     "General Failure" : "Falha Geral",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 7f6789b8c..ade21a1c4 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -22,6 +22,8 @@
     "Choose the root of your timeline" : "Escolha a raiz da sua linha do tempo",
     "The selected folder does not seem to be valid. Try again." : "A pasta selecionada não parece ser válida. Tente novamente.",
     "Found {total} photos in {path}" : "Encontrou {total} fotos em {path}",
+    "Edit" : "Editar",
+    "Loading …" : "Carregando …",
     "Cancel" : "Cancelar",
     "Delete" : "Excluir",
     "Remove from album" : "Remover do album",
@@ -94,7 +96,6 @@
     "Rename person" : "Renomear pessoa",
     "Update" : "Atualizar",
     "Failed to rename {oldName} to {name}." : "Falha ao renomear {oldName} para {name}.",
-    "Loading …" : "Carregando …",
     "Merge {name} with person" : "Unir {name} com pessoa",
     "Are you sure you want to merge {name} with {newName}?" : "Tem certeza que deseja unir {name} com {newName}?",
     "Too many failures, aborting" : "Abortando, falhas demais",
@@ -109,6 +110,25 @@
     "Share folder" : "Compartilhar pasta",
     "Move left" : "Mover para a esquerda",
     "Move right" : "Mover para a direita",
+    "Are you sure you want to continue?" : "Tem certeza que deseja continuar?",
+    "Undo" : "Desfazer",
+    "Show original image" : "Mostrar imagem original",
+    "Zoom out" : "Diminuir zoom",
+    "Toggle zoom menu" : "Habilitar menu de zoom",
+    "Resize" : "Redimensionar",
+    "is not an image" : "não é uma imagem",
+    "Ellipse" : "Elipse",
+    "Hue" : "Cor",
+    "Image" : "Imagem",
+    "Rectangle" : "Retângulo",
+    "Corner Radius" : "Raio do canto",
+    "Reset to original image size" : "Voltar ao tamanho original",
+    "Choose watermark type" : "Escolha o tipo de marca d'água",
+    "Horizontal" : "Horizontal",
+    "Position" : "Posição",
+    "Name is required." : "O nome é obrigatório.",
+    "Saved image size (width x height)" : "Imagem salva (largura x altura)",
+    "Actual size (100%)" : "Tamanho real (100%)",
     "Failed to create {albumName}." : "Falha ao criar {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Falha ao renomear {currentAlbumName} para {newAlbumName}.",
     "General Failure" : "Falha Geral",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index de6f85a4e..0c36d6ef1 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Definições",
+    "Edit" : "Editar",
+    "Loading …" : "A carregar...",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Download" : "Transferir",
@@ -31,9 +33,11 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nome",
     "Update" : "Atualizar",
-    "Loading …" : "A carregar...",
     "Refresh" : "Atualizar",
     "Share folder" : "Partilhar pasta",
+    "Undo" : "Desfazer",
+    "Image" : "Imagem",
+    "Name is required." : "Nome é obrigatório.",
     "Failed to delete files." : "Não foi possível eliminar os ficheiros.",
     "Failed to delete {fileName}." : "Não foi possível eliminar {fileName}.",
     "Failed to favorite files." : "Não foi possível colocar os ficheiros nos favoritos.",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index c1906ff1c..6fbbf7162 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -9,6 +9,8 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Definições",
+    "Edit" : "Editar",
+    "Loading …" : "A carregar...",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Download" : "Transferir",
@@ -29,9 +31,11 @@
     "Hour" : "Hora",
     "Name" : "Nome",
     "Update" : "Atualizar",
-    "Loading …" : "A carregar...",
     "Refresh" : "Atualizar",
     "Share folder" : "Partilhar pasta",
+    "Undo" : "Desfazer",
+    "Image" : "Imagem",
+    "Name is required." : "Nome é obrigatório.",
     "Failed to delete files." : "Não foi possível eliminar os ficheiros.",
     "Failed to delete {fileName}." : "Não foi possível eliminar {fileName}.",
     "Failed to favorite files." : "Não foi possível colocar os ficheiros nos favoritos.",
diff --git a/l10n/ro.js b/l10n/ro.js
index ed9a7a2c9..5370645a6 100644
--- a/l10n/ro.js
+++ b/l10n/ro.js
@@ -8,6 +8,8 @@ OC.L10N.register(
     "Tags" : "Etichete",
     "Maps" : "Hărți",
     "Settings" : "Setări",
+    "Edit" : "Editează",
+    "Loading …" : "Se încarcă…",
     "Cancel" : "Anulare",
     "Delete" : "Șterge",
     "Download" : "Descărcare",
@@ -23,8 +25,10 @@ OC.L10N.register(
     "Time" : "Timp",
     "Name" : "Nume",
     "Update" : "Actualizare",
-    "Loading …" : "Se încarcă…",
     "Refresh" : "Reîmprospătează",
-    "Share folder" : "Distribuie dosar"
+    "Share folder" : "Distribuie dosar",
+    "Reset" : "Resetare",
+    "Undo" : "Anulează ultima acțiune",
+    "Position" : "Poziție"
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/l10n/ro.json b/l10n/ro.json
index 043e1c9bd..cb5bc5204 100644
--- a/l10n/ro.json
+++ b/l10n/ro.json
@@ -6,6 +6,8 @@
     "Tags" : "Etichete",
     "Maps" : "Hărți",
     "Settings" : "Setări",
+    "Edit" : "Editează",
+    "Loading …" : "Se încarcă…",
     "Cancel" : "Anulare",
     "Delete" : "Șterge",
     "Download" : "Descărcare",
@@ -21,8 +23,10 @@
     "Time" : "Timp",
     "Name" : "Nume",
     "Update" : "Actualizare",
-    "Loading …" : "Se încarcă…",
     "Refresh" : "Reîmprospătează",
-    "Share folder" : "Distribuie dosar"
+    "Share folder" : "Distribuie dosar",
+    "Reset" : "Resetare",
+    "Undo" : "Anulează ultima acțiune",
+    "Position" : "Poziție"
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
 }
\ No newline at end of file
diff --git a/l10n/ru.js b/l10n/ru.js
index 20b171612..acb5278a1 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Tags" : "Метки",
     "Maps" : "Карты",
     "Settings" : "Настройки",
+    "Edit" : "Редактировать",
+    "Loading …" : "Загрузка …",
     "Cancel" : "Отменить",
     "Delete" : "Удалить",
     "Download" : "Скачать",
@@ -38,9 +40,17 @@ OC.L10N.register(
     "Minute" : "Минута",
     "Name" : "Имя",
     "Update" : "Обновить",
-    "Loading …" : "Загрузка …",
     "Refresh" : "Обновить",
     "Share folder" : "Поделиться папкой",
+    "Reset" : "Сброс",
+    "Are you sure you want to continue?" : "Продолжить?",
+    "Undo" : "Отменить",
+    "Show original image" : "Показать исходное изображение",
+    "Zoom out" : "Отдалить",
+    "Hue" : "Тон",
+    "Image" : "Изображение",
+    "Position" : "Должность",
+    "Name is required." : "Необходимо указать имя.",
     "Failed to delete files." : "Ошибка удаления файлов.",
     "Failed to delete {fileName}." : "Ошибка удаления файла «{fileName}».",
     "Failed to favorite files." : "Не удалось добавить файлы в избранное.",
diff --git a/l10n/ru.json b/l10n/ru.json
index 18afa5c64..6e7c79bb7 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -12,6 +12,8 @@
     "Tags" : "Метки",
     "Maps" : "Карты",
     "Settings" : "Настройки",
+    "Edit" : "Редактировать",
+    "Loading …" : "Загрузка …",
     "Cancel" : "Отменить",
     "Delete" : "Удалить",
     "Download" : "Скачать",
@@ -36,9 +38,17 @@
     "Minute" : "Минута",
     "Name" : "Имя",
     "Update" : "Обновить",
-    "Loading …" : "Загрузка …",
     "Refresh" : "Обновить",
     "Share folder" : "Поделиться папкой",
+    "Reset" : "Сброс",
+    "Are you sure you want to continue?" : "Продолжить?",
+    "Undo" : "Отменить",
+    "Show original image" : "Показать исходное изображение",
+    "Zoom out" : "Отдалить",
+    "Hue" : "Тон",
+    "Image" : "Изображение",
+    "Position" : "Должность",
+    "Name is required." : "Необходимо указать имя.",
     "Failed to delete files." : "Ошибка удаления файлов.",
     "Failed to delete {fileName}." : "Ошибка удаления файла «{fileName}».",
     "Failed to favorite files." : "Не удалось добавить файлы в избранное.",
diff --git a/l10n/sc.js b/l10n/sc.js
index 29950041a..e91035891 100644
--- a/l10n/sc.js
+++ b/l10n/sc.js
@@ -11,11 +11,14 @@ OC.L10N.register(
     "Tags" : "Etichetas",
     "Maps" : "Mapas",
     "Settings" : "Impostatziones",
+    "Edit" : "Modìfica",
+    "Loading …" : "Carrigamentu …",
     "Cancel" : "Annulla",
     "Delete" : "Cantzella",
     "Download" : "Iscàrriga",
     "Favorite" : "Preferidu",
     "View in folder" : "Càstia in sa cartella",
+    "Share" : "Cumpartzidura",
     "Copy public link" : "Còpia ligòngiu pùblicu",
     "Public link" : "Ligòngiu pùblicu",
     "Back" : "In segus",
@@ -28,8 +31,12 @@ OC.L10N.register(
     "Minute" : "Minutu",
     "Name" : "Nùmene",
     "Update" : "Agiorna",
-    "Loading …" : "Carrigamentu …",
     "Refresh" : "Agiorna",
-    "Share folder" : "Cumpartzi cartella"
+    "Share folder" : "Cumpartzi cartella",
+    "Reset" : "Torra a impostare",
+    "Undo" : "Annulla",
+    "Image" : "Imàgine",
+    "Position" : "Positzione",
+    "Name is required." : "Su nùmene est rechertu: "
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/sc.json b/l10n/sc.json
index 1c16c973b..58a17c6cf 100644
--- a/l10n/sc.json
+++ b/l10n/sc.json
@@ -9,11 +9,14 @@
     "Tags" : "Etichetas",
     "Maps" : "Mapas",
     "Settings" : "Impostatziones",
+    "Edit" : "Modìfica",
+    "Loading …" : "Carrigamentu …",
     "Cancel" : "Annulla",
     "Delete" : "Cantzella",
     "Download" : "Iscàrriga",
     "Favorite" : "Preferidu",
     "View in folder" : "Càstia in sa cartella",
+    "Share" : "Cumpartzidura",
     "Copy public link" : "Còpia ligòngiu pùblicu",
     "Public link" : "Ligòngiu pùblicu",
     "Back" : "In segus",
@@ -26,8 +29,12 @@
     "Minute" : "Minutu",
     "Name" : "Nùmene",
     "Update" : "Agiorna",
-    "Loading …" : "Carrigamentu …",
     "Refresh" : "Agiorna",
-    "Share folder" : "Cumpartzi cartella"
+    "Share folder" : "Cumpartzi cartella",
+    "Reset" : "Torra a impostare",
+    "Undo" : "Annulla",
+    "Image" : "Imàgine",
+    "Position" : "Positzione",
+    "Name is required." : "Su nùmene est rechertu: "
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/si.js b/l10n/si.js
index b7e4aa8fe..8f6e9014a 100644
--- a/l10n/si.js
+++ b/l10n/si.js
@@ -5,10 +5,13 @@ OC.L10N.register(
     "Archive" : "සංරක්ෂණය",
     "Maps" : "සිතියම්",
     "Settings" : "සැකසුම්",
+    "Edit" : "සංස්කරණය",
+    "Loading …" : "පූරණය වෙමින් …",
     "Cancel" : "අවලංගු කරන්න",
     "Download" : "බාගන්න",
     "Favorite" : "ප්‍රියතම",
     "View in folder" : "බහාලුමේ බලන්න",
+    "Share" : "බෙදාගන්න",
     "Back" : "ආපසු",
     "Save" : "සුරකින්න",
     "Year" : "වර්ෂය",
@@ -17,6 +20,6 @@ OC.L10N.register(
     "Time" : "වේලාව",
     "Name" : "නම",
     "Update" : "යාවත්කාල",
-    "Loading …" : "පූරණය වෙමින් …"
+    "Undo" : "පෙරසේ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/si.json b/l10n/si.json
index 08eee5d07..1cbbfe461 100644
--- a/l10n/si.json
+++ b/l10n/si.json
@@ -3,10 +3,13 @@
     "Archive" : "සංරක්ෂණය",
     "Maps" : "සිතියම්",
     "Settings" : "සැකසුම්",
+    "Edit" : "සංස්කරණය",
+    "Loading …" : "පූරණය වෙමින් …",
     "Cancel" : "අවලංගු කරන්න",
     "Download" : "බාගන්න",
     "Favorite" : "ප්‍රියතම",
     "View in folder" : "බහාලුමේ බලන්න",
+    "Share" : "බෙදාගන්න",
     "Back" : "ආපසු",
     "Save" : "සුරකින්න",
     "Year" : "වර්ෂය",
@@ -15,6 +18,6 @@
     "Time" : "වේලාව",
     "Name" : "නම",
     "Update" : "යාවත්කාල",
-    "Loading …" : "පූරණය වෙමින් …"
+    "Undo" : "පෙරසේ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/sk.js b/l10n/sk.js
index 8b272e3a8..72e40d32d 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Tags" : "Štítky",
     "Maps" : "Mapy",
     "Settings" : "Nastavenia",
+    "Edit" : "Upraviť",
+    "Loading …" : "Načítavam …",
     "Cancel" : "Zrušiť",
     "Delete" : "Vymazať",
     "Download" : "Sťahovanie",
@@ -31,6 +33,7 @@ OC.L10N.register(
     "Show hidden folders" : "Zobraziť skryté priečinky",
     "Your Timeline" : "Vaša časová os",
     "Failed to load some photos" : "Načítanie akýchkoľvek fotiek zlyhalo",
+    "Share" : "Zdieľať",
     "Sidebar" : "Bočný panel",
     "Processing … {n}/{m}" : "Spracúvam ... {n}/{m}",
     "Search for collaborators" : "Vyhľadať spolupracovníkov",
@@ -80,7 +83,6 @@ OC.L10N.register(
     "Rename person" : "Premenovať osobu",
     "Update" : "Aktualizovať",
     "Failed to rename {oldName} to {name}." : "Nepodarilo sa premenovať {oldName} na {name}.",
-    "Loading …" : "Načítavam …",
     "Merge {name} with person" : "Zlúčiť {name} s osobou",
     "Are you sure you want to merge {name} with {newName}?" : "Naozaj chcete zlúčiť {name} s {newName}?",
     "Too many failures, aborting" : "Príliš veľa zlyhaní, prerušujem",
@@ -90,6 +92,27 @@ OC.L10N.register(
     "Delete album" : "Zmazať album",
     "Merge with different person" : "Spojiť s inou osobou",
     "Share folder" : "Zdieľať priečinok",
+    "Reset" : "Resetovať",
+    "Are you sure you want to continue?" : "Naozaj chcete pokračovať?",
+    "Undo" : "Vrátiť",
+    "Show original image" : "Zobraziť originálny obrázok",
+    "Zoom out" : "Oddialiť",
+    "Toggle zoom menu" : "Prepnúť ponuku priblíženia",
+    "Resize" : "Zmeniť veľkosť",
+    "is not an image" : "nie je obrázok",
+    "Ellipse" : "Elipsa",
+    "Classic TV" : "Klasická TV",
+    "Hue" : "Odtieň",
+    "Image" : "Obrázok",
+    "Rectangle" : "Odĺžnik",
+    "Corner Radius" : "Polomer zaoblenia",
+    "Reset to original image size" : "Vrátiť pôvodnú veľkost obrázku",
+    "Choose watermark type" : "Vyberte typ vodoznaku",
+    "Horizontal" : "Horizontálne",
+    "Position" : "Pozícia",
+    "Name is required." : "Meno je povinné.",
+    "Saved image size (width x height)" : "Veľkosť uloženého obrázka (šírka x výška)",
+    "Actual size (100%)" : "Aktuálna veľkosť (100%)",
     "Failed to create {albumName}." : "Zlyhalo vytváranie {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Chyba pri premenovávaní {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Všeobecné zlyhanie",
diff --git a/l10n/sk.json b/l10n/sk.json
index ec36d9288..a3f8cacab 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -12,6 +12,8 @@
     "Tags" : "Štítky",
     "Maps" : "Mapy",
     "Settings" : "Nastavenia",
+    "Edit" : "Upraviť",
+    "Loading …" : "Načítavam …",
     "Cancel" : "Zrušiť",
     "Delete" : "Vymazať",
     "Download" : "Sťahovanie",
@@ -29,6 +31,7 @@
     "Show hidden folders" : "Zobraziť skryté priečinky",
     "Your Timeline" : "Vaša časová os",
     "Failed to load some photos" : "Načítanie akýchkoľvek fotiek zlyhalo",
+    "Share" : "Zdieľať",
     "Sidebar" : "Bočný panel",
     "Processing … {n}/{m}" : "Spracúvam ... {n}/{m}",
     "Search for collaborators" : "Vyhľadať spolupracovníkov",
@@ -78,7 +81,6 @@
     "Rename person" : "Premenovať osobu",
     "Update" : "Aktualizovať",
     "Failed to rename {oldName} to {name}." : "Nepodarilo sa premenovať {oldName} na {name}.",
-    "Loading …" : "Načítavam …",
     "Merge {name} with person" : "Zlúčiť {name} s osobou",
     "Are you sure you want to merge {name} with {newName}?" : "Naozaj chcete zlúčiť {name} s {newName}?",
     "Too many failures, aborting" : "Príliš veľa zlyhaní, prerušujem",
@@ -88,6 +90,27 @@
     "Delete album" : "Zmazať album",
     "Merge with different person" : "Spojiť s inou osobou",
     "Share folder" : "Zdieľať priečinok",
+    "Reset" : "Resetovať",
+    "Are you sure you want to continue?" : "Naozaj chcete pokračovať?",
+    "Undo" : "Vrátiť",
+    "Show original image" : "Zobraziť originálny obrázok",
+    "Zoom out" : "Oddialiť",
+    "Toggle zoom menu" : "Prepnúť ponuku priblíženia",
+    "Resize" : "Zmeniť veľkosť",
+    "is not an image" : "nie je obrázok",
+    "Ellipse" : "Elipsa",
+    "Classic TV" : "Klasická TV",
+    "Hue" : "Odtieň",
+    "Image" : "Obrázok",
+    "Rectangle" : "Odĺžnik",
+    "Corner Radius" : "Polomer zaoblenia",
+    "Reset to original image size" : "Vrátiť pôvodnú veľkost obrázku",
+    "Choose watermark type" : "Vyberte typ vodoznaku",
+    "Horizontal" : "Horizontálne",
+    "Position" : "Pozícia",
+    "Name is required." : "Meno je povinné.",
+    "Saved image size (width x height)" : "Veľkosť uloženého obrázka (šírka x výška)",
+    "Actual size (100%)" : "Aktuálna veľkosť (100%)",
     "Failed to create {albumName}." : "Zlyhalo vytváranie {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Chyba pri premenovávaní {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Všeobecné zlyhanie",
diff --git a/l10n/sl.js b/l10n/sl.js
index 6f8c0461b..3fa79e685 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -12,12 +12,15 @@ OC.L10N.register(
     "Tags" : "Oznake",
     "Maps" : "Zemljevidi",
     "Settings" : "Nastavitve",
+    "Edit" : "Uredi",
+    "Loading …" : "Poteka nalaganje …",
     "Cancel" : "Prekliči",
     "Delete" : "Izbriši",
     "Download" : "Prejmi",
     "Favorite" : "Priljubljeno",
     "Unarchive" : "Odarhiviraj",
     "View in folder" : "Pokaži v mapi",
+    "Share" : "Souporaba",
     "Sidebar" : "Bočno okno",
     "Copy public link" : "Kopiraj javno povezavo",
     "Public link" : "Javna povezava",
@@ -34,8 +37,12 @@ OC.L10N.register(
     "Minute" : "Minuta",
     "Name" : "Ime",
     "Update" : "Posodobi",
-    "Loading …" : "Poteka nalaganje …",
     "Refresh" : "Osveži",
-    "Share folder" : "Omogoči souporabo mape"
+    "Share folder" : "Omogoči souporabo mape",
+    "Reset" : "Ponastavi",
+    "Undo" : "Razveljavi",
+    "Image" : "Slika",
+    "Position" : "Položaj",
+    "Name is required." : "Ime mora biti vpisano."
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/l10n/sl.json b/l10n/sl.json
index cb81286d3..3a72b4505 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -10,12 +10,15 @@
     "Tags" : "Oznake",
     "Maps" : "Zemljevidi",
     "Settings" : "Nastavitve",
+    "Edit" : "Uredi",
+    "Loading …" : "Poteka nalaganje …",
     "Cancel" : "Prekliči",
     "Delete" : "Izbriši",
     "Download" : "Prejmi",
     "Favorite" : "Priljubljeno",
     "Unarchive" : "Odarhiviraj",
     "View in folder" : "Pokaži v mapi",
+    "Share" : "Souporaba",
     "Sidebar" : "Bočno okno",
     "Copy public link" : "Kopiraj javno povezavo",
     "Public link" : "Javna povezava",
@@ -32,8 +35,12 @@
     "Minute" : "Minuta",
     "Name" : "Ime",
     "Update" : "Posodobi",
-    "Loading …" : "Poteka nalaganje …",
     "Refresh" : "Osveži",
-    "Share folder" : "Omogoči souporabo mape"
+    "Share folder" : "Omogoči souporabo mape",
+    "Reset" : "Ponastavi",
+    "Undo" : "Razveljavi",
+    "Image" : "Slika",
+    "Position" : "Položaj",
+    "Name is required." : "Ime mora biti vpisano."
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/sq.js b/l10n/sq.js
index c6115dd04..2c0fe7366 100644
--- a/l10n/sq.js
+++ b/l10n/sq.js
@@ -8,12 +8,14 @@ OC.L10N.register(
     "Tags" : "Etiketat",
     "Maps" : "Harta",
     "Settings" : "Rregullimet",
+    "Edit" : "Përpuno",
     "Cancel" : "Anullo",
     "Delete" : "Fshi",
     "Download" : "Shkarko",
     "Favorite" : "I/E Preferuar",
     "Unarchive" : "Hiq nga arkivi",
     "View in folder" : "Shikoje në dosje",
+    "Share" : "Shpërndaje",
     "Back" : "Prapa",
     "Save" : "Ruaj",
     "Month" : "Muaj",
@@ -22,6 +24,10 @@ OC.L10N.register(
     "Hour" : "Orë",
     "Name" : "Emri",
     "Update" : "Përditëso",
-    "Refresh" : "Rifresko"
+    "Refresh" : "Rifresko",
+    "Reset" : "Rivendos",
+    "Undo" : "Ktheje pas",
+    "Position" : "Pozicion",
+    "Name is required." : "Emri është i domosdoshëm"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/sq.json b/l10n/sq.json
index b7f52da83..d6660dcfe 100644
--- a/l10n/sq.json
+++ b/l10n/sq.json
@@ -6,12 +6,14 @@
     "Tags" : "Etiketat",
     "Maps" : "Harta",
     "Settings" : "Rregullimet",
+    "Edit" : "Përpuno",
     "Cancel" : "Anullo",
     "Delete" : "Fshi",
     "Download" : "Shkarko",
     "Favorite" : "I/E Preferuar",
     "Unarchive" : "Hiq nga arkivi",
     "View in folder" : "Shikoje në dosje",
+    "Share" : "Shpërndaje",
     "Back" : "Prapa",
     "Save" : "Ruaj",
     "Month" : "Muaj",
@@ -20,6 +22,10 @@
     "Hour" : "Orë",
     "Name" : "Emri",
     "Update" : "Përditëso",
-    "Refresh" : "Rifresko"
+    "Refresh" : "Rifresko",
+    "Reset" : "Rivendos",
+    "Undo" : "Ktheje pas",
+    "Position" : "Pozicion",
+    "Name is required." : "Emri është i domosdoshëm"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/sr.js b/l10n/sr.js
index e69499ebc..7321d0d51 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -10,12 +10,15 @@ OC.L10N.register(
     "Tags" : "Ознаке",
     "Maps" : "Мапе",
     "Settings" : "Поставке",
+    "Edit" : "Измени",
+    "Loading …" : "Учитавање…",
     "Cancel" : "Поништи",
     "Delete" : "Избриши",
     "Download" : "Преузми",
     "Favorite" : "Омиљени",
     "Unarchive" : "Врати из архиве",
     "View in folder" : "Види у фасцикли",
+    "Share" : "Подели",
     "Sidebar" : "Бочна трака",
     "Public link" : "Јавна веза",
     "Back" : "Назад",
@@ -28,7 +31,10 @@ OC.L10N.register(
     "Minute" : "Минут",
     "Name" : "Име",
     "Update" : "Ажурирај",
-    "Loading …" : "Учитавање…",
-    "Refresh" : "Освежи"
+    "Refresh" : "Освежи",
+    "Reset" : "Ресетуј",
+    "Undo" : "Опозови",
+    "Image" : "Слика",
+    "Position" : "Позиција"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/sr.json b/l10n/sr.json
index 437dc8bae..d5f3b6db3 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -8,12 +8,15 @@
     "Tags" : "Ознаке",
     "Maps" : "Мапе",
     "Settings" : "Поставке",
+    "Edit" : "Измени",
+    "Loading …" : "Учитавање…",
     "Cancel" : "Поништи",
     "Delete" : "Избриши",
     "Download" : "Преузми",
     "Favorite" : "Омиљени",
     "Unarchive" : "Врати из архиве",
     "View in folder" : "Види у фасцикли",
+    "Share" : "Подели",
     "Sidebar" : "Бочна трака",
     "Public link" : "Јавна веза",
     "Back" : "Назад",
@@ -26,7 +29,10 @@
     "Minute" : "Минут",
     "Name" : "Име",
     "Update" : "Ажурирај",
-    "Loading …" : "Учитавање…",
-    "Refresh" : "Освежи"
+    "Refresh" : "Освежи",
+    "Reset" : "Ресетуј",
+    "Undo" : "Опозови",
+    "Image" : "Слика",
+    "Position" : "Позиција"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/sr@latin.js b/l10n/sr@latin.js
index e8288ad9a..131e69cdb 100644
--- a/l10n/sr@latin.js
+++ b/l10n/sr@latin.js
@@ -5,14 +5,17 @@ OC.L10N.register(
     "Videos" : "Video",
     "Tags" : "Oznake",
     "Settings" : "Поставке",
+    "Edit" : "Izmeni",
     "Cancel" : "Otkaži",
     "Delete" : "Obriši",
     "Download" : "Preuzmi",
     "Favorite" : "Omiljene",
+    "Share" : "Podeli",
     "Back" : "Nazad",
     "Save" : "Sačuvaj",
     "Name" : "Ime",
     "Update" : "Ažuriraj",
-    "Refresh" : "Osveži"
+    "Refresh" : "Osveži",
+    "Undo" : "Opozovi"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/sr@latin.json b/l10n/sr@latin.json
index 28da24196..54100040f 100644
--- a/l10n/sr@latin.json
+++ b/l10n/sr@latin.json
@@ -3,14 +3,17 @@
     "Videos" : "Video",
     "Tags" : "Oznake",
     "Settings" : "Поставке",
+    "Edit" : "Izmeni",
     "Cancel" : "Otkaži",
     "Delete" : "Obriši",
     "Download" : "Preuzmi",
     "Favorite" : "Omiljene",
+    "Share" : "Podeli",
     "Back" : "Nazad",
     "Save" : "Sačuvaj",
     "Name" : "Ime",
     "Update" : "Ažuriraj",
-    "Refresh" : "Osveži"
+    "Refresh" : "Osveži",
+    "Undo" : "Opozovi"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/sv.js b/l10n/sv.js
index acce724c6..8fc764b8d 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Tags" : "Taggar",
     "Maps" : "Kartor",
     "Settings" : "Inställningar",
+    "Edit" : "Ändra",
+    "Loading …" : "Läser in …",
     "Cancel" : "Avbryt",
     "Delete" : "Radera",
     "Download" : "Ladda ner",
@@ -26,6 +28,7 @@ OC.L10N.register(
     "Timeline Path" : "Tidslinjesökväg",
     "Show hidden folders" : "Visa dolda filer",
     "Failed to load some photos" : "Misslyckades att läsa in vissa foton",
+    "Share" : "Dela",
     "Copy the public link" : "Kopiera den publika länken",
     "Delete the public link" : "Ta bort den offentliga länken",
     "Public link copied!" : "Offentlig länk kopierad!",
@@ -47,9 +50,14 @@ OC.L10N.register(
     "Remove person" : "Ta bort person",
     "Name" : "Namn",
     "Update" : "Uppdatera",
-    "Loading …" : "Läser in …",
     "Refresh" : "Uppdatera",
     "Share folder" : "Dela mapp",
+    "Reset" : "Återställ",
+    "Undo" : "Ångra",
+    "Image" : "Bild",
+    "Line" : "Rad",
+    "Position" : "Position",
+    "Name is required." : "Namn är obligatoriskt.",
     "Failed to delete files." : "Misslyckades att radera filer.",
     "Failed to delete {fileName}." : "Misslyckades att radera {fileName}.",
     "Failed to favorite files." : "Misslyckades att favorisera filer.",
diff --git a/l10n/sv.json b/l10n/sv.json
index dcae1cbff..5ae2b704a 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -12,6 +12,8 @@
     "Tags" : "Taggar",
     "Maps" : "Kartor",
     "Settings" : "Inställningar",
+    "Edit" : "Ändra",
+    "Loading …" : "Läser in …",
     "Cancel" : "Avbryt",
     "Delete" : "Radera",
     "Download" : "Ladda ner",
@@ -24,6 +26,7 @@
     "Timeline Path" : "Tidslinjesökväg",
     "Show hidden folders" : "Visa dolda filer",
     "Failed to load some photos" : "Misslyckades att läsa in vissa foton",
+    "Share" : "Dela",
     "Copy the public link" : "Kopiera den publika länken",
     "Delete the public link" : "Ta bort den offentliga länken",
     "Public link copied!" : "Offentlig länk kopierad!",
@@ -45,9 +48,14 @@
     "Remove person" : "Ta bort person",
     "Name" : "Namn",
     "Update" : "Uppdatera",
-    "Loading …" : "Läser in …",
     "Refresh" : "Uppdatera",
     "Share folder" : "Dela mapp",
+    "Reset" : "Återställ",
+    "Undo" : "Ångra",
+    "Image" : "Bild",
+    "Line" : "Rad",
+    "Position" : "Position",
+    "Name is required." : "Namn är obligatoriskt.",
     "Failed to delete files." : "Misslyckades att radera filer.",
     "Failed to delete {fileName}." : "Misslyckades att radera {fileName}.",
     "Failed to favorite files." : "Misslyckades att favorisera filer.",
diff --git a/l10n/ta.js b/l10n/ta.js
index f84e5f49c..b093bf40b 100644
--- a/l10n/ta.js
+++ b/l10n/ta.js
@@ -4,10 +4,12 @@ OC.L10N.register(
     "Favorites" : "விருப்பங்கள்",
     "Tags" : "சீட்டுகள்",
     "Settings" : "அமைப்புகள்",
+    "Edit" : "தொகுக்க",
     "Cancel" : "இரத்து செய்க",
     "Delete" : "நீக்குக",
     "Download" : "பதிவிறக்குக",
     "Favorite" : "விருப்பமான",
+    "Share" : "பகிர்வு",
     "Back" : "பின்னுக்கு",
     "Save" : "சேமிக்க ",
     "Month" : "மாதம்",
diff --git a/l10n/ta.json b/l10n/ta.json
index ecd2ee79b..e2b76623b 100644
--- a/l10n/ta.json
+++ b/l10n/ta.json
@@ -2,10 +2,12 @@
     "Favorites" : "விருப்பங்கள்",
     "Tags" : "சீட்டுகள்",
     "Settings" : "அமைப்புகள்",
+    "Edit" : "தொகுக்க",
     "Cancel" : "இரத்து செய்க",
     "Delete" : "நீக்குக",
     "Download" : "பதிவிறக்குக",
     "Favorite" : "விருப்பமான",
+    "Share" : "பகிர்வு",
     "Back" : "பின்னுக்கு",
     "Save" : "சேமிக்க ",
     "Month" : "மாதம்",
diff --git a/l10n/th.js b/l10n/th.js
index 11314ae79..19a6bea44 100644
--- a/l10n/th.js
+++ b/l10n/th.js
@@ -8,11 +8,13 @@ OC.L10N.register(
     "Tags" : "แท็ก",
     "Maps" : "แผนที่",
     "Settings" : "การตั้งค่า",
+    "Edit" : "แก้ไข",
     "Cancel" : "ยกเลิก",
     "Delete" : "ลบ",
     "Download" : "ดาวน์โหลด",
     "Favorite" : "รายการโปรด",
     "View in folder" : "ดูในโฟลเดอร์",
+    "Share" : "แชร์",
     "Public link" : "ลิงค์สาธารณะ",
     "Back" : "ย้อนกลับ",
     "Save" : "บันทึก",
@@ -22,6 +24,9 @@ OC.L10N.register(
     "Name" : "ชื่อ",
     "Update" : "อัปเดต",
     "Refresh" : "รีเฟรช",
-    "Share folder" : "แชร์โฟลเดอร์"
+    "Share folder" : "แชร์โฟลเดอร์",
+    "Reset" : "ตั้งค่าใหม่",
+    "Undo" : "เลิกทำ",
+    "Position" : "ตำแหน่ง"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/th.json b/l10n/th.json
index a960786d2..392466640 100644
--- a/l10n/th.json
+++ b/l10n/th.json
@@ -6,11 +6,13 @@
     "Tags" : "แท็ก",
     "Maps" : "แผนที่",
     "Settings" : "การตั้งค่า",
+    "Edit" : "แก้ไข",
     "Cancel" : "ยกเลิก",
     "Delete" : "ลบ",
     "Download" : "ดาวน์โหลด",
     "Favorite" : "รายการโปรด",
     "View in folder" : "ดูในโฟลเดอร์",
+    "Share" : "แชร์",
     "Public link" : "ลิงค์สาธารณะ",
     "Back" : "ย้อนกลับ",
     "Save" : "บันทึก",
@@ -20,6 +22,9 @@
     "Name" : "ชื่อ",
     "Update" : "อัปเดต",
     "Refresh" : "รีเฟรช",
-    "Share folder" : "แชร์โฟลเดอร์"
+    "Share folder" : "แชร์โฟลเดอร์",
+    "Reset" : "ตั้งค่าใหม่",
+    "Undo" : "เลิกทำ",
+    "Position" : "ตำแหน่ง"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/tk.js b/l10n/tk.js
index 3276e03e1..ee5fe6a02 100644
--- a/l10n/tk.js
+++ b/l10n/tk.js
@@ -5,10 +5,12 @@ OC.L10N.register(
     "Videos" : "Wideo",
     "Tags" : "Bellikler",
     "Settings" : "Sazlamalar",
+    "Edit" : "Redaktirläň",
     "Cancel" : "ýatyrmak",
     "Delete" : "Pozmak",
     "Download" : "Göçürip almak",
     "Favorite" : "Halaýan",
+    "Share" : "Paýlaş",
     "Back" : "Yzyna",
     "Save" : "Saklamak",
     "Name" : "Ady",
diff --git a/l10n/tk.json b/l10n/tk.json
index aa8f1b845..19ce6b020 100644
--- a/l10n/tk.json
+++ b/l10n/tk.json
@@ -3,10 +3,12 @@
     "Videos" : "Wideo",
     "Tags" : "Bellikler",
     "Settings" : "Sazlamalar",
+    "Edit" : "Redaktirläň",
     "Cancel" : "ýatyrmak",
     "Delete" : "Pozmak",
     "Download" : "Göçürip almak",
     "Favorite" : "Halaýan",
+    "Share" : "Paýlaş",
     "Back" : "Yzyna",
     "Save" : "Saklamak",
     "Name" : "Ady",
diff --git a/l10n/tr.js b/l10n/tr.js
index 654e2483c..08b996b85 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -25,6 +25,8 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Zaman tünelinizin kök klasörünü seçin",
     "The selected folder does not seem to be valid. Try again." : "Seçilmiş klasör geçersiz gibi görünüyor. Yeniden deneyin.",
     "Found {total} photos in {path}" : "{path} yolunda {total} fotoğraf bulundu",
+    "Edit" : "Düzenle",
+    "Loading …" : "Yükleniyor…",
     "Cancel" : "İptal",
     "Delete" : "Sil",
     "Remove from album" : "Albümden kaldır",
@@ -48,6 +50,7 @@ OC.L10N.register(
     "Choose the root for the folders view" : "Klasörler görünümünün kök klasörünü seçin",
     "Your Timeline" : "Zaman tüneliniz",
     "Failed to load some photos" : "Bazı fotoğraflar yüklenemedi",
+    "Share" : "Paylaş",
     "Sidebar" : "Yan çubuk",
     "Processing … {n}/{m}" : "İşleniyor… {n}/{m}",
     "{n} photos added to album" : "{n} fotoğraf albüme eklendi",
@@ -105,7 +108,6 @@ OC.L10N.register(
     "Rename person" : "Kişiyi yeniden adlandır",
     "Update" : "Güncelle",
     "Failed to rename {oldName} to {name}." : "{oldName} adı {name} olarak değiştirilemedi.",
-    "Loading …" : "Yükleniyor…",
     "Merge {name} with person" : "{name} kişisini kişi ile birleştir",
     "Are you sure you want to merge {name} with {newName}?" : "{name} kişisini {newName} kişisi ile birleştirmek istediğinize emin misiniz?",
     "Too many failures, aborting" : "Çok sayıda sorun çıktı, vazgeçiliyor",
@@ -125,6 +127,32 @@ OC.L10N.register(
     "Share folder" : "Klasör paylaş",
     "Move left" : "Sola taşı",
     "Move right" : "Sağa taşı",
+    "Reset" : "Sıfırla",
+    "Are you sure you want to continue?" : "İşlemi sürdürmek istediğinize emin misiniz?",
+    "Undo" : "Geri al",
+    "Show original image" : "Özgün görseli görüntüle",
+    "Zoom out" : "Uzaklaştır",
+    "Toggle zoom menu" : "Yakınlaştırma menüsünü aç/kapat",
+    "Resize" : "Yeniden boyutlandır",
+    "is not an image" : "bir görsel değil",
+    "Square" : "Kare",
+    "Ellipse" : "Elips",
+    "Classic TV" : "Klasik TV",
+    "Hue" : "Renk tonu",
+    "Image" : "Görsel",
+    "Line" : "Çizgi",
+    "Rectangle" : "Dikdörtgen",
+    "Corner Radius" : "Köşe yarıçapı",
+    "Width in pixels" : "Piksel cinsinden genişlik",
+    "Reset to original image size" : "Özgün görsel boyutuna sıfırla",
+    "+ Add watermark" : "+ Filigran ekle",
+    "Choose watermark type" : "Filigran türünü seçin",
+    "Shadow" : "Gölge",
+    "Horizontal" : "Yatay",
+    "Position" : "Konum",
+    "Name is required." : "Adın yazılması zorunludur.",
+    "Saved image size (width x height)" : "Kaydedilmiş görsel boyutu (genişlik x yükseklik)",
+    "Actual size (100%)" : "Gerçek boyut (%100)",
     "Shared Folder" : "Paylaşılmış klasör",
     "Failed to create {albumName}." : "{albumName} albümü oluşturulamadı.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} albümünün adı {newAlbumName} olarak değiştirilemedi.",
diff --git a/l10n/tr.json b/l10n/tr.json
index 69fc81030..787cc4243 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -23,6 +23,8 @@
     "Choose the root of your timeline" : "Zaman tünelinizin kök klasörünü seçin",
     "The selected folder does not seem to be valid. Try again." : "Seçilmiş klasör geçersiz gibi görünüyor. Yeniden deneyin.",
     "Found {total} photos in {path}" : "{path} yolunda {total} fotoğraf bulundu",
+    "Edit" : "Düzenle",
+    "Loading …" : "Yükleniyor…",
     "Cancel" : "İptal",
     "Delete" : "Sil",
     "Remove from album" : "Albümden kaldır",
@@ -46,6 +48,7 @@
     "Choose the root for the folders view" : "Klasörler görünümünün kök klasörünü seçin",
     "Your Timeline" : "Zaman tüneliniz",
     "Failed to load some photos" : "Bazı fotoğraflar yüklenemedi",
+    "Share" : "Paylaş",
     "Sidebar" : "Yan çubuk",
     "Processing … {n}/{m}" : "İşleniyor… {n}/{m}",
     "{n} photos added to album" : "{n} fotoğraf albüme eklendi",
@@ -103,7 +106,6 @@
     "Rename person" : "Kişiyi yeniden adlandır",
     "Update" : "Güncelle",
     "Failed to rename {oldName} to {name}." : "{oldName} adı {name} olarak değiştirilemedi.",
-    "Loading …" : "Yükleniyor…",
     "Merge {name} with person" : "{name} kişisini kişi ile birleştir",
     "Are you sure you want to merge {name} with {newName}?" : "{name} kişisini {newName} kişisi ile birleştirmek istediğinize emin misiniz?",
     "Too many failures, aborting" : "Çok sayıda sorun çıktı, vazgeçiliyor",
@@ -123,6 +125,32 @@
     "Share folder" : "Klasör paylaş",
     "Move left" : "Sola taşı",
     "Move right" : "Sağa taşı",
+    "Reset" : "Sıfırla",
+    "Are you sure you want to continue?" : "İşlemi sürdürmek istediğinize emin misiniz?",
+    "Undo" : "Geri al",
+    "Show original image" : "Özgün görseli görüntüle",
+    "Zoom out" : "Uzaklaştır",
+    "Toggle zoom menu" : "Yakınlaştırma menüsünü aç/kapat",
+    "Resize" : "Yeniden boyutlandır",
+    "is not an image" : "bir görsel değil",
+    "Square" : "Kare",
+    "Ellipse" : "Elips",
+    "Classic TV" : "Klasik TV",
+    "Hue" : "Renk tonu",
+    "Image" : "Görsel",
+    "Line" : "Çizgi",
+    "Rectangle" : "Dikdörtgen",
+    "Corner Radius" : "Köşe yarıçapı",
+    "Width in pixels" : "Piksel cinsinden genişlik",
+    "Reset to original image size" : "Özgün görsel boyutuna sıfırla",
+    "+ Add watermark" : "+ Filigran ekle",
+    "Choose watermark type" : "Filigran türünü seçin",
+    "Shadow" : "Gölge",
+    "Horizontal" : "Yatay",
+    "Position" : "Konum",
+    "Name is required." : "Adın yazılması zorunludur.",
+    "Saved image size (width x height)" : "Kaydedilmiş görsel boyutu (genişlik x yükseklik)",
+    "Actual size (100%)" : "Gerçek boyut (%100)",
     "Shared Folder" : "Paylaşılmış klasör",
     "Failed to create {albumName}." : "{albumName} albümü oluşturulamadı.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} albümünün adı {newAlbumName} olarak değiştirilemedi.",
diff --git a/l10n/ug.js b/l10n/ug.js
index acb2b2fea..8a2a9ea50 100644
--- a/l10n/ug.js
+++ b/l10n/ug.js
@@ -4,10 +4,12 @@ OC.L10N.register(
     "Favorites" : "يىغقۇچ",
     "Tags" : "بەلگەلەر",
     "Settings" : "تەڭشەكلەر",
+    "Edit" : "تەھرىر",
     "Cancel" : "ۋاز كەچ",
     "Delete" : "ئۆچۈر",
     "Download" : "چۈشۈر",
     "Favorite" : "يىغقۇچ",
+    "Share" : "ھەمبەھىر",
     "Save" : "ساقلا",
     "Month" : "ئاي",
     "Time" : "ۋاقىت",
diff --git a/l10n/ug.json b/l10n/ug.json
index 4d64534b8..d962261d5 100644
--- a/l10n/ug.json
+++ b/l10n/ug.json
@@ -2,10 +2,12 @@
     "Favorites" : "يىغقۇچ",
     "Tags" : "بەلگەلەر",
     "Settings" : "تەڭشەكلەر",
+    "Edit" : "تەھرىر",
     "Cancel" : "ۋاز كەچ",
     "Delete" : "ئۆچۈر",
     "Download" : "چۈشۈر",
     "Favorite" : "يىغقۇچ",
+    "Share" : "ھەمبەھىر",
     "Save" : "ساقلا",
     "Month" : "ئاي",
     "Time" : "ۋاقىت",
diff --git a/l10n/uk.js b/l10n/uk.js
index 7e958ff37..c8c2b14f4 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "Settings" : "Налаштування",
     "A better photos experience awaits you" : "На вас чекає краща якість фотографій",
     "Choose the root folder of your timeline to begin" : "Виберіть кореневу папку вашої шкали часу для початку ",
+    "Edit" : "Редагувати",
+    "Loading …" : "Завантаження …",
     "Cancel" : "Скасувати",
     "Delete" : "Вилучити",
     "Download" : "Завантажити",
@@ -29,6 +31,7 @@ OC.L10N.register(
     "Timeline Path" : "Шлях шкали часу",
     "Show hidden folders" : "Показати приховані каталоги",
     "Failed to load some photos" : "Не вдалося завантажити деякі фотографії",
+    "Share" : "Спільний доступ",
     "Sidebar" : "Бокове меню",
     "Search for collaborators" : "Пошук співавторів",
     "Search people or groups" : "Пошук людей або груп",
@@ -68,11 +71,37 @@ OC.L10N.register(
     "Name" : "Назва",
     "Rename person" : "Перейменувати особу",
     "Update" : "Оновлення",
-    "Loading …" : "Завантаження …",
     "Refresh" : "Оновити",
     "Delete album" : "Видалити альбом",
     "Merge with different person" : "Злитися з іншою людиною",
     "Share folder" : "Спільний доступ для каталогу",
+    "Reset" : "Скидання",
+    "Are you sure you want to continue?" : "Ви впевнені, що бажаєте продовжити?",
+    "Undo" : "Скасувати",
+    "Show original image" : "Показати вихідне зображення",
+    "Zoom out" : "Зменшення",
+    "Toggle zoom menu" : "Перемкнути меню масштабування",
+    "Resize" : "Змінити розмір",
+    "is not an image" : "не є зображенням",
+    "Square" : "Майдан",
+    "Ellipse" : "Еліпс",
+    "Classic TV" : "Класичний TV",
+    "Un-flip Y" : "Розгорнути по Y",
+    "Hue" : "Відтінок",
+    "Image" : "Зображення",
+    "Line" : "лінія",
+    "Rectangle" : "Прямокутник",
+    "Corner Radius" : "Радіус кута",
+    "Width in pixels" : "Ширина в пікселях",
+    "Reset to original image size" : "Відновити початковий розмір зображення",
+    "+ Add watermark" : "+ Додати водяний знак",
+    "Choose watermark type" : "Виберіть тип водяного знака",
+    "Shadow" : "Тінь",
+    "Horizontal" : "Горизонтальний",
+    "Position" : "Позиція",
+    "Name is required." : "Ім'я є обов'язковим.",
+    "Saved image size (width x height)" : "Розмір збереженого зображення (ширина x висота)",
+    "Actual size (100%)" : "Фактичний розмір (100%)",
     "Failed to create {albumName}." : "Не вдалося створити {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Не вдалося перейменувати {currentAlbumName} на {newAlbumName}.",
     "Failed to delete files." : "Не вдалося видалити файли.",
diff --git a/l10n/uk.json b/l10n/uk.json
index 46eb0b74c..c01e73bd4 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -15,6 +15,8 @@
     "Settings" : "Налаштування",
     "A better photos experience awaits you" : "На вас чекає краща якість фотографій",
     "Choose the root folder of your timeline to begin" : "Виберіть кореневу папку вашої шкали часу для початку ",
+    "Edit" : "Редагувати",
+    "Loading …" : "Завантаження …",
     "Cancel" : "Скасувати",
     "Delete" : "Вилучити",
     "Download" : "Завантажити",
@@ -27,6 +29,7 @@
     "Timeline Path" : "Шлях шкали часу",
     "Show hidden folders" : "Показати приховані каталоги",
     "Failed to load some photos" : "Не вдалося завантажити деякі фотографії",
+    "Share" : "Спільний доступ",
     "Sidebar" : "Бокове меню",
     "Search for collaborators" : "Пошук співавторів",
     "Search people or groups" : "Пошук людей або груп",
@@ -66,11 +69,37 @@
     "Name" : "Назва",
     "Rename person" : "Перейменувати особу",
     "Update" : "Оновлення",
-    "Loading …" : "Завантаження …",
     "Refresh" : "Оновити",
     "Delete album" : "Видалити альбом",
     "Merge with different person" : "Злитися з іншою людиною",
     "Share folder" : "Спільний доступ для каталогу",
+    "Reset" : "Скидання",
+    "Are you sure you want to continue?" : "Ви впевнені, що бажаєте продовжити?",
+    "Undo" : "Скасувати",
+    "Show original image" : "Показати вихідне зображення",
+    "Zoom out" : "Зменшення",
+    "Toggle zoom menu" : "Перемкнути меню масштабування",
+    "Resize" : "Змінити розмір",
+    "is not an image" : "не є зображенням",
+    "Square" : "Майдан",
+    "Ellipse" : "Еліпс",
+    "Classic TV" : "Класичний TV",
+    "Un-flip Y" : "Розгорнути по Y",
+    "Hue" : "Відтінок",
+    "Image" : "Зображення",
+    "Line" : "лінія",
+    "Rectangle" : "Прямокутник",
+    "Corner Radius" : "Радіус кута",
+    "Width in pixels" : "Ширина в пікселях",
+    "Reset to original image size" : "Відновити початковий розмір зображення",
+    "+ Add watermark" : "+ Додати водяний знак",
+    "Choose watermark type" : "Виберіть тип водяного знака",
+    "Shadow" : "Тінь",
+    "Horizontal" : "Горизонтальний",
+    "Position" : "Позиція",
+    "Name is required." : "Ім'я є обов'язковим.",
+    "Saved image size (width x height)" : "Розмір збереженого зображення (ширина x висота)",
+    "Actual size (100%)" : "Фактичний розмір (100%)",
     "Failed to create {albumName}." : "Не вдалося створити {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Не вдалося перейменувати {currentAlbumName} на {newAlbumName}.",
     "Failed to delete files." : "Не вдалося видалити файли.",
diff --git a/l10n/ur_PK.js b/l10n/ur_PK.js
index c158d3f09..093bde97d 100644
--- a/l10n/ur_PK.js
+++ b/l10n/ur_PK.js
@@ -3,11 +3,14 @@ OC.L10N.register(
     {
     "Favorites" : "Favorites",
     "Settings" : "سیٹینگز",
+    "Edit" : "تدوین کریں",
     "Cancel" : "منسوخ کریں",
     "Delete" : "حذف کریں",
     "Download" : "ڈاؤن لوڈ",
+    "Share" : "تقسیم",
     "Save" : "حفظ",
     "Month" : "ماہ",
-    "Name" : "اسم"
+    "Name" : "اسم",
+    "Reset" : "ری سیٹ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ur_PK.json b/l10n/ur_PK.json
index 1bc2397f1..bc38e71d5 100644
--- a/l10n/ur_PK.json
+++ b/l10n/ur_PK.json
@@ -1,11 +1,14 @@
 { "translations": {
     "Favorites" : "Favorites",
     "Settings" : "سیٹینگز",
+    "Edit" : "تدوین کریں",
     "Cancel" : "منسوخ کریں",
     "Delete" : "حذف کریں",
     "Download" : "ڈاؤن لوڈ",
+    "Share" : "تقسیم",
     "Save" : "حفظ",
     "Month" : "ماہ",
-    "Name" : "اسم"
+    "Name" : "اسم",
+    "Reset" : "ری سیٹ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/vi.js b/l10n/vi.js
index 9a54d9b5e..1b0002703 100644
--- a/l10n/vi.js
+++ b/l10n/vi.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Nhãn",
     "Maps" : "Bản đồ",
     "Settings" : "Cài đặt",
+    "Edit" : "Chỉnh sửa",
+    "Loading …" : "Đang tải …",
     "Cancel" : "Hủy",
     "Delete" : "Xóa",
     "Download" : "Tải xuống",
     "Favorite" : "Ưa thích",
     "Unarchive" : "Bỏ lưu trữ",
     "View in folder" : "Xem trong thư mục",
+    "Share" : "Chia sẻ",
     "Copy public link" : "Sao chép liên kết công khai",
     "Back" : "Quay lại",
     "Save" : "Lưu",
@@ -23,7 +26,10 @@ OC.L10N.register(
     "Time" : "Thời gian",
     "Name" : "Tên",
     "Update" : "Cập nhật",
-    "Loading …" : "Đang tải …",
-    "Refresh" : "Tải mới"
+    "Refresh" : "Tải mới",
+    "Reset" : "Đặt lại",
+    "Undo" : "Hoàn tác",
+    "Image" : "Hình ảnh",
+    "Name is required." : "Tên là bắt buộc."
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/vi.json b/l10n/vi.json
index 92c1e3308..608eba780 100644
--- a/l10n/vi.json
+++ b/l10n/vi.json
@@ -6,12 +6,15 @@
     "Tags" : "Nhãn",
     "Maps" : "Bản đồ",
     "Settings" : "Cài đặt",
+    "Edit" : "Chỉnh sửa",
+    "Loading …" : "Đang tải …",
     "Cancel" : "Hủy",
     "Delete" : "Xóa",
     "Download" : "Tải xuống",
     "Favorite" : "Ưa thích",
     "Unarchive" : "Bỏ lưu trữ",
     "View in folder" : "Xem trong thư mục",
+    "Share" : "Chia sẻ",
     "Copy public link" : "Sao chép liên kết công khai",
     "Back" : "Quay lại",
     "Save" : "Lưu",
@@ -21,7 +24,10 @@
     "Time" : "Thời gian",
     "Name" : "Tên",
     "Update" : "Cập nhật",
-    "Loading …" : "Đang tải …",
-    "Refresh" : "Tải mới"
+    "Refresh" : "Tải mới",
+    "Reset" : "Đặt lại",
+    "Undo" : "Hoàn tác",
+    "Image" : "Hình ảnh",
+    "Name is required." : "Tên là bắt buộc."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index ba79caee9..c7f994fb3 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Tags" : "标签",
     "Maps" : "地图",
     "Settings" : "设置",
+    "Edit" : "编辑",
+    "Loading …" : "正在加载 …",
     "Cancel" : "取消",
     "Delete" : "删除",
     "Download" : "下载",
@@ -19,6 +21,7 @@ OC.L10N.register(
     "Unarchive" : "取消归档",
     "View in folder" : "在文件夹中查看",
     "Add to album" : "添加至相册",
+    "Share" : "共享",
     "Sidebar" : "侧边栏",
     "Search for collaborators" : "搜索协作者",
     "Search people or groups" : "搜索用户或群组",
@@ -60,11 +63,16 @@ OC.L10N.register(
     "Name" : "名称",
     "Rename person" : "重命名用户",
     "Update" : "更新",
-    "Loading …" : "正在加载 …",
     "Refresh" : "刷新",
     "Delete album" : "删除相册",
     "Merge with different person" : "与另一个人合并为同一人",
     "Share folder" : "共享文件夹",
+    "Reset" : "重置",
+    "Undo" : "撤销操作",
+    "Image" : "图片",
+    "Line" : "线段",
+    "Position" : "位置",
+    "Name is required." : "名称是必填项。",
     "Failed to create {albumName}." : "创建 {albumName} 失败",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重命名 {currentAlbumName} 为 {newAlbumName} 的操作失败",
     "Failed to delete {fileName}." : "删除 {fileName} 失败"
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index f01117a58..ec7875f2c 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -10,6 +10,8 @@
     "Tags" : "标签",
     "Maps" : "地图",
     "Settings" : "设置",
+    "Edit" : "编辑",
+    "Loading …" : "正在加载 …",
     "Cancel" : "取消",
     "Delete" : "删除",
     "Download" : "下载",
@@ -17,6 +19,7 @@
     "Unarchive" : "取消归档",
     "View in folder" : "在文件夹中查看",
     "Add to album" : "添加至相册",
+    "Share" : "共享",
     "Sidebar" : "侧边栏",
     "Search for collaborators" : "搜索协作者",
     "Search people or groups" : "搜索用户或群组",
@@ -58,11 +61,16 @@
     "Name" : "名称",
     "Rename person" : "重命名用户",
     "Update" : "更新",
-    "Loading …" : "正在加载 …",
     "Refresh" : "刷新",
     "Delete album" : "删除相册",
     "Merge with different person" : "与另一个人合并为同一人",
     "Share folder" : "共享文件夹",
+    "Reset" : "重置",
+    "Undo" : "撤销操作",
+    "Image" : "图片",
+    "Line" : "线段",
+    "Position" : "位置",
+    "Name is required." : "名称是必填项。",
     "Failed to create {albumName}." : "创建 {albumName} 失败",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重命名 {currentAlbumName} 为 {newAlbumName} 的操作失败",
     "Failed to delete {fileName}." : "删除 {fileName} 失败"
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 01a649750..a5196c877 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -25,6 +25,8 @@ OC.L10N.register(
     "Choose the root of your timeline" : "選擇您時間線的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Edit" : "編輯",
+    "Loading …" : "加載中 …",
     "Cancel" : "取消",
     "Delete" : "刪除",
     "Remove from album" : "從相簿移除",
@@ -48,6 +50,7 @@ OC.L10N.register(
     "Choose the root for the folders view" : "選擇資料夾檢視的根",
     "Your Timeline" : "您的時間線",
     "Failed to load some photos" : "未能加載一些照片",
+    "Share" : "分享",
     "Sidebar" : "側邊欄",
     "Processing … {n}/{m}" : "處理中 ... {n}/{m}",
     "{n} photos added to album" : "已新增 {n} 張照片至相簿",
@@ -105,7 +108,6 @@ OC.L10N.register(
     "Rename person" : "重新命名人",
     "Update" : "更新",
     "Failed to rename {oldName} to {name}." : "重新命名 {oldName} 為 {name} 失敗。",
-    "Loading …" : "加載中 …",
     "Merge {name} with person" : "將 {name} 與人合併",
     "Are you sure you want to merge {name} with {newName}?" : "您確定要將 {name} 與 {newName} 合併嗎？",
     "Too many failures, aborting" : "失敗次數過多，中止",
@@ -125,6 +127,37 @@ OC.L10N.register(
     "Share folder" : "分享資料夾",
     "Move left" : "向左移動",
     "Move right" : "向右移動",
+    "Reset" : "重設",
+    "Are you sure you want to continue?" : "您確定要繼續嗎？",
+    "Undo" : "撤消",
+    "Show original image" : "顯示原始圖像",
+    "Zoom out" : "縮小",
+    "Toggle zoom menu" : "切換縮放選項單",
+    "Watermark" : "水印",
+    "Resize" : "調整大小",
+    "is not an image" : "不是圖像",
+    "Square" : "方形",
+    "Ellipse" : "橢圓形",
+    "Classic TV" : "經典電視",
+    "Arrow" : "箭嘴",
+    "Blur" : "模糊",
+    "Un-flip Y" : "取消翻轉 X",
+    "Hue" : "色調",
+    "Image" : "圖像",
+    "Line" : "線形",
+    "Polygon" : "多邊形",
+    "Rectangle" : "長方形",
+    "Corner Radius" : "圓角半徑",
+    "Width in pixels" : "寬度像素",
+    "Reset to original image size" : "重設為原始圖像大小",
+    "+ Add watermark" : "+ 添加水印",
+    "Choose watermark type" : "選擇水印類型",
+    "Shadow" : "陰影",
+    "Horizontal" : "水平",
+    "Position" : "位置",
+    "Name is required." : "姓名為必填",
+    "Saved image size (width x height)" : "已保存的圖像大小（寬度 x 高度）",
+    "Actual size (100%)" : "實際大小 (100%)",
     "Shared Folder" : "分享資料夾",
     "Failed to create {albumName}." : "創建 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index 1846e6422..f84b469f8 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -23,6 +23,8 @@
     "Choose the root of your timeline" : "選擇您時間線的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Edit" : "編輯",
+    "Loading …" : "加載中 …",
     "Cancel" : "取消",
     "Delete" : "刪除",
     "Remove from album" : "從相簿移除",
@@ -46,6 +48,7 @@
     "Choose the root for the folders view" : "選擇資料夾檢視的根",
     "Your Timeline" : "您的時間線",
     "Failed to load some photos" : "未能加載一些照片",
+    "Share" : "分享",
     "Sidebar" : "側邊欄",
     "Processing … {n}/{m}" : "處理中 ... {n}/{m}",
     "{n} photos added to album" : "已新增 {n} 張照片至相簿",
@@ -103,7 +106,6 @@
     "Rename person" : "重新命名人",
     "Update" : "更新",
     "Failed to rename {oldName} to {name}." : "重新命名 {oldName} 為 {name} 失敗。",
-    "Loading …" : "加載中 …",
     "Merge {name} with person" : "將 {name} 與人合併",
     "Are you sure you want to merge {name} with {newName}?" : "您確定要將 {name} 與 {newName} 合併嗎？",
     "Too many failures, aborting" : "失敗次數過多，中止",
@@ -123,6 +125,37 @@
     "Share folder" : "分享資料夾",
     "Move left" : "向左移動",
     "Move right" : "向右移動",
+    "Reset" : "重設",
+    "Are you sure you want to continue?" : "您確定要繼續嗎？",
+    "Undo" : "撤消",
+    "Show original image" : "顯示原始圖像",
+    "Zoom out" : "縮小",
+    "Toggle zoom menu" : "切換縮放選項單",
+    "Watermark" : "水印",
+    "Resize" : "調整大小",
+    "is not an image" : "不是圖像",
+    "Square" : "方形",
+    "Ellipse" : "橢圓形",
+    "Classic TV" : "經典電視",
+    "Arrow" : "箭嘴",
+    "Blur" : "模糊",
+    "Un-flip Y" : "取消翻轉 X",
+    "Hue" : "色調",
+    "Image" : "圖像",
+    "Line" : "線形",
+    "Polygon" : "多邊形",
+    "Rectangle" : "長方形",
+    "Corner Radius" : "圓角半徑",
+    "Width in pixels" : "寬度像素",
+    "Reset to original image size" : "重設為原始圖像大小",
+    "+ Add watermark" : "+ 添加水印",
+    "Choose watermark type" : "選擇水印類型",
+    "Shadow" : "陰影",
+    "Horizontal" : "水平",
+    "Position" : "位置",
+    "Name is required." : "姓名為必填",
+    "Saved image size (width x height)" : "已保存的圖像大小（寬度 x 高度）",
+    "Actual size (100%)" : "實際大小 (100%)",
     "Shared Folder" : "分享資料夾",
     "Failed to create {albumName}." : "創建 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 9669aee5a..2a8d19587 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -25,6 +25,8 @@ OC.L10N.register(
     "Choose the root of your timeline" : "選擇您時間軸的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Edit" : "編輯",
+    "Loading …" : "正在載入……",
     "Cancel" : "取消",
     "Delete" : "刪除",
     "Remove from album" : "從相簿移除",
@@ -48,6 +50,7 @@ OC.L10N.register(
     "Choose the root for the folders view" : "選擇資料夾檢視的根",
     "Your Timeline" : "您的時間軸",
     "Failed to load some photos" : "載入部份照片時失敗",
+    "Share" : "分享",
     "Sidebar" : "側邊欄",
     "Processing … {n}/{m}" : "正在處理…… {n}/{m}",
     "{n} photos added to album" : "已新增 {n} 張照片至相簿",
@@ -105,7 +108,6 @@ OC.L10N.register(
     "Rename person" : "重新命名人",
     "Update" : "更新",
     "Failed to rename {oldName} to {name}." : "將 {oldName} 重新命名為 {name} 失敗。",
-    "Loading …" : "正在載入……",
     "Merge {name} with person" : "將  {name} 與人合併",
     "Are you sure you want to merge {name} with {newName}?" : "您真的想要將 {name} 與 {newName} 合併嗎？",
     "Too many failures, aborting" : "失敗次數過多，中止",
@@ -125,6 +127,38 @@ OC.L10N.register(
     "Share folder" : "分享資料夾",
     "Move left" : "向左移動",
     "Move right" : "向右移動",
+    "Reset" : "重設",
+    "Are you sure you want to continue?" : "您確定您想要繼續嗎？",
+    "Undo" : "復原",
+    "Show original image" : "顯示原始影像",
+    "Zoom out" : "縮小",
+    "Toggle zoom menu" : "切換縮放選單",
+    "Watermark" : "水印",
+    "Resize" : "調整大小",
+    "is not an image" : "不是圖片",
+    "Square" : "方形",
+    "Ellipse" : "橢圓",
+    "Classic TV" : "經典電視",
+    "Arrow" : "箭頭",
+    "Blur" : "模糊",
+    "Un-flip Y" : "取消翻轉 Y",
+    "Hue" : "色相",
+    "Image" : "圖片",
+    "Line" : "線段",
+    "Polygon" : "多邊形",
+    "Rectangle" : "矩形",
+    "Corner Radius" : "圓角半徑",
+    "Width in pixels" : "像素寬度",
+    "Reset to original image size" : "重設為原始圖片大小",
+    "+ Add watermark" : "+ 新增水印",
+    "Choose watermark type" : "選擇水印類型",
+    "Padding" : "填充",
+    "Shadow" : "陰影",
+    "Horizontal" : "水平",
+    "Position" : "位置",
+    "Name is required." : "名稱為必填。",
+    "Saved image size (width x height)" : "儲存的圖片大小（寬度 x 高度）",
+    "Actual size (100%)" : "實際大小 (100%)",
     "Shared Folder" : "已分享的資料夾",
     "Failed to create {albumName}." : "建立 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 637392692..aa24ec4f3 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -23,6 +23,8 @@
     "Choose the root of your timeline" : "選擇您時間軸的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Edit" : "編輯",
+    "Loading …" : "正在載入……",
     "Cancel" : "取消",
     "Delete" : "刪除",
     "Remove from album" : "從相簿移除",
@@ -46,6 +48,7 @@
     "Choose the root for the folders view" : "選擇資料夾檢視的根",
     "Your Timeline" : "您的時間軸",
     "Failed to load some photos" : "載入部份照片時失敗",
+    "Share" : "分享",
     "Sidebar" : "側邊欄",
     "Processing … {n}/{m}" : "正在處理…… {n}/{m}",
     "{n} photos added to album" : "已新增 {n} 張照片至相簿",
@@ -103,7 +106,6 @@
     "Rename person" : "重新命名人",
     "Update" : "更新",
     "Failed to rename {oldName} to {name}." : "將 {oldName} 重新命名為 {name} 失敗。",
-    "Loading …" : "正在載入……",
     "Merge {name} with person" : "將  {name} 與人合併",
     "Are you sure you want to merge {name} with {newName}?" : "您真的想要將 {name} 與 {newName} 合併嗎？",
     "Too many failures, aborting" : "失敗次數過多，中止",
@@ -123,6 +125,38 @@
     "Share folder" : "分享資料夾",
     "Move left" : "向左移動",
     "Move right" : "向右移動",
+    "Reset" : "重設",
+    "Are you sure you want to continue?" : "您確定您想要繼續嗎？",
+    "Undo" : "復原",
+    "Show original image" : "顯示原始影像",
+    "Zoom out" : "縮小",
+    "Toggle zoom menu" : "切換縮放選單",
+    "Watermark" : "水印",
+    "Resize" : "調整大小",
+    "is not an image" : "不是圖片",
+    "Square" : "方形",
+    "Ellipse" : "橢圓",
+    "Classic TV" : "經典電視",
+    "Arrow" : "箭頭",
+    "Blur" : "模糊",
+    "Un-flip Y" : "取消翻轉 Y",
+    "Hue" : "色相",
+    "Image" : "圖片",
+    "Line" : "線段",
+    "Polygon" : "多邊形",
+    "Rectangle" : "矩形",
+    "Corner Radius" : "圓角半徑",
+    "Width in pixels" : "像素寬度",
+    "Reset to original image size" : "重設為原始圖片大小",
+    "+ Add watermark" : "+ 新增水印",
+    "Choose watermark type" : "選擇水印類型",
+    "Padding" : "填充",
+    "Shadow" : "陰影",
+    "Horizontal" : "水平",
+    "Position" : "位置",
+    "Name is required." : "名稱為必填。",
+    "Saved image size (width x height)" : "儲存的圖片大小（寬度 x 高度）",
+    "Actual size (100%)" : "實際大小 (100%)",
     "Shared Folder" : "已分享的資料夾",
     "Failed to create {albumName}." : "建立 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",

From 2ca75b5a63bf445361027754309d56a3c39d3cee Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 7 Nov 2022 23:00:44 -0800
Subject: [PATCH 018/163] viewer: lower res to 1024

---
 src/components/Viewer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 8dddc41d7..75934c9b9 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -572,7 +572,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
 
   /** Get base data object */
   private getItemData(photo: IPhoto) {
-    let previewUrl = getPreviewUrl(photo, false, 2048);
+    let previewUrl = getPreviewUrl(photo, false, 1024);
 
     // Preview aren't animated
     if (photo.mimetype === "image/gif") {

From 067624d2f572bec32b4788a998b5019169a32622 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 8 Nov 2022 03:45:59 -0800
Subject: [PATCH 019/163] viewer: upstream video logic

---
 src/components/PsVideo.ts | 231 ++++++++++++++++++++++++++++++++++++++
 src/components/Viewer.vue |  78 ++-----------
 2 files changed, 242 insertions(+), 67 deletions(-)
 create mode 100644 src/components/PsVideo.ts

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
new file mode 100644
index 000000000..1f490142d
--- /dev/null
+++ b/src/components/PsVideo.ts
@@ -0,0 +1,231 @@
+import PhotoSwipe from "photoswipe";
+
+/**
+ * Check if slide has video content
+ *
+ * @param {Slide|Content} content Slide or Content object
+ * @returns Boolean
+ */
+function isVideoContent(content): boolean {
+  return content?.data?.type === "video";
+}
+
+class VideoContentSetup {
+  constructor(lightbox: PhotoSwipe, private options) {
+    this.initLightboxEvents(lightbox);
+    lightbox.on("init", () => {
+      this.initPswpEvents(lightbox);
+    });
+  }
+
+  initLightboxEvents(lightbox: PhotoSwipe) {
+    lightbox.on("contentLoad", this.onContentLoad.bind(this));
+    lightbox.on("contentDestroy", this.onContentDestroy.bind(this));
+    lightbox.on("contentActivate", this.onContentActivate.bind(this));
+    lightbox.on("contentDeactivate", this.onContentDeactivate.bind(this));
+    lightbox.on("contentAppend", this.onContentAppend.bind(this));
+    lightbox.on("contentResize", this.onContentResize.bind(this));
+
+    lightbox.addFilter(
+      "isKeepingPlaceholder",
+      this.isKeepingPlaceholder.bind(this)
+    );
+    lightbox.addFilter("isContentZoomable", this.isContentZoomable.bind(this));
+    lightbox.addFilter(
+      "useContentPlaceholder",
+      this.useContentPlaceholder.bind(this)
+    );
+
+    lightbox.addFilter("domItemData", (itemData, element, linkEl) => {
+      return itemData;
+    });
+  }
+
+  initPswpEvents(pswp: PhotoSwipe) {
+    // Prevent draggin when pointer is in bottom part of the video
+    // todo: add option for this
+    pswp.on("pointerDown", (e) => {
+      const slide = pswp.currSlide;
+      if (isVideoContent(slide) && this.options.preventDragOffset) {
+        const origEvent = e.originalEvent;
+        if (origEvent.type === "pointerdown") {
+          const videoHeight = Math.ceil(slide.height * slide.currZoomLevel);
+          const verticalEnding = videoHeight + slide.bounds.center.y;
+          const pointerYPos = origEvent.pageY - pswp.offset.y;
+          if (
+            pointerYPos > verticalEnding - this.options.preventDragOffset &&
+            pointerYPos < verticalEnding
+          ) {
+            e.preventDefault();
+          }
+        }
+      }
+    });
+
+    // do not append video on nearby slides
+    pswp.on("appendHeavy", (e) => {
+      if (isVideoContent(e.slide) && !e.slide.isActive) {
+        e.preventDefault();
+      }
+    });
+
+    pswp.on("close", () => {
+      if (isVideoContent(pswp.currSlide.content)) {
+        // Switch from zoom to fade closing transition,
+        // as zoom transition is choppy for videos
+        if (
+          !pswp.options.showHideAnimationType ||
+          pswp.options.showHideAnimationType === "zoom"
+        ) {
+          pswp.options.showHideAnimationType = "fade";
+        }
+
+        // pause video when closing
+        this.pauseVideo(pswp.currSlide.content);
+      }
+    });
+  }
+
+  onContentDestroy({ content }) {
+    if (isVideoContent(content)) {
+      if (content._videoPosterImg) {
+        content._videoPosterImg.onload = content._videoPosterImg.onerror = null;
+        content._videoPosterImg = null;
+      }
+    }
+  }
+
+  onContentResize(e) {
+    if (isVideoContent(e.content)) {
+      e.preventDefault();
+
+      const width = e.width;
+      const height = e.height;
+      const content = e.content;
+
+      if (content.element) {
+        content.element.style.width = width + "px";
+        content.element.style.height = height + "px";
+      }
+
+      if (content.slide && content.slide.placeholder) {
+        // override placeholder size, so it more accurately matches the video
+        const placeholderElStyle = content.slide.placeholder.element.style;
+        placeholderElStyle.transform = "none";
+        placeholderElStyle.width = width + "px";
+        placeholderElStyle.height = height + "px";
+      }
+    }
+  }
+
+  isKeepingPlaceholder(isZoomable, content) {
+    if (isVideoContent(content)) {
+      return false;
+    }
+    return isZoomable;
+  }
+
+  isContentZoomable(isZoomable, content) {
+    if (isVideoContent(content)) {
+      return false;
+    }
+    return isZoomable;
+  }
+
+  onContentActivate({ content }) {
+    if (isVideoContent(content) && this.options.autoplay) {
+      this.playVideo(content);
+    }
+  }
+
+  onContentDeactivate({ content }) {
+    if (isVideoContent(content)) {
+      this.pauseVideo(content);
+    }
+  }
+
+  onContentAppend(e) {
+    if (isVideoContent(e.content)) {
+      e.preventDefault();
+      e.content.isAttached = true;
+      e.content.appendImage();
+    }
+  }
+
+  onContentLoad(e) {
+    const content = e.content; // todo: videocontent
+
+    if (!isVideoContent(e.content)) {
+      return;
+    }
+
+    // stop default content load
+    e.preventDefault();
+
+    if (content.element) {
+      return;
+    }
+
+    content.state = "loading";
+    content.type = "video"; // TODO: move this to pswp core?
+
+    content.element = document.createElement("video");
+
+    if (this.options.videoAttributes) {
+      for (let key in this.options.videoAttributes) {
+        content.element.setAttribute(
+          key,
+          this.options.videoAttributes[key] || ""
+        );
+      }
+    }
+
+    content.element.setAttribute("poster", content.data.msrc);
+
+    this.preloadVideoPoster(content, content.data.msrc);
+
+    content.element.style.position = "absolute";
+    content.element.style.left = 0;
+    content.element.style.top = 0;
+
+    if (content.data.src) {
+      content.element.src = content.data.src;
+    }
+  }
+
+  preloadVideoPoster(content, src) {
+    if (!content._videoPosterImg && src) {
+      content._videoPosterImg = new Image();
+      content._videoPosterImg.src = src;
+      if (content._videoPosterImg.complete) {
+        content.onLoaded();
+      } else {
+        content._videoPosterImg.onload = content._videoPosterImg.onerror =
+          () => {
+            content.onLoaded();
+          };
+      }
+    }
+  }
+
+  playVideo(content) {
+    if (content.element) {
+      content.element.play();
+    }
+  }
+
+  pauseVideo(content) {
+    if (content.element) {
+      content.element.pause();
+    }
+  }
+
+  useContentPlaceholder(usePlaceholder, content) {
+    if (isVideoContent(content)) {
+      return true;
+    }
+    return usePlaceholder;
+  }
+}
+
+export default VideoContentSetup;
diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 75934c9b9..3c3aab7b2 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -115,8 +115,7 @@ import { getDownloadLink } from "../services/DavRequests";
 import PhotoSwipe, { PhotoSwipeOptions } from "photoswipe";
 import "photoswipe/style.css";
 
-import videojs from "video.js";
-import "video.js/dist/video-js.css";
+import PsVideo from "./PsVideo";
 
 import ShareIcon from "vue-material-design-icons/ShareVariant.vue";
 import DeleteIcon from "vue-material-design-icons/Delete.vue";
@@ -357,63 +356,10 @@ export default class Viewer extends Mixins(GlobalMixin) {
     });
 
     // Video support
-    this.photoswipe.on("contentLoad", (e) => {
-      const { content, isLazy } = e;
-      if ((content.data?.photo?.flag || 0) & this.c.FLAG_IS_VIDEO) {
-        e.preventDefault();
-
-        content.type = "video";
-
-        // Create video element
-        content.videoElement = document.createElement("video") as any;
-        content.videoElement.setAttribute("preload", "none");
-        content.videoElement.classList.add("video-js");
-
-        // Get DAV URL for video
-        const url = getDownloadLink(content.data.photo);
-
-        // Add child with source element
-        const source = document.createElement("source");
-        source.src = generateUrl(url);
-        source.type = content.data.photo.mimetype;
-        content.videoElement.appendChild(source);
-
-        // Create container div
-        content.element = document.createElement("div");
-        content.element.appendChild(content.videoElement);
-
-        // Init videojs
-        videojs(content.videoElement, {
-          fluid: true,
-          autoplay: content.data.playvideo,
-          controls: true,
-          preload: "none",
-          muted: true,
-          html5: {
-            vhs: {
-              withCredentials: true,
-            },
-          },
-        });
-      }
-    });
-
-    // Play video on open slide
-    this.photoswipe.on("slideActivate", (e) => {
-      const { slide } = e;
-      if ((slide.data?.photo?.flag || 0) & this.c.FLAG_IS_VIDEO) {
-        setTimeout(() => {
-          slide.content.element.querySelector("video")?.play();
-        }, 500);
-      }
-    });
-
-    // Pause video on close slide
-    this.photoswipe.on("slideDeactivate", (e) => {
-      const { slide } = e;
-      if ((slide.data?.photo?.flag || 0) & this.c.FLAG_IS_VIDEO) {
-        slide.content.element.querySelector("video")?.pause();
-      }
+    new PsVideo(this.photoswipe, {
+      videoAttributes: { controls: "", playsinline: "", preload: "none" },
+      autoplay: true,
+      preventDragOffset: 40,
     });
 
     return this.photoswipe;
@@ -511,10 +457,8 @@ export default class Viewer extends Mixins(GlobalMixin) {
 
       // Get thumb image
       const thumbSrc: string =
-        photo.flag & this.c.FLAG_IS_VIDEO
-          ? undefined
-          : this.thumbElem(photo)?.getAttribute("src") ||
-            getPreviewUrl(photo, false, 256);
+        this.thumbElem(photo)?.getAttribute("src") ||
+        getPreviewUrl(photo, false, 256);
 
       // Get full image
       return {
@@ -573,10 +517,13 @@ export default class Viewer extends Mixins(GlobalMixin) {
   /** Get base data object */
   private getItemData(photo: IPhoto) {
     let previewUrl = getPreviewUrl(photo, false, 1024);
+    const isvideo = photo.flag & this.c.FLAG_IS_VIDEO;
 
     // Preview aren't animated
     if (photo.mimetype === "image/gif") {
       previewUrl = getDownloadLink(photo);
+    } else if (isvideo) {
+      previewUrl = generateUrl(getDownloadLink(photo));
     }
 
     return {
@@ -585,6 +532,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
       height: photo.h || undefined,
       thumbCropped: true,
       photo: photo,
+      type: isvideo ? "video" : "image",
     };
   }
 
@@ -883,10 +831,6 @@ export default class Viewer extends Mixins(GlobalMixin) {
   width: inherit;
 }
 
-:deep .video-js .vjs-big-play-button {
-  display: none;
-}
-
 :deep .pswp {
   .pswp__zoom-wrap {
     width: 100%;

From 438d9716c4ffb5b9c439c87e477e1bab04364ed1 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 8 Nov 2022 04:52:14 -0800
Subject: [PATCH 020/163] Restore vjs

---
 src/components/PsVideo.ts | 52 ++++++++++++++++++++++++++-------------
 src/components/Viewer.vue |  4 +++
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 1f490142d..982decea5 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -1,4 +1,6 @@
 import PhotoSwipe from "photoswipe";
+import videojs from "video.js";
+import "video.js/dist/video-js.min.css";
 
 /**
  * Check if slide has video content
@@ -64,8 +66,25 @@ class VideoContentSetup {
 
     // do not append video on nearby slides
     pswp.on("appendHeavy", (e) => {
-      if (isVideoContent(e.slide) && !e.slide.isActive) {
-        e.preventDefault();
+      if (isVideoContent(e.slide)) {
+        if (!e.slide.isActive) {
+          e.preventDefault();
+        } else {
+          const content = <any>e.slide.content;
+          content.videojs = videojs(content.videoElement, {
+            fluid: true,
+            autoplay: true,
+            controls: true,
+            sources: [{ src: e.slide.data.src }],
+            preload: "metadata",
+            inactivityTimeout: 0,
+            html5: {
+              vhs: {
+                withCredentials: true,
+              },
+            },
+          });
+        }
       }
     });
 
@@ -169,28 +188,31 @@ class VideoContentSetup {
     content.state = "loading";
     content.type = "video"; // TODO: move this to pswp core?
 
-    content.element = document.createElement("video");
+    content.videoElement = document.createElement("video");
+    content.videoElement.className = "video-js";
+    content.videoElement.setAttribute("controls", "true");
 
     if (this.options.videoAttributes) {
       for (let key in this.options.videoAttributes) {
-        content.element.setAttribute(
+        content.videoElement.setAttribute(
           key,
           this.options.videoAttributes[key] || ""
         );
       }
     }
 
-    content.element.setAttribute("poster", content.data.msrc);
-
-    this.preloadVideoPoster(content, content.data.msrc);
-
+    content.element = document.createElement("div");
     content.element.style.position = "absolute";
     content.element.style.left = 0;
     content.element.style.top = 0;
+    content.element.style.width = "100%";
+    content.element.style.height = "100%";
 
-    if (content.data.src) {
-      content.element.src = content.data.src;
-    }
+    // content.videoElement.setAttribute("poster", content.data.msrc);
+    // this.preloadVideoPoster(content, content.data.msrc);
+    content.onLoaded();
+
+    content.element.appendChild(content.videoElement);
   }
 
   preloadVideoPoster(content, src) {
@@ -209,15 +231,11 @@ class VideoContentSetup {
   }
 
   playVideo(content) {
-    if (content.element) {
-      content.element.play();
-    }
+    content.videojs?.play();
   }
 
   pauseVideo(content) {
-    if (content.element) {
-      content.element.pause();
-    }
+    content.videojs?.pause();
   }
 
   useContentPlaceholder(usePlaceholder, content) {
diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 3c3aab7b2..5e14d37be 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -831,6 +831,10 @@ export default class Viewer extends Mixins(GlobalMixin) {
   width: inherit;
 }
 
+:deep .video-js .vjs-big-play-button {
+  display: none;
+}
+
 :deep .pswp {
   .pswp__zoom-wrap {
     width: 100%;

From 32966d75afcd3724c20347b363641bccb181f9bb Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 8 Nov 2022 16:41:53 -0800
Subject: [PATCH 021/163] readme: philosophical update

---
 README.md        | 2 +-
 appinfo/info.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 97a6a9868..3faa36115 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 [![Gitter](https://img.shields.io/gitter/room/pulsejet/memories)](https://gitter.im/pulsejet/memories)
 [![GitHub issues](https://img.shields.io/github/issues/pulsejet/memories)](https://github.com/pulsejet/memories/issues)
 
-Memories is a photo management app for Nextcloud with advanced features including:
+Memories is a batteries-included photo management solution for Nextcloud with advanced features including:
 
 - **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.
 - **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 798a7de53..53c48e0ff 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -7,7 +7,7 @@
 <description><![CDATA[
 # Memories
 
-Memories is a photo management app for Nextcloud with advanced features including:
+Memories is a batteries-included photo management solution for Nextcloud with advanced features including:
 
 - **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.
 - **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.

From 686a9fc35a92cabe95eb6b1ae488f01d69378071 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Wed, 9 Nov 2022 03:11:46 +0000
Subject: [PATCH 022/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/af.js       | 14 +++++++-
 l10n/af.json     | 14 +++++++-
 l10n/an.js       |  5 ++-
 l10n/an.json     |  5 ++-
 l10n/ar.js       | 17 ++++++++-
 l10n/ar.json     | 17 ++++++++-
 l10n/ast.js      | 10 +++++-
 l10n/ast.json    | 10 +++++-
 l10n/az.js       |  6 +++-
 l10n/az.json     |  6 +++-
 l10n/bg.js       | 89 +++++++++++++++++++++++++++++++++++++++++++++
 l10n/bg.json     | 89 +++++++++++++++++++++++++++++++++++++++++++++
 l10n/bn_BD.js    |  7 +++-
 l10n/bn_BD.json  |  7 +++-
 l10n/br.js       |  8 ++++-
 l10n/br.json     |  8 ++++-
 l10n/bs.js       | 20 +++++++++++
 l10n/bs.json     | 18 ++++++++++
 l10n/ca.js       | 91 +++++++++++++++++++++++++++++++++++++++++++++-
 l10n/ca.json     | 91 +++++++++++++++++++++++++++++++++++++++++++++-
 l10n/cs.js       | 93 ++++++++++++++++++++++++++++++++++++++++++++++++
 l10n/cs.json     | 93 ++++++++++++++++++++++++++++++++++++++++++++++++
 l10n/cy_GB.js    |  7 +++-
 l10n/cy_GB.json  |  7 +++-
 l10n/da.js       | 17 +++++++++
 l10n/da.json     | 17 +++++++++
 l10n/de.js       | 86 ++++++++++++++++++++++++++++++++++++++++++++
 l10n/de.json     | 86 ++++++++++++++++++++++++++++++++++++++++++++
 l10n/de_DE.js    | 91 ++++++++++++++++++++++++++++++++++++++++++++++
 l10n/de_DE.json  | 91 ++++++++++++++++++++++++++++++++++++++++++++++
 l10n/el.js       | 20 ++++++++++-
 l10n/el.json     | 20 ++++++++++-
 l10n/en_GB.js    | 14 +++++++-
 l10n/en_GB.json  | 14 +++++++-
 l10n/eo.js       | 14 +++++++-
 l10n/eo.json     | 14 +++++++-
 l10n/es.js       | 90 ++++++++++++++++++++++++++++++++++++++++++++++
 l10n/es.json     | 90 ++++++++++++++++++++++++++++++++++++++++++++++
 l10n/es_419.js   | 13 ++++++-
 l10n/es_419.json | 13 ++++++-
 l10n/es_AR.js    | 12 ++++++-
 l10n/es_AR.json  | 12 ++++++-
 l10n/es_CL.js    | 10 ++++++
 l10n/es_CL.json  | 10 ++++++
 l10n/es_CO.js    | 10 ++++++
 l10n/es_CO.json  | 10 ++++++
 l10n/es_CR.js    | 10 ++++++
 l10n/es_CR.json  | 10 ++++++
 l10n/es_DO.js    | 10 ++++++
 l10n/es_DO.json  | 10 ++++++
 l10n/es_EC.js    | 10 ++++++
 l10n/es_EC.json  | 10 ++++++
 l10n/es_GT.js    | 10 ++++++
 l10n/es_GT.json  | 10 ++++++
 l10n/es_HN.js    | 10 ++++++
 l10n/es_HN.json  | 10 ++++++
 l10n/es_MX.js    | 14 +++++++-
 l10n/es_MX.json  | 14 +++++++-
 l10n/es_NI.js    | 10 ++++++
 l10n/es_NI.json  | 10 ++++++
 l10n/es_PA.js    | 10 ++++++
 l10n/es_PA.json  | 10 ++++++
 l10n/es_PE.js    | 10 ++++++
 l10n/es_PE.json  | 10 ++++++
 l10n/es_PR.js    | 10 ++++++
 l10n/es_PR.json  | 10 ++++++
 l10n/es_PY.js    | 10 ++++++
 l10n/es_PY.json  | 10 ++++++
 l10n/es_SV.js    | 10 ++++++
 l10n/es_SV.json  | 10 ++++++
 l10n/es_UY.js    | 10 ++++++
 l10n/es_UY.json  | 10 ++++++
 l10n/et_EE.js    |  7 ++++
 l10n/et_EE.json  |  7 ++++
 l10n/eu.js       | 77 +++++++++++++++++++++++++++++++++++++++
 l10n/eu.json     | 77 +++++++++++++++++++++++++++++++++++++++
 l10n/fa.js       | 12 ++++++-
 l10n/fa.json     | 12 ++++++-
 l10n/fi.js       | 43 ++++++++++++++++++++++
 l10n/fi.json     | 43 ++++++++++++++++++++++
 l10n/fr.js       | 77 +++++++++++++++++++++++++++++++++++++++
 l10n/fr.json     | 77 +++++++++++++++++++++++++++++++++++++++
 l10n/gd.js       |  4 ++-
 l10n/gd.json     |  4 ++-
 l10n/gl.js       | 18 +++++++++-
 l10n/gl.json     | 18 +++++++++-
 l10n/he.js       | 16 ++++++++-
 l10n/he.json     | 16 ++++++++-
 l10n/hr.js       | 17 ++++++++-
 l10n/hr.json     | 17 ++++++++-
 l10n/hu.js       | 73 +++++++++++++++++++++++++++++++++++++
 l10n/hu.json     | 73 +++++++++++++++++++++++++++++++++++++
 l10n/hy.js       |  5 ++-
 l10n/hy.json     |  5 ++-
 l10n/ia.js       |  7 +++-
 l10n/ia.json     |  7 +++-
 l10n/id.js       |  7 +++-
 l10n/id.json     |  7 +++-
 l10n/is.js       | 17 ++++++++-
 l10n/is.json     | 17 ++++++++-
 l10n/it.js       | 20 ++++++++++-
 l10n/it.json     | 20 ++++++++++-
 l10n/ja.js       | 29 ++++++++++++++-
 l10n/ja.json     | 29 ++++++++++++++-
 l10n/ka_GE.js    |  9 +++++
 l10n/ka_GE.json  |  9 +++++
 l10n/kab.js      |  5 ++-
 l10n/kab.json    |  5 ++-
 l10n/km.js       |  7 +++-
 l10n/km.json     |  7 +++-
 l10n/kn.js       | 20 +++++++++++
 l10n/kn.json     | 18 ++++++++++
 l10n/ko.js       | 16 ++++++++-
 l10n/ko.json     | 16 ++++++++-
 l10n/lb.js       |  7 +++-
 l10n/lb.json     |  7 +++-
 l10n/lo.js       |  6 +++-
 l10n/lo.json     |  6 +++-
 l10n/lt_LT.js    | 20 +++++++++++
 l10n/lt_LT.json  | 20 +++++++++++
 l10n/lv.js       | 14 +++++++-
 l10n/lv.json     | 14 +++++++-
 l10n/mk.js       | 37 +++++++++++++++++++
 l10n/mk.json     | 37 +++++++++++++++++++
 l10n/mn.js       |  6 ++++
 l10n/mn.json     |  6 ++++
 l10n/ms_MY.js    |  4 ++-
 l10n/ms_MY.json  |  4 ++-
 l10n/nb.js       | 35 +++++++++++++++++-
 l10n/nb.json     | 35 +++++++++++++++++-
 l10n/nl.js       | 18 +++++++++-
 l10n/nl.json     | 18 +++++++++-
 l10n/nn_NO.js    |  6 +++-
 l10n/nn_NO.json  |  6 +++-
 l10n/oc.js       | 14 +++++++-
 l10n/oc.json     | 14 +++++++-
 l10n/pl.js       | 69 +++++++++++++++++++++++++++++++++++
 l10n/pl.json     | 69 +++++++++++++++++++++++++++++++++++
 l10n/ps.js       |  5 ++-
 l10n/ps.json     |  5 ++-
 l10n/pt_BR.js    | 69 +++++++++++++++++++++++++++++++++++
 l10n/pt_BR.json  | 69 +++++++++++++++++++++++++++++++++++
 l10n/pt_PT.js    | 11 ++++++
 l10n/pt_PT.json  | 11 ++++++
 l10n/ro.js       |  6 ++++
 l10n/ro.json     |  6 ++++
 l10n/ru.js       | 25 +++++++++++++
 l10n/ru.json     | 25 +++++++++++++
 l10n/sc.js       | 13 ++++++-
 l10n/sc.json     | 13 ++++++-
 l10n/si.js       |  4 ++-
 l10n/si.json     |  4 ++-
 l10n/sk.js       | 67 ++++++++++++++++++++++++++++++++++
 l10n/sk.json     | 67 ++++++++++++++++++++++++++++++++++
 l10n/sl.js       | 17 ++++++++-
 l10n/sl.json     | 17 ++++++++-
 l10n/sq.js       |  7 ++++
 l10n/sq.json     |  7 ++++
 l10n/sr.js       | 12 ++++++-
 l10n/sr.json     | 12 ++++++-
 l10n/sv.js       |  9 +++++
 l10n/sv.json     |  9 +++++
 l10n/ta.js       |  5 ++-
 l10n/ta.json     |  5 ++-
 l10n/th.js       |  4 +++
 l10n/th.json     |  4 +++
 l10n/tr.js       | 61 +++++++++++++++++++++++++++++++
 l10n/tr.json     | 61 +++++++++++++++++++++++++++++++
 l10n/ug.js       |  3 +-
 l10n/ug.json     |  3 +-
 l10n/uk.js       | 60 +++++++++++++++++++++++++++++++
 l10n/uk.json     | 60 +++++++++++++++++++++++++++++++
 l10n/ur_PK.js    |  3 +-
 l10n/ur_PK.json  |  3 +-
 l10n/uz.js       |  4 ++-
 l10n/uz.json     |  4 ++-
 l10n/vi.js       |  6 ++++
 l10n/vi.json     |  6 ++++
 l10n/zh_CN.js    | 11 ++++++
 l10n/zh_CN.json  | 11 ++++++
 l10n/zh_HK.js    | 60 +++++++++++++++++++++++++++++++
 l10n/zh_HK.json  | 60 +++++++++++++++++++++++++++++++
 l10n/zh_TW.js    | 59 ++++++++++++++++++++++++++++++
 l10n/zh_TW.json  | 59 ++++++++++++++++++++++++++++++
 184 files changed, 4146 insertions(+), 92 deletions(-)
 create mode 100644 l10n/bs.js
 create mode 100644 l10n/bs.json
 create mode 100644 l10n/kn.js
 create mode 100644 l10n/kn.json

diff --git a/l10n/af.js b/l10n/af.js
index f0f0a36dd..50710f315 100644
--- a/l10n/af.js
+++ b/l10n/af.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etikette",
     "Maps" : "Kaarte",
     "Settings" : "Instellings",
+    "Unsaved changes" : "Onbewaarde veranderinge",
+    "Edit" : "Wysig",
     "Loading …" : "Laai …",
     "Cancel" : "Kanselleer",
     "Delete" : "Skrap",
     "Download" : "Laai af",
     "Favorite" : "Gunsteling",
     "View in folder" : "Vertoon in gids",
+    "Share" : "Deel",
     "Public link" : "Openbare skakel",
     "Back" : "Terug",
     "Save" : "Bewaar",
@@ -23,6 +26,15 @@ OC.L10N.register(
     "Hour" : "Uur",
     "Name" : "Naam",
     "Update" : "Werk by",
-    "Refresh" : "Verfris"
+    "Refresh" : "Verfris",
+    "Reset" : "Herstel",
+    "Continue" : "Gaan voort",
+    "Original" : "Oorspronklik",
+    "Custom" : "Eie",
+    "Value" : "Waarde",
+    "Text" : "Teks",
+    "Size" : "Grootte",
+    "Position" : "Posisie",
+    "Quality" : "Kwaliteit"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/af.json b/l10n/af.json
index 3d393e4da..dc1d40d82 100644
--- a/l10n/af.json
+++ b/l10n/af.json
@@ -6,12 +6,15 @@
     "Tags" : "Etikette",
     "Maps" : "Kaarte",
     "Settings" : "Instellings",
+    "Unsaved changes" : "Onbewaarde veranderinge",
+    "Edit" : "Wysig",
     "Loading …" : "Laai …",
     "Cancel" : "Kanselleer",
     "Delete" : "Skrap",
     "Download" : "Laai af",
     "Favorite" : "Gunsteling",
     "View in folder" : "Vertoon in gids",
+    "Share" : "Deel",
     "Public link" : "Openbare skakel",
     "Back" : "Terug",
     "Save" : "Bewaar",
@@ -21,6 +24,15 @@
     "Hour" : "Uur",
     "Name" : "Naam",
     "Update" : "Werk by",
-    "Refresh" : "Verfris"
+    "Refresh" : "Verfris",
+    "Reset" : "Herstel",
+    "Continue" : "Gaan voort",
+    "Original" : "Oorspronklik",
+    "Custom" : "Eie",
+    "Value" : "Waarde",
+    "Text" : "Teks",
+    "Size" : "Grootte",
+    "Position" : "Posisie",
+    "Quality" : "Kwaliteit"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/an.js b/l10n/an.js
index 2b059400f..e70430d81 100644
--- a/l10n/an.js
+++ b/l10n/an.js
@@ -8,7 +8,10 @@ OC.L10N.register(
     "Delete" : "Borrar",
     "Download" : "Escargar",
     "Favorite" : "Favorito",
+    "Share" : "Compartir",
     "Back" : "Ta zaga",
-    "Name" : "Nombre"
+    "Name" : "Nombre",
+    "Continue" : "Continar",
+    "Size" : "Grandaria"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/an.json b/l10n/an.json
index 3f4c876c6..909a91740 100644
--- a/l10n/an.json
+++ b/l10n/an.json
@@ -6,7 +6,10 @@
     "Delete" : "Borrar",
     "Download" : "Escargar",
     "Favorite" : "Favorito",
+    "Share" : "Compartir",
     "Back" : "Ta zaga",
-    "Name" : "Nombre"
+    "Name" : "Nombre",
+    "Continue" : "Continar",
+    "Size" : "Grandaria"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ar.js b/l10n/ar.js
index 63eefc8e8..e75d01a94 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -9,12 +9,14 @@ OC.L10N.register(
     "Tags" : "الوسوم",
     "Maps" : "الخرائط",
     "Settings" : "الإعدادات",
+    "Edit" : "تعديل",
     "Loading …" : "جاري التحميل …",
     "Cancel" : "إلغاء",
     "Delete" : "إزالة",
     "Download" : "تنزيل",
     "Favorite" : "المفضلة",
     "View in folder" : "اعرض في المجلد",
+    "Share" : "مشاركة",
     "Copy public link" : "نسخ الرابط العام",
     "Back" : "العودة",
     "Save" : "Save",
@@ -24,6 +26,19 @@ OC.L10N.register(
     "Hour" : "الساعة",
     "Name" : "الاسم",
     "Update" : "تحديث",
-    "Refresh" : "إنعاش"
+    "Refresh" : "إنعاش",
+    "Reset" : "إعادة الضبط",
+    "Continue" : "متابعة",
+    "Undo" : "تراجع",
+    "Redo" : "إعادة",
+    "Original" : "أصلي",
+    "Custom" : "مخصّص",
+    "Value" : "القيمة",
+    "Line" : "خط",
+    "Text" : "نص",
+    "Size" : "الحجم",
+    "Position" : "الموقع",
+    "Name is required." : "حقل الاسم مطلوب",
+    "Quality" : "الجودة"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/l10n/ar.json b/l10n/ar.json
index 80b4f6b0c..547d5c375 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -7,12 +7,14 @@
     "Tags" : "الوسوم",
     "Maps" : "الخرائط",
     "Settings" : "الإعدادات",
+    "Edit" : "تعديل",
     "Loading …" : "جاري التحميل …",
     "Cancel" : "إلغاء",
     "Delete" : "إزالة",
     "Download" : "تنزيل",
     "Favorite" : "المفضلة",
     "View in folder" : "اعرض في المجلد",
+    "Share" : "مشاركة",
     "Copy public link" : "نسخ الرابط العام",
     "Back" : "العودة",
     "Save" : "Save",
@@ -22,6 +24,19 @@
     "Hour" : "الساعة",
     "Name" : "الاسم",
     "Update" : "تحديث",
-    "Refresh" : "إنعاش"
+    "Refresh" : "إنعاش",
+    "Reset" : "إعادة الضبط",
+    "Continue" : "متابعة",
+    "Undo" : "تراجع",
+    "Redo" : "إعادة",
+    "Original" : "أصلي",
+    "Custom" : "مخصّص",
+    "Value" : "القيمة",
+    "Line" : "خط",
+    "Text" : "نص",
+    "Size" : "الحجم",
+    "Position" : "الموقع",
+    "Name is required." : "حقل الاسم مطلوب",
+    "Quality" : "الجودة"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/l10n/ast.js b/l10n/ast.js
index d64396642..fbe39e686 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -8,12 +8,14 @@ OC.L10N.register(
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
     "Settings" : "Settings",
+    "Edit" : "Editar",
     "Loading …" : "Cargando...",
     "Cancel" : "Encaboxar",
     "Delete" : "Desaniciar",
     "Download" : "Baxar",
     "Favorite" : "Marcar como favoritu",
     "View in folder" : "Ver na carpeta",
+    "Share" : "Share",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -22,6 +24,12 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nome",
     "Update" : "Anovar",
-    "Refresh" : "Refrescar"
+    "Refresh" : "Refrescar",
+    "Continue" : "Siguir",
+    "Undo" : "Desfacer",
+    "Custom" : "Personalizáu",
+    "Text" : "Testu",
+    "Size" : "Tamañu",
+    "Position" : "Posición"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ast.json b/l10n/ast.json
index 024a07df4..ec821229d 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -6,12 +6,14 @@
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
     "Settings" : "Settings",
+    "Edit" : "Editar",
     "Loading …" : "Cargando...",
     "Cancel" : "Encaboxar",
     "Delete" : "Desaniciar",
     "Download" : "Baxar",
     "Favorite" : "Marcar como favoritu",
     "View in folder" : "Ver na carpeta",
+    "Share" : "Share",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -20,6 +22,12 @@
     "Hour" : "Hora",
     "Name" : "Nome",
     "Update" : "Anovar",
-    "Refresh" : "Refrescar"
+    "Refresh" : "Refrescar",
+    "Continue" : "Siguir",
+    "Undo" : "Desfacer",
+    "Custom" : "Personalizáu",
+    "Text" : "Testu",
+    "Size" : "Tamañu",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/az.js b/l10n/az.js
index 1bf5330aa..35674fd6b 100644
--- a/l10n/az.js
+++ b/l10n/az.js
@@ -6,16 +6,20 @@ OC.L10N.register(
     "Tags" : "Işarələr",
     "Maps" : "Xəritələr",
     "Settings" : "Quraşdırmalar",
+    "Edit" : "Dəyişiklik et",
     "Cancel" : "Dayandır",
     "Delete" : "Sil",
     "Download" : "Yüklə",
     "Favorite" : "İstəkli",
+    "Share" : "Paylaş",
     "Save" : "Saxla",
     "Month" : "Ay",
     "Day" : "Gün",
     "Time" : "Vaxt",
     "Name" : "Ad",
     "Update" : "Yenilənmə",
-    "Refresh" : "Yenilə"
+    "Refresh" : "Yenilə",
+    "Reset" : "Sıfırla",
+    "Size" : "Həcm"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/az.json b/l10n/az.json
index a1163210c..8fa88e4e2 100644
--- a/l10n/az.json
+++ b/l10n/az.json
@@ -4,16 +4,20 @@
     "Tags" : "Işarələr",
     "Maps" : "Xəritələr",
     "Settings" : "Quraşdırmalar",
+    "Edit" : "Dəyişiklik et",
     "Cancel" : "Dayandır",
     "Delete" : "Sil",
     "Download" : "Yüklə",
     "Favorite" : "İstəkli",
+    "Share" : "Paylaş",
     "Save" : "Saxla",
     "Month" : "Ay",
     "Day" : "Gün",
     "Time" : "Vaxt",
     "Name" : "Ad",
     "Update" : "Yenilənmə",
-    "Refresh" : "Yenilə"
+    "Refresh" : "Yenilə",
+    "Reset" : "Sıfırla",
+    "Size" : "Həcm"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/bg.js b/l10n/bg.js
index 825d6afe2..9ea908b29 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -24,6 +24,10 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Изберете основата /началото/ на вашата времева линия ",
     "The selected folder does not seem to be valid. Try again." : "Избраната папка изглежда не е валидна. Опитайте отново.",
     "Found {total} photos in {path}" : "Намерени са {total} снимки в {path}",
+    "Error saving image" : "Грешка при запазване на изображение",
+    "Unsaved changes" : "Незаписани промени",
+    "Drop changes" : "Игнориране на промените",
+    "Edit" : "Редактиране",
     "Loading …" : "Зареждане …",
     "Cancel" : "Отказ",
     "Delete" : "Изтриване",
@@ -48,6 +52,7 @@ OC.L10N.register(
     "Choose the root for the folders view" : "Изберете основа за изгледа на папките",
     "Your Timeline" : "Вашата времева линия",
     "Failed to load some photos" : "Неуспешно зареждане на някои снимки",
+    "Share" : "Споделяне",
     "Sidebar" : "Странична лента",
     "Processing … {n}/{m}" : "Обработва се ... {n}/{m}",
     "{n} photos added to album" : "{n} снимки са добавени в албума",
@@ -120,6 +125,90 @@ OC.L10N.register(
     "Share folder" : "Споделяне на папка",
     "Move left" : "Преместване наляво",
     "Move right" : "Преместване надясно",
+    "Save as" : "Запиши като",
+    "Reset" : "Възстановяване",
+    "All changes will be lost." : "Всички промени ще бъдат загубени.",
+    "Are you sure you want to continue?" : "Сигурни ли сте, че искате да продължите?",
+    "Continue" : "Продължаване",
+    "Undo" : "Отмяна",
+    "Redo" : "Повторение",
+    "Show original image" : "Показване на оригиналното изображение",
+    "Zoom in" : "Увеличаване на мащаба",
+    "Zoom out" : "Намаляване на мащаба",
+    "Toggle zoom menu" : "Превключване на менюто за мащабиране",
+    "Adjust" : "Настройване",
+    "Fine-tune" : "Фина настройка",
+    "Filters" : "Филтри",
+    "Watermark" : "Воден знак",
+    "Draw" : " Рисуване /Чертане/",
+    "Resize" : "Преоразмеряване",
+    "Invalid image." : "Невалидно изображение.",
+    "Error while uploading the image." : "Грешка при качване на изображението.",
+    "are not images" : "не са изображения",
+    "is not an image" : "не е изображение",
+    "to be uploaded" : "да бъдат качени",
+    "Crop" : "Изрязване",
+    "Original" : "Оригинал",
+    "Custom" : "Персонализиран",
+    "Square" : "Квадрат",
+    "Landscape" : "Пейзаж",
+    "Portrait" : "Портрет",
+    "Ellipse" : "Елипса",
+    "Classic TV" : "Класическа ТВ",
+    "CinemaScope" : "КиноЕкран",
+    "Arrow" : "Стрелка",
+    "Blur" : "Замъгляване",
+    "Brightness" : "Яркост",
+    "Contrast" : "Контраст",
+    "Un-flip X" : "Отмяна на Х обръщане",
+    "Flip X" : "Х Обръщане",
+    "Un-flip Y" : "Отмяна на Y обръщане",
+    "Flip Y" : "Y Обръщане",
+    "HSV" : "HSV",
+    "Hue" : "Нюанс",
+    "Saturation" : "Насищане",
+    "Value" : "Стойност",
+    "Image" : "Изображение",
+    "Importing …" : "Импортиране.../внасяне/",
+    "+ Add image" : "+ Добавяне на изображение",
+    "Line" : "Линия",
+    "Pen" : "Химилка",
+    "Polygon" : "Многоъгълник",
+    "Sides" : "Страни",
+    "Rectangle" : "Правоъгълник",
+    "Corner Radius" : "Радиус на ъгъла",
+    "Width in pixels" : "Ширина в пиксели",
+    "Height in pixels" : "Височина в пиксели",
+    "Toggle ratio lock" : "Превключване на заключване на съотношението",
+    "Reset to original image size" : "Възстановяване на оригиналния размер на изображението",
+    "Rotate" : "Завъртане",
+    "Text" : "Текст",
+    "Text spacing" : "Разредка на текста",
+    "Text alignment" : "Подравняване на текст",
+    "Font family" : "Семейство шрифтове",
+    "Size" : "Размер",
+    "Letter spacing" : "Разстояние между буквите",
+    "Line height" : "Височина на линията",
+    "Warmth" : "Топлина",
+    "+ Add watermark" : "+ Добавяне на воден знак",
+    "Choose watermark type" : "Избор на тип воден знак",
+    "Upload watermark" : "Качване на воден знак",
+    "Add as text" : "Добавяне като текст",
+    "Padding" : "Уплътняване",
+    "Shadow" : "Сянка",
+    "Horizontal" : "Хоризонтално",
+    "Vertical" : "Вертикално",
+    "Opacity" : "Непрозрачност",
+    "Position" : "Позиция",
+    "Stroke" : "Щрих, линия",
+    "Save image as" : "Запазване на изображението като",
+    "Extension" : "Разширение",
+    "Name is required." : "Името е задължително/нужно/.",
+    "Quality" : "Качество ",
+    "Saved image size (width x height)" : "Размер на запазеното изображение (ширина x височина)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Обърнете внимание, че избраната област за изрязване е по-ниска от приложеното преоразмеряване, което може да доведе до влошаване на качеството",
+    "Actual size (100%)" : "Действителен размер (100%)",
+    "Fit size" : "Подходящ размер",
     "Failed to create {albumName}." : "Неуспешно създаване на {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименуване от {currentAlbumName} на {newAlbumName}.",
     "General Failure" : "Грешка от общ характер",
diff --git a/l10n/bg.json b/l10n/bg.json
index 37441b5f9..1b2cea120 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -22,6 +22,10 @@
     "Choose the root of your timeline" : "Изберете основата /началото/ на вашата времева линия ",
     "The selected folder does not seem to be valid. Try again." : "Избраната папка изглежда не е валидна. Опитайте отново.",
     "Found {total} photos in {path}" : "Намерени са {total} снимки в {path}",
+    "Error saving image" : "Грешка при запазване на изображение",
+    "Unsaved changes" : "Незаписани промени",
+    "Drop changes" : "Игнориране на промените",
+    "Edit" : "Редактиране",
     "Loading …" : "Зареждане …",
     "Cancel" : "Отказ",
     "Delete" : "Изтриване",
@@ -46,6 +50,7 @@
     "Choose the root for the folders view" : "Изберете основа за изгледа на папките",
     "Your Timeline" : "Вашата времева линия",
     "Failed to load some photos" : "Неуспешно зареждане на някои снимки",
+    "Share" : "Споделяне",
     "Sidebar" : "Странична лента",
     "Processing … {n}/{m}" : "Обработва се ... {n}/{m}",
     "{n} photos added to album" : "{n} снимки са добавени в албума",
@@ -118,6 +123,90 @@
     "Share folder" : "Споделяне на папка",
     "Move left" : "Преместване наляво",
     "Move right" : "Преместване надясно",
+    "Save as" : "Запиши като",
+    "Reset" : "Възстановяване",
+    "All changes will be lost." : "Всички промени ще бъдат загубени.",
+    "Are you sure you want to continue?" : "Сигурни ли сте, че искате да продължите?",
+    "Continue" : "Продължаване",
+    "Undo" : "Отмяна",
+    "Redo" : "Повторение",
+    "Show original image" : "Показване на оригиналното изображение",
+    "Zoom in" : "Увеличаване на мащаба",
+    "Zoom out" : "Намаляване на мащаба",
+    "Toggle zoom menu" : "Превключване на менюто за мащабиране",
+    "Adjust" : "Настройване",
+    "Fine-tune" : "Фина настройка",
+    "Filters" : "Филтри",
+    "Watermark" : "Воден знак",
+    "Draw" : " Рисуване /Чертане/",
+    "Resize" : "Преоразмеряване",
+    "Invalid image." : "Невалидно изображение.",
+    "Error while uploading the image." : "Грешка при качване на изображението.",
+    "are not images" : "не са изображения",
+    "is not an image" : "не е изображение",
+    "to be uploaded" : "да бъдат качени",
+    "Crop" : "Изрязване",
+    "Original" : "Оригинал",
+    "Custom" : "Персонализиран",
+    "Square" : "Квадрат",
+    "Landscape" : "Пейзаж",
+    "Portrait" : "Портрет",
+    "Ellipse" : "Елипса",
+    "Classic TV" : "Класическа ТВ",
+    "CinemaScope" : "КиноЕкран",
+    "Arrow" : "Стрелка",
+    "Blur" : "Замъгляване",
+    "Brightness" : "Яркост",
+    "Contrast" : "Контраст",
+    "Un-flip X" : "Отмяна на Х обръщане",
+    "Flip X" : "Х Обръщане",
+    "Un-flip Y" : "Отмяна на Y обръщане",
+    "Flip Y" : "Y Обръщане",
+    "HSV" : "HSV",
+    "Hue" : "Нюанс",
+    "Saturation" : "Насищане",
+    "Value" : "Стойност",
+    "Image" : "Изображение",
+    "Importing …" : "Импортиране.../внасяне/",
+    "+ Add image" : "+ Добавяне на изображение",
+    "Line" : "Линия",
+    "Pen" : "Химилка",
+    "Polygon" : "Многоъгълник",
+    "Sides" : "Страни",
+    "Rectangle" : "Правоъгълник",
+    "Corner Radius" : "Радиус на ъгъла",
+    "Width in pixels" : "Ширина в пиксели",
+    "Height in pixels" : "Височина в пиксели",
+    "Toggle ratio lock" : "Превключване на заключване на съотношението",
+    "Reset to original image size" : "Възстановяване на оригиналния размер на изображението",
+    "Rotate" : "Завъртане",
+    "Text" : "Текст",
+    "Text spacing" : "Разредка на текста",
+    "Text alignment" : "Подравняване на текст",
+    "Font family" : "Семейство шрифтове",
+    "Size" : "Размер",
+    "Letter spacing" : "Разстояние между буквите",
+    "Line height" : "Височина на линията",
+    "Warmth" : "Топлина",
+    "+ Add watermark" : "+ Добавяне на воден знак",
+    "Choose watermark type" : "Избор на тип воден знак",
+    "Upload watermark" : "Качване на воден знак",
+    "Add as text" : "Добавяне като текст",
+    "Padding" : "Уплътняване",
+    "Shadow" : "Сянка",
+    "Horizontal" : "Хоризонтално",
+    "Vertical" : "Вертикално",
+    "Opacity" : "Непрозрачност",
+    "Position" : "Позиция",
+    "Stroke" : "Щрих, линия",
+    "Save image as" : "Запазване на изображението като",
+    "Extension" : "Разширение",
+    "Name is required." : "Името е задължително/нужно/.",
+    "Quality" : "Качество ",
+    "Saved image size (width x height)" : "Размер на запазеното изображение (ширина x височина)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Обърнете внимание, че избраната област за изрязване е по-ниска от приложеното преоразмеряване, което може да доведе до влошаване на качеството",
+    "Actual size (100%)" : "Действителен размер (100%)",
+    "Fit size" : "Подходящ размер",
     "Failed to create {albumName}." : "Неуспешно създаване на {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименуване от {currentAlbumName} на {newAlbumName}.",
     "General Failure" : "Грешка от общ характер",
diff --git a/l10n/bn_BD.js b/l10n/bn_BD.js
index 0c7d72291..481b48fc4 100644
--- a/l10n/bn_BD.js
+++ b/l10n/bn_BD.js
@@ -5,10 +5,12 @@ OC.L10N.register(
     "Tags" : "ট্যাগ",
     "Maps" : "মানচিত্র",
     "Settings" : "সেটিংস",
+    "Edit" : "সম্পাদনা",
     "Cancel" : "বাতির",
     "Delete" : "মুছে",
     "Download" : "ডাউনলোড",
     "Favorite" : "প্রিয়জন",
+    "Share" : "ভাগাভাগি কর",
     "Back" : "পেছনে যাও",
     "Save" : "সংরক্ষণ",
     "Month" : "মাস",
@@ -17,6 +19,9 @@ OC.L10N.register(
     "Hour" : "ঘন্টা",
     "Name" : "নাম",
     "Update" : "পরিবর্ধন",
-    "Refresh" : "নবোদ্যম"
+    "Refresh" : "নবোদ্যম",
+    "Reset" : "পূণঃনির্ধানণ",
+    "Continue" : "চালিয়ে যাও",
+    "Size" : "আকার"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/bn_BD.json b/l10n/bn_BD.json
index 7e1d0d8d1..7414f54ce 100644
--- a/l10n/bn_BD.json
+++ b/l10n/bn_BD.json
@@ -3,10 +3,12 @@
     "Tags" : "ট্যাগ",
     "Maps" : "মানচিত্র",
     "Settings" : "সেটিংস",
+    "Edit" : "সম্পাদনা",
     "Cancel" : "বাতির",
     "Delete" : "মুছে",
     "Download" : "ডাউনলোড",
     "Favorite" : "প্রিয়জন",
+    "Share" : "ভাগাভাগি কর",
     "Back" : "পেছনে যাও",
     "Save" : "সংরক্ষণ",
     "Month" : "মাস",
@@ -15,6 +17,9 @@
     "Hour" : "ঘন্টা",
     "Name" : "নাম",
     "Update" : "পরিবর্ধন",
-    "Refresh" : "নবোদ্যম"
+    "Refresh" : "নবোদ্যম",
+    "Reset" : "পূণঃনির্ধানণ",
+    "Continue" : "চালিয়ে যাও",
+    "Size" : "আকার"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/br.js b/l10n/br.js
index 9ec8dd6d5..5f10a1665 100644
--- a/l10n/br.js
+++ b/l10n/br.js
@@ -5,12 +5,15 @@ OC.L10N.register(
     "Videos" : "Videoioù",
     "Tags" : "Klavioù",
     "Settings" : "Arventennoù",
+    "Unsaved changes" : "Kemmoù n'int ket bet enrollet",
+    "Edit" : "Cheñch",
     "Loading …" : "O Kargañ ...",
     "Cancel" : "Arrest",
     "Delete" : "Lemel",
     "Download" : "Pellgargañ",
     "Favorite" : "Pennrollañ",
     "View in folder" : "Diskwel en teuliad",
+    "Share" : "Rannan",
     "Copy public link" : "Eilañ al liamm foran",
     "Public link" : "Liamm publik",
     "Back" : "Distro",
@@ -19,6 +22,9 @@ OC.L10N.register(
     "Day" : "Deiz",
     "Name" : "Anv",
     "Update" : "Hizivaat",
-    "Refresh" : "Freskaat"
+    "Refresh" : "Freskaat",
+    "Continue" : "Kendec'hel",
+    "Original" : "Orin",
+    "Size" : "Ment"
 },
 "nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);");
diff --git a/l10n/br.json b/l10n/br.json
index 96eadc607..d51fc0f62 100644
--- a/l10n/br.json
+++ b/l10n/br.json
@@ -3,12 +3,15 @@
     "Videos" : "Videoioù",
     "Tags" : "Klavioù",
     "Settings" : "Arventennoù",
+    "Unsaved changes" : "Kemmoù n'int ket bet enrollet",
+    "Edit" : "Cheñch",
     "Loading …" : "O Kargañ ...",
     "Cancel" : "Arrest",
     "Delete" : "Lemel",
     "Download" : "Pellgargañ",
     "Favorite" : "Pennrollañ",
     "View in folder" : "Diskwel en teuliad",
+    "Share" : "Rannan",
     "Copy public link" : "Eilañ al liamm foran",
     "Public link" : "Liamm publik",
     "Back" : "Distro",
@@ -17,6 +20,9 @@
     "Day" : "Deiz",
     "Name" : "Anv",
     "Update" : "Hizivaat",
-    "Refresh" : "Freskaat"
+    "Refresh" : "Freskaat",
+    "Continue" : "Kendec'hel",
+    "Original" : "Orin",
+    "Size" : "Ment"
 },"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"
 }
\ No newline at end of file
diff --git a/l10n/bs.js b/l10n/bs.js
new file mode 100644
index 000000000..c810389a1
--- /dev/null
+++ b/l10n/bs.js
@@ -0,0 +1,20 @@
+OC.L10N.register(
+    "memories",
+    {
+    "Favorites" : "Favoriti",
+    "Settings" : "Podešavanje",
+    "Edit" : "Izmjeni",
+    "Cancel" : "Otkaži",
+    "Delete" : "Obriši",
+    "Download" : "Preuzmi",
+    "Favorite" : "Favorit",
+    "Share" : "Podjeli",
+    "Save" : "Spremi",
+    "Month" : "Mjesec",
+    "Day" : "Dan",
+    "Name" : "Ime",
+    "Update" : "Ažuriraj",
+    "Continue" : "Nastavi",
+    "Size" : "Veličina"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/bs.json b/l10n/bs.json
new file mode 100644
index 000000000..5d91da067
--- /dev/null
+++ b/l10n/bs.json
@@ -0,0 +1,18 @@
+{ "translations": {
+    "Favorites" : "Favoriti",
+    "Settings" : "Podešavanje",
+    "Edit" : "Izmjeni",
+    "Cancel" : "Otkaži",
+    "Delete" : "Obriši",
+    "Download" : "Preuzmi",
+    "Favorite" : "Favorit",
+    "Share" : "Podjeli",
+    "Save" : "Spremi",
+    "Month" : "Mjesec",
+    "Day" : "Dan",
+    "Name" : "Ime",
+    "Update" : "Ažuriraj",
+    "Continue" : "Nastavi",
+    "Size" : "Veličina"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/l10n/ca.js b/l10n/ca.js
index dd959006c..44213988d 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -12,6 +12,10 @@ OC.L10N.register(
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
     "Settings" : "Paràmetres",
+    "Error saving image" : "S'ha produït un error en desar la imatge",
+    "Unsaved changes" : "Canvis sense desar",
+    "Drop changes" : "Elimina els canvis",
+    "Edit" : "Edita",
     "Loading …" : "Carregant …",
     "Cancel" : "Cancel·la",
     "Delete" : "Suprimeix",
@@ -19,6 +23,7 @@ OC.L10N.register(
     "Favorite" : "Preferit",
     "Unarchive" : "Desbloquejar",
     "View in folder" : "Visualitza-ho a la carpeta",
+    "Share" : "Compartir",
     "Copy public link" : "Copia l'enllaç públic",
     "Public link" : "Enllaç públic",
     "Back" : "Torna",
@@ -32,6 +37,90 @@ OC.L10N.register(
     "Name" : "Cognom",
     "Update" : "Actualitzar",
     "Refresh" : "Actualitza",
-    "Share folder" : "Comparteix la carpeta"
+    "Share folder" : "Comparteix la carpeta",
+    "Save as" : "Anomena i desa",
+    "Reset" : "Restableix",
+    "All changes will be lost." : "Tots els canvis es perdran.",
+    "Are you sure you want to continue?" : "Esteu segur que voleu continuar?",
+    "Continue" : "Continua",
+    "Undo" : "Desfés",
+    "Redo" : "Refer",
+    "Show original image" : "Mostra la imatge original",
+    "Zoom in" : "Ampliació",
+    "Zoom out" : "Allunya",
+    "Toggle zoom menu" : "Canvia el menú de zoom",
+    "Adjust" : "Ajusta",
+    "Fine-tune" : "Afinar",
+    "Filters" : "Filtres",
+    "Watermark" : "Marca d'aigua",
+    "Draw" : "Dibuixa",
+    "Resize" : "Redimensiona",
+    "Invalid image." : "Imatge no vàlida.",
+    "Error while uploading the image." : "S'ha produït un error en carregar la imatge.",
+    "are not images" : "no són imatges",
+    "is not an image" : "no és una imatge",
+    "to be uploaded" : "per ser carregat",
+    "Crop" : "Retalla",
+    "Original" : "Original",
+    "Custom" : "Personalitzat",
+    "Square" : "Quadrat",
+    "Landscape" : "Apaïsat",
+    "Portrait" : "Vertical",
+    "Ellipse" : "El·lipse",
+    "Classic TV" : "TV clàssica",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Fletxa",
+    "Blur" : "Difumina",
+    "Brightness" : "Brillantor",
+    "Contrast" : "Contrast",
+    "Un-flip X" : "Descapgira X",
+    "Flip X" : "Capgira X",
+    "Un-flip Y" : "Descapgira Y",
+    "Flip Y" : "Capgira Y",
+    "HSV" : "HSV",
+    "Hue" : "Tonalitat",
+    "Saturation" : "Saturació",
+    "Value" : "Valor",
+    "Image" : "Imatge",
+    "Importing …" : "S'està important …",
+    "+ Add image" : "+ Afegeix imatge",
+    "Line" : "Línia",
+    "Pen" : "Llapis",
+    "Polygon" : "Polígon",
+    "Sides" : "Cares",
+    "Rectangle" : "Rectangle",
+    "Corner Radius" : "Radi de la cantonada",
+    "Width in pixels" : "Amplada en píxels",
+    "Height in pixels" : "Alçada en píxels",
+    "Toggle ratio lock" : "Commuta la relació d'aspecte",
+    "Reset to original image size" : "Restableix la mida de la imatge original",
+    "Rotate" : "Gira",
+    "Text" : "Text",
+    "Text spacing" : "Espaiat del text",
+    "Text alignment" : "Alineació del text",
+    "Font family" : "Família tipogràfica",
+    "Size" : "Mida",
+    "Letter spacing" : "Espaiat de la lletra",
+    "Line height" : "Alçada de la línia",
+    "Warmth" : "Calidesa",
+    "+ Add watermark" : "+ Afegeix una marca d'aigua",
+    "Choose watermark type" : "Trieu el tipus de marca d'aigua",
+    "Upload watermark" : "Carregueu una marca d'aigua",
+    "Add as text" : "Afegeix com a text",
+    "Padding" : "Farciment",
+    "Shadow" : "Ombra",
+    "Horizontal" : "Horitzontal",
+    "Vertical" : "Vertical",
+    "Opacity" : "Opacitat",
+    "Position" : "Posició",
+    "Stroke" : "Traç",
+    "Save image as" : "Anomena i desa la imatge",
+    "Extension" : "Extensió",
+    "Name is required." : "Cal el nom.",
+    "Quality" : "Qualitat",
+    "Saved image size (width x height)" : "Mida de la imatge desada (amplada x alçada)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tingueu en compte que l'àrea de retall seleccionada és inferior al canvi de mida aplicat, cosa que pot provocar una disminució de la qualitat",
+    "Actual size (100%)" : "Mida real (100%)",
+    "Fit size" : "Talla ajustada"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ca.json b/l10n/ca.json
index dcd417c82..7d9d85ec1 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -10,6 +10,10 @@
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
     "Settings" : "Paràmetres",
+    "Error saving image" : "S'ha produït un error en desar la imatge",
+    "Unsaved changes" : "Canvis sense desar",
+    "Drop changes" : "Elimina els canvis",
+    "Edit" : "Edita",
     "Loading …" : "Carregant …",
     "Cancel" : "Cancel·la",
     "Delete" : "Suprimeix",
@@ -17,6 +21,7 @@
     "Favorite" : "Preferit",
     "Unarchive" : "Desbloquejar",
     "View in folder" : "Visualitza-ho a la carpeta",
+    "Share" : "Compartir",
     "Copy public link" : "Copia l'enllaç públic",
     "Public link" : "Enllaç públic",
     "Back" : "Torna",
@@ -30,6 +35,90 @@
     "Name" : "Cognom",
     "Update" : "Actualitzar",
     "Refresh" : "Actualitza",
-    "Share folder" : "Comparteix la carpeta"
+    "Share folder" : "Comparteix la carpeta",
+    "Save as" : "Anomena i desa",
+    "Reset" : "Restableix",
+    "All changes will be lost." : "Tots els canvis es perdran.",
+    "Are you sure you want to continue?" : "Esteu segur que voleu continuar?",
+    "Continue" : "Continua",
+    "Undo" : "Desfés",
+    "Redo" : "Refer",
+    "Show original image" : "Mostra la imatge original",
+    "Zoom in" : "Ampliació",
+    "Zoom out" : "Allunya",
+    "Toggle zoom menu" : "Canvia el menú de zoom",
+    "Adjust" : "Ajusta",
+    "Fine-tune" : "Afinar",
+    "Filters" : "Filtres",
+    "Watermark" : "Marca d'aigua",
+    "Draw" : "Dibuixa",
+    "Resize" : "Redimensiona",
+    "Invalid image." : "Imatge no vàlida.",
+    "Error while uploading the image." : "S'ha produït un error en carregar la imatge.",
+    "are not images" : "no són imatges",
+    "is not an image" : "no és una imatge",
+    "to be uploaded" : "per ser carregat",
+    "Crop" : "Retalla",
+    "Original" : "Original",
+    "Custom" : "Personalitzat",
+    "Square" : "Quadrat",
+    "Landscape" : "Apaïsat",
+    "Portrait" : "Vertical",
+    "Ellipse" : "El·lipse",
+    "Classic TV" : "TV clàssica",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Fletxa",
+    "Blur" : "Difumina",
+    "Brightness" : "Brillantor",
+    "Contrast" : "Contrast",
+    "Un-flip X" : "Descapgira X",
+    "Flip X" : "Capgira X",
+    "Un-flip Y" : "Descapgira Y",
+    "Flip Y" : "Capgira Y",
+    "HSV" : "HSV",
+    "Hue" : "Tonalitat",
+    "Saturation" : "Saturació",
+    "Value" : "Valor",
+    "Image" : "Imatge",
+    "Importing …" : "S'està important …",
+    "+ Add image" : "+ Afegeix imatge",
+    "Line" : "Línia",
+    "Pen" : "Llapis",
+    "Polygon" : "Polígon",
+    "Sides" : "Cares",
+    "Rectangle" : "Rectangle",
+    "Corner Radius" : "Radi de la cantonada",
+    "Width in pixels" : "Amplada en píxels",
+    "Height in pixels" : "Alçada en píxels",
+    "Toggle ratio lock" : "Commuta la relació d'aspecte",
+    "Reset to original image size" : "Restableix la mida de la imatge original",
+    "Rotate" : "Gira",
+    "Text" : "Text",
+    "Text spacing" : "Espaiat del text",
+    "Text alignment" : "Alineació del text",
+    "Font family" : "Família tipogràfica",
+    "Size" : "Mida",
+    "Letter spacing" : "Espaiat de la lletra",
+    "Line height" : "Alçada de la línia",
+    "Warmth" : "Calidesa",
+    "+ Add watermark" : "+ Afegeix una marca d'aigua",
+    "Choose watermark type" : "Trieu el tipus de marca d'aigua",
+    "Upload watermark" : "Carregueu una marca d'aigua",
+    "Add as text" : "Afegeix com a text",
+    "Padding" : "Farciment",
+    "Shadow" : "Ombra",
+    "Horizontal" : "Horitzontal",
+    "Vertical" : "Vertical",
+    "Opacity" : "Opacitat",
+    "Position" : "Posició",
+    "Stroke" : "Traç",
+    "Save image as" : "Anomena i desa la imatge",
+    "Extension" : "Extensió",
+    "Name is required." : "Cal el nom.",
+    "Quality" : "Qualitat",
+    "Saved image size (width x height)" : "Mida de la imatge desada (amplada x alçada)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tingueu en compte que l'àrea de retall seleccionada és inferior al canvi de mida aplicat, cosa que pot provocar una disminució de la qualitat",
+    "Actual size (100%)" : "Mida real (100%)",
+    "Fit size" : "Talla ajustada"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/cs.js b/l10n/cs.js
index a7806f48a..87fe08aa7 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Tags" : "Štítky",
     "Maps" : "Mapy",
     "Settings" : "Nastavení",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Lepší zážitek z fotek na vás čeká",
     "Choose the root folder of your timeline to begin" : "Začněte zvolením kořenové složky vaší časové osy",
     "If you just installed Memories, run:" : "Pokud jste Vzpomínky právě nainstalovali, spusťte:",
@@ -25,6 +26,11 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Zvolte kořen vaší časové osy",
     "The selected folder does not seem to be valid. Try again." : "Vybraná složka se nezdá být platná. Zkuste to znovu.",
     "Found {total} photos in {path}" : "V {path} nalezeno {total} fotek",
+    "Image saved successfully" : "Obrázek úspěšně uložen",
+    "Error saving image" : "Chyb při ukládání obrázku",
+    "Unsaved changes" : "Neuložené změny",
+    "Drop changes" : "Zahodit změny",
+    "Edit" : "Upravit",
     "Loading …" : "Načítání…",
     "Cancel" : "Storno",
     "Delete" : "Smazat",
@@ -49,7 +55,10 @@ OC.L10N.register(
     "Choose the root for the folders view" : "Zvolte kořen pro zobrazení složek",
     "Your Timeline" : "Vaše časová osa",
     "Failed to load some photos" : "Některé fotky se nepodařilo načíst",
+    "Share" : "Sdílet",
     "Sidebar" : "Postranní panel",
+    "Video sharing not supported yet" : "Sdílení videí zatím není podporováno",
+    "Cannot share this type of data" : "Tento typ dat není možné sdílet",
     "Processing … {n}/{m}" : "Zpracovávání… {n}/{m}",
     "{n} photos added to album" : "{n} fotek přidáno do alba",
     "Search for collaborators" : "Vyhledat spolupracující",
@@ -125,6 +134,90 @@ OC.L10N.register(
     "Share folder" : "Nasdílet složku",
     "Move left" : "Přesunout doleva",
     "Move right" : "Přesunout doprava",
+    "Save as" : "Uložit jako",
+    "Reset" : "Vrátit na výchozí hodnoty",
+    "All changes will be lost." : "Veškeré změny budou ztraceny.",
+    "Are you sure you want to continue?" : "Opravdu chcete pokračovat?",
+    "Continue" : "Pokračovat",
+    "Undo" : "Vrátit zpět",
+    "Redo" : "Zopakovat",
+    "Show original image" : "Zobrazit původní obrázek",
+    "Zoom in" : "Přiblížit",
+    "Zoom out" : "Oddálit",
+    "Toggle zoom menu" : "Zobraz/nezobraz. nabídku zvětšení",
+    "Adjust" : "Přizpůsobit",
+    "Fine-tune" : "Jemné doladění",
+    "Filters" : "Filtry",
+    "Watermark" : "Vodoznak",
+    "Draw" : "Nakreslit",
+    "Resize" : "Změnit rozlišení",
+    "Invalid image." : "Neplatný obrázek.",
+    "Error while uploading the image." : "Chyba při nahrávání obrázku.",
+    "are not images" : "nejsou obrázky",
+    "is not an image" : "není obrázek",
+    "to be uploaded" : "k nahrání",
+    "Crop" : "Oříznout",
+    "Original" : "Původní",
+    "Custom" : "Uživatelsky určený",
+    "Square" : "Čtverec",
+    "Landscape" : "Krajina",
+    "Portrait" : "Portrét",
+    "Ellipse" : "Elipsa",
+    "Classic TV" : "Klasická televize",
+    "CinemaScope" : "Extrémně širokoúhlé",
+    "Arrow" : "Šipka",
+    "Blur" : "Rozmazat",
+    "Brightness" : "Jas",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Vzít zpět svisl. převrácení",
+    "Flip X" : "Převrátit svisle",
+    "Un-flip Y" : "Vzít zpět vodorov. převrácení",
+    "Flip Y" : "Převrátit vodorovně",
+    "HSV" : "HSV",
+    "Hue" : "Odstín",
+    "Saturation" : "Saturace",
+    "Value" : "Hodnota",
+    "Image" : "Obrázek",
+    "Importing …" : "Importování…",
+    "+ Add image" : "+ Přidat obrázek",
+    "Line" : "Čára",
+    "Pen" : "Pero",
+    "Polygon" : "Mnohoúhelník",
+    "Sides" : "Stran",
+    "Rectangle" : "Obdélník",
+    "Corner Radius" : "Zaoblení rohů (poloměr)",
+    "Width in pixels" : "Šířka v pixelex",
+    "Height in pixels" : "Výška v pixelech",
+    "Toggle ratio lock" : "Vyp/zap. zám. poměru stran",
+    "Reset to original image size" : "Vrátit k původní velikosti obrázku",
+    "Rotate" : "Otočit",
+    "Text" : "Text",
+    "Text spacing" : "Rozestupy textu",
+    "Text alignment" : "Zarovnání textu",
+    "Font family" : "Skupina písem",
+    "Size" : "Velikost",
+    "Letter spacing" : "Rozestupy znaků",
+    "Line height" : "Výška řádku",
+    "Warmth" : "Teplota",
+    "+ Add watermark" : "+ přidat vodotisk",
+    "Choose watermark type" : "Zvolte typ vodotisku",
+    "Upload watermark" : "Nahrát vodotisk",
+    "Add as text" : "Přidat jako text",
+    "Padding" : "Doplňování",
+    "Shadow" : "Stín",
+    "Horizontal" : "Vodorovné",
+    "Vertical" : "Svislé",
+    "Opacity" : "(Ne)průhlednost",
+    "Position" : "Pozice",
+    "Stroke" : "Čára",
+    "Save image as" : "Uložit obrázek jako",
+    "Extension" : "Přípona",
+    "Name is required." : "Jméno je povinné.",
+    "Quality" : "Kvalita",
+    "Saved image size (width x height)" : "Velikost uloženého obrázku (šířka x výška)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Pozn.: označená oblast ořezu je menší než použitá změna rozlišení, což může způsobit snížení kvality",
+    "Actual size (100%)" : "Skutečná velikost (100%)",
+    "Fit size" : "Přizpůsobit velikost",
     "Shared Folder" : "Sdílená složka",
     "Failed to create {albumName}." : "Nepodařilo se vytvořit {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepodařilo přejmenovat {currentAlbumName} to {newAlbumName}.",
diff --git a/l10n/cs.json b/l10n/cs.json
index 9d0933ee5..2f8a3320c 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -13,6 +13,7 @@
     "Tags" : "Štítky",
     "Maps" : "Mapy",
     "Settings" : "Nastavení",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Lepší zážitek z fotek na vás čeká",
     "Choose the root folder of your timeline to begin" : "Začněte zvolením kořenové složky vaší časové osy",
     "If you just installed Memories, run:" : "Pokud jste Vzpomínky právě nainstalovali, spusťte:",
@@ -23,6 +24,11 @@
     "Choose the root of your timeline" : "Zvolte kořen vaší časové osy",
     "The selected folder does not seem to be valid. Try again." : "Vybraná složka se nezdá být platná. Zkuste to znovu.",
     "Found {total} photos in {path}" : "V {path} nalezeno {total} fotek",
+    "Image saved successfully" : "Obrázek úspěšně uložen",
+    "Error saving image" : "Chyb při ukládání obrázku",
+    "Unsaved changes" : "Neuložené změny",
+    "Drop changes" : "Zahodit změny",
+    "Edit" : "Upravit",
     "Loading …" : "Načítání…",
     "Cancel" : "Storno",
     "Delete" : "Smazat",
@@ -47,7 +53,10 @@
     "Choose the root for the folders view" : "Zvolte kořen pro zobrazení složek",
     "Your Timeline" : "Vaše časová osa",
     "Failed to load some photos" : "Některé fotky se nepodařilo načíst",
+    "Share" : "Sdílet",
     "Sidebar" : "Postranní panel",
+    "Video sharing not supported yet" : "Sdílení videí zatím není podporováno",
+    "Cannot share this type of data" : "Tento typ dat není možné sdílet",
     "Processing … {n}/{m}" : "Zpracovávání… {n}/{m}",
     "{n} photos added to album" : "{n} fotek přidáno do alba",
     "Search for collaborators" : "Vyhledat spolupracující",
@@ -123,6 +132,90 @@
     "Share folder" : "Nasdílet složku",
     "Move left" : "Přesunout doleva",
     "Move right" : "Přesunout doprava",
+    "Save as" : "Uložit jako",
+    "Reset" : "Vrátit na výchozí hodnoty",
+    "All changes will be lost." : "Veškeré změny budou ztraceny.",
+    "Are you sure you want to continue?" : "Opravdu chcete pokračovat?",
+    "Continue" : "Pokračovat",
+    "Undo" : "Vrátit zpět",
+    "Redo" : "Zopakovat",
+    "Show original image" : "Zobrazit původní obrázek",
+    "Zoom in" : "Přiblížit",
+    "Zoom out" : "Oddálit",
+    "Toggle zoom menu" : "Zobraz/nezobraz. nabídku zvětšení",
+    "Adjust" : "Přizpůsobit",
+    "Fine-tune" : "Jemné doladění",
+    "Filters" : "Filtry",
+    "Watermark" : "Vodoznak",
+    "Draw" : "Nakreslit",
+    "Resize" : "Změnit rozlišení",
+    "Invalid image." : "Neplatný obrázek.",
+    "Error while uploading the image." : "Chyba při nahrávání obrázku.",
+    "are not images" : "nejsou obrázky",
+    "is not an image" : "není obrázek",
+    "to be uploaded" : "k nahrání",
+    "Crop" : "Oříznout",
+    "Original" : "Původní",
+    "Custom" : "Uživatelsky určený",
+    "Square" : "Čtverec",
+    "Landscape" : "Krajina",
+    "Portrait" : "Portrét",
+    "Ellipse" : "Elipsa",
+    "Classic TV" : "Klasická televize",
+    "CinemaScope" : "Extrémně širokoúhlé",
+    "Arrow" : "Šipka",
+    "Blur" : "Rozmazat",
+    "Brightness" : "Jas",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Vzít zpět svisl. převrácení",
+    "Flip X" : "Převrátit svisle",
+    "Un-flip Y" : "Vzít zpět vodorov. převrácení",
+    "Flip Y" : "Převrátit vodorovně",
+    "HSV" : "HSV",
+    "Hue" : "Odstín",
+    "Saturation" : "Saturace",
+    "Value" : "Hodnota",
+    "Image" : "Obrázek",
+    "Importing …" : "Importování…",
+    "+ Add image" : "+ Přidat obrázek",
+    "Line" : "Čára",
+    "Pen" : "Pero",
+    "Polygon" : "Mnohoúhelník",
+    "Sides" : "Stran",
+    "Rectangle" : "Obdélník",
+    "Corner Radius" : "Zaoblení rohů (poloměr)",
+    "Width in pixels" : "Šířka v pixelex",
+    "Height in pixels" : "Výška v pixelech",
+    "Toggle ratio lock" : "Vyp/zap. zám. poměru stran",
+    "Reset to original image size" : "Vrátit k původní velikosti obrázku",
+    "Rotate" : "Otočit",
+    "Text" : "Text",
+    "Text spacing" : "Rozestupy textu",
+    "Text alignment" : "Zarovnání textu",
+    "Font family" : "Skupina písem",
+    "Size" : "Velikost",
+    "Letter spacing" : "Rozestupy znaků",
+    "Line height" : "Výška řádku",
+    "Warmth" : "Teplota",
+    "+ Add watermark" : "+ přidat vodotisk",
+    "Choose watermark type" : "Zvolte typ vodotisku",
+    "Upload watermark" : "Nahrát vodotisk",
+    "Add as text" : "Přidat jako text",
+    "Padding" : "Doplňování",
+    "Shadow" : "Stín",
+    "Horizontal" : "Vodorovné",
+    "Vertical" : "Svislé",
+    "Opacity" : "(Ne)průhlednost",
+    "Position" : "Pozice",
+    "Stroke" : "Čára",
+    "Save image as" : "Uložit obrázek jako",
+    "Extension" : "Přípona",
+    "Name is required." : "Jméno je povinné.",
+    "Quality" : "Kvalita",
+    "Saved image size (width x height)" : "Velikost uloženého obrázku (šířka x výška)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Pozn.: označená oblast ořezu je menší než použitá změna rozlišení, což může způsobit snížení kvality",
+    "Actual size (100%)" : "Skutečná velikost (100%)",
+    "Fit size" : "Přizpůsobit velikost",
     "Shared Folder" : "Sdílená složka",
     "Failed to create {albumName}." : "Nepodařilo se vytvořit {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepodařilo přejmenovat {currentAlbumName} to {newAlbumName}.",
diff --git a/l10n/cy_GB.js b/l10n/cy_GB.js
index ab41043f2..5d4810e09 100644
--- a/l10n/cy_GB.js
+++ b/l10n/cy_GB.js
@@ -6,11 +6,13 @@ OC.L10N.register(
     "Archive" : "Archif",
     "Tags" : "Tagiau",
     "Settings" : "Gosodiadau",
+    "Edit" : "Golygu",
     "Loading …" : "Yn llwytho …",
     "Cancel" : "Diddymu",
     "Delete" : "Dileu",
     "Download" : "Llwytho i lawr",
     "Favorite" : "Ffefryn",
+    "Share" : "Rhannu",
     "Copy public link" : "Copïo dolen gyhoeddus",
     "Back" : "Nôl",
     "Save" : "Cadw",
@@ -20,6 +22,9 @@ OC.L10N.register(
     "Time" : "Amser",
     "Name" : "Enw",
     "Update" : "Diweddaru",
-    "Refresh" : "Ail-lwytho"
+    "Refresh" : "Ail-lwytho",
+    "Undo" : "Dadwneud",
+    "Custom" : "Cyfaddas",
+    "Size" : "Maint"
 },
 "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/l10n/cy_GB.json b/l10n/cy_GB.json
index d792e9e3d..79569b24b 100644
--- a/l10n/cy_GB.json
+++ b/l10n/cy_GB.json
@@ -4,11 +4,13 @@
     "Archive" : "Archif",
     "Tags" : "Tagiau",
     "Settings" : "Gosodiadau",
+    "Edit" : "Golygu",
     "Loading …" : "Yn llwytho …",
     "Cancel" : "Diddymu",
     "Delete" : "Dileu",
     "Download" : "Llwytho i lawr",
     "Favorite" : "Ffefryn",
+    "Share" : "Rhannu",
     "Copy public link" : "Copïo dolen gyhoeddus",
     "Back" : "Nôl",
     "Save" : "Cadw",
@@ -18,6 +20,9 @@
     "Time" : "Amser",
     "Name" : "Enw",
     "Update" : "Diweddaru",
-    "Refresh" : "Ail-lwytho"
+    "Refresh" : "Ail-lwytho",
+    "Undo" : "Dadwneud",
+    "Custom" : "Cyfaddas",
+    "Size" : "Maint"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/da.js b/l10n/da.js
index 3b509fba1..49b3f1480 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Tags" : "Mærker",
     "Maps" : "Kort",
     "Settings" : "Indstillinger",
+    "Unsaved changes" : "Ikke gemte ændringer",
+    "Edit" : "Redigér",
     "Loading …" : "Loading …",
     "Cancel" : "Annuller",
     "Delete" : "Slet",
@@ -26,6 +28,7 @@ OC.L10N.register(
     "Timeline Path" : "Tidslinjesti",
     "Show hidden folders" : "Vis skjulte mapper",
     "Failed to load some photos" : "Kunne ikke indlæse nogle billeder",
+    "Share" : "Del",
     "Copy public link" : "Kopier offentligt link",
     "Public link" : "Offentligt link",
     "New album" : "Nyt album",
@@ -49,6 +52,20 @@ OC.L10N.register(
     "Update" : "Opdater",
     "Refresh" : "Opdater",
     "Share folder" : "Del mappe",
+    "Reset" : "Nulstil",
+    "Continue" : "Fortsæt",
+    "Undo" : "Fortryd",
+    "Redo" : "Annullér fortryd",
+    "Original" : "Original",
+    "Custom" : "Valgfrit",
+    "Value" : "Værdi",
+    "Image" : "Billede",
+    "Line" : "Linje",
+    "Text" : "Tekst",
+    "Size" : "Størelse",
+    "Position" : "Position",
+    "Extension" : "Filtype",
+    "Name is required." : "Navn er påkrævet.",
     "Failed to delete files." : "Kunne ikke slette filer.",
     "Failed to delete {fileName}." : "Kunne ikke slette {fileName}.",
     "Failed to favorite files." : "Kunne ikke vælge favorit filer.",
diff --git a/l10n/da.json b/l10n/da.json
index b24f3a15b..4879760c1 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -12,6 +12,8 @@
     "Tags" : "Mærker",
     "Maps" : "Kort",
     "Settings" : "Indstillinger",
+    "Unsaved changes" : "Ikke gemte ændringer",
+    "Edit" : "Redigér",
     "Loading …" : "Loading …",
     "Cancel" : "Annuller",
     "Delete" : "Slet",
@@ -24,6 +26,7 @@
     "Timeline Path" : "Tidslinjesti",
     "Show hidden folders" : "Vis skjulte mapper",
     "Failed to load some photos" : "Kunne ikke indlæse nogle billeder",
+    "Share" : "Del",
     "Copy public link" : "Kopier offentligt link",
     "Public link" : "Offentligt link",
     "New album" : "Nyt album",
@@ -47,6 +50,20 @@
     "Update" : "Opdater",
     "Refresh" : "Opdater",
     "Share folder" : "Del mappe",
+    "Reset" : "Nulstil",
+    "Continue" : "Fortsæt",
+    "Undo" : "Fortryd",
+    "Redo" : "Annullér fortryd",
+    "Original" : "Original",
+    "Custom" : "Valgfrit",
+    "Value" : "Værdi",
+    "Image" : "Billede",
+    "Line" : "Linje",
+    "Text" : "Tekst",
+    "Size" : "Størelse",
+    "Position" : "Position",
+    "Extension" : "Filtype",
+    "Name is required." : "Navn er påkrævet.",
     "Failed to delete files." : "Kunne ikke slette filer.",
     "Failed to delete {fileName}." : "Kunne ikke slette {fileName}.",
     "Failed to favorite files." : "Kunne ikke vælge favorit filer.",
diff --git a/l10n/de.js b/l10n/de.js
index a2046e5b0..6240ef680 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -22,6 +22,9 @@ OC.L10N.register(
     "You can always change this later in settings" : "Du kannst das auch noch später in den Einstellungen ändern.",
     "Choose the root of your timeline" : "Wähle den Start deiner Zeitleiste aus",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuche es nochmal.",
+    "Unsaved changes" : "Ungespeicherte Änderungen",
+    "Drop changes" : "Änderungen löschen",
+    "Edit" : "Bearbeiten",
     "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
@@ -44,6 +47,7 @@ OC.L10N.register(
     "Choose the root for the folders view" : "Wähle das Stammverzeichnis für die Ordneransicht",
     "Your Timeline" : "Deine Zeitleiste",
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
+    "Share" : "Teilen",
     "Sidebar" : "Seitenleiste",
     "Processing … {n}/{m}" : "Verarbeite … {n}/{m}",
     "Search for collaborators" : "Suche nach Mitbearbeitenden",
@@ -107,8 +111,90 @@ OC.L10N.register(
     "Share folder" : "Ordner teilen",
     "Move left" : "Nach links verschieben",
     "Move right" : "Nach rechts verschieben",
+    "Save as" : "Speichern als",
+    "Reset" : "Zurücksetzen",
+    "All changes will be lost." : "Alle Änderungen gehen verloren.",
+    "Are you sure you want to continue?" : "Bist du dir sicher, dass du fortsetzen möchtest?",
+    "Continue" : "Fortsetzen",
+    "Undo" : "Rückgängig",
+    "Redo" : "Wiederherstellen",
+    "Show original image" : "Originalbild anzeigen",
+    "Zoom in" : "Hinein zoomen",
+    "Zoom out" : "Hinauszoomen",
+    "Toggle zoom menu" : "Zoom-Menü umschalten",
+    "Adjust" : "Anpassen",
+    "Fine-tune" : "Feinabstimmung",
+    "Filters" : "Filter",
+    "Watermark" : "Wasserzeichen",
+    "Draw" : "Zeichnen",
+    "Resize" : "Größe ändern",
+    "Invalid image." : "Ungültiges Bild",
+    "Error while uploading the image." : "Fehler beim Hochladen des Bildes.",
+    "are not images" : "Sind keine Bilder",
     "is not an image" : "Ist kein Bild",
+    "to be uploaded" : "zum Hochladen",
+    "Crop" : "Zuschneiden",
+    "Original" : "Original",
+    "Custom" : "Benutzerdefiniert",
+    "Square" : "Quadrat",
+    "Landscape" : "Landschaft",
+    "Portrait" : "Porträt",
+    "Ellipse" : "Ellipse",
+    "Classic TV" : "Klassisches Fernsehen",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Pfeil",
+    "Blur" : "Verwischen",
+    "Brightness" : "Helligkeit",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Spiegeln X rückgängig",
+    "Flip X" : "Spiegeln X",
+    "Un-flip Y" : "Spiegeln Y rückgängig",
+    "Flip Y" : "Spiegeln Y",
+    "HSV" : "HSV",
+    "Hue" : "Farbton",
+    "Saturation" : "Sättigung",
+    "Value" : "Wert",
+    "Image" : "Bild",
+    "Importing …" : "Importiere …",
+    "+ Add image" : "+ Bild hinzufügen",
+    "Line" : "Linie",
+    "Pen" : "Stift",
+    "Polygon" : "Polygon",
+    "Sides" : "Seiten",
     "Rectangle" : "Rechteck",
+    "Corner Radius" : "Eckenradius",
+    "Width in pixels" : "Breite in Pixel",
+    "Height in pixels" : "Höhe in Pixel",
+    "Toggle ratio lock" : "Verhältnis-Sperre umschalten",
+    "Reset to original image size" : "Auf ursprüngliche Bildgröße zurücksetzen",
+    "Rotate" : "Rotieren",
+    "Text" : "Text",
+    "Text spacing" : "Textabstand",
+    "Text alignment" : "Textausrichtung",
+    "Font family" : "Schriftenfamilie",
+    "Size" : "Größe",
+    "Letter spacing" : "Buchstaben-Abstand",
+    "Line height" : "Zeilenhöhe",
+    "Warmth" : "Wärme",
+    "+ Add watermark" : "+ Wasserzeichen hinzufügen",
+    "Choose watermark type" : "Typ des Wasserzeichens auswählen",
+    "Upload watermark" : "Wasserzeichenhochladen",
+    "Add as text" : "AlsTexthinzufügen",
+    "Padding" : "Auffüllen",
+    "Shadow" : "Schatten",
+    "Horizontal" : "Horizontal",
+    "Vertical" : "Vertikal",
+    "Opacity" : "Deckkraft",
+    "Position" : "Position",
+    "Stroke" : "Strich",
+    "Save image as" : "Bild speichern unter",
+    "Extension" : "Erweiterung",
+    "Name is required." : "Name ist erforderlich.",
+    "Quality" : "Qualität",
+    "Saved image size (width x height)" : "Gespeicherte Bildgröße (Breite x Höhe)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachte, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann.",
+    "Actual size (100%)" : "Tatsächliche Größe (100%)",
+    "Fit size" : "Größe anpassen",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
     "General Failure" : "Allgemeiner Fehler",
diff --git a/l10n/de.json b/l10n/de.json
index f81657882..6f6a967aa 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -20,6 +20,9 @@
     "You can always change this later in settings" : "Du kannst das auch noch später in den Einstellungen ändern.",
     "Choose the root of your timeline" : "Wähle den Start deiner Zeitleiste aus",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuche es nochmal.",
+    "Unsaved changes" : "Ungespeicherte Änderungen",
+    "Drop changes" : "Änderungen löschen",
+    "Edit" : "Bearbeiten",
     "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
@@ -42,6 +45,7 @@
     "Choose the root for the folders view" : "Wähle das Stammverzeichnis für die Ordneransicht",
     "Your Timeline" : "Deine Zeitleiste",
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
+    "Share" : "Teilen",
     "Sidebar" : "Seitenleiste",
     "Processing … {n}/{m}" : "Verarbeite … {n}/{m}",
     "Search for collaborators" : "Suche nach Mitbearbeitenden",
@@ -105,8 +109,90 @@
     "Share folder" : "Ordner teilen",
     "Move left" : "Nach links verschieben",
     "Move right" : "Nach rechts verschieben",
+    "Save as" : "Speichern als",
+    "Reset" : "Zurücksetzen",
+    "All changes will be lost." : "Alle Änderungen gehen verloren.",
+    "Are you sure you want to continue?" : "Bist du dir sicher, dass du fortsetzen möchtest?",
+    "Continue" : "Fortsetzen",
+    "Undo" : "Rückgängig",
+    "Redo" : "Wiederherstellen",
+    "Show original image" : "Originalbild anzeigen",
+    "Zoom in" : "Hinein zoomen",
+    "Zoom out" : "Hinauszoomen",
+    "Toggle zoom menu" : "Zoom-Menü umschalten",
+    "Adjust" : "Anpassen",
+    "Fine-tune" : "Feinabstimmung",
+    "Filters" : "Filter",
+    "Watermark" : "Wasserzeichen",
+    "Draw" : "Zeichnen",
+    "Resize" : "Größe ändern",
+    "Invalid image." : "Ungültiges Bild",
+    "Error while uploading the image." : "Fehler beim Hochladen des Bildes.",
+    "are not images" : "Sind keine Bilder",
     "is not an image" : "Ist kein Bild",
+    "to be uploaded" : "zum Hochladen",
+    "Crop" : "Zuschneiden",
+    "Original" : "Original",
+    "Custom" : "Benutzerdefiniert",
+    "Square" : "Quadrat",
+    "Landscape" : "Landschaft",
+    "Portrait" : "Porträt",
+    "Ellipse" : "Ellipse",
+    "Classic TV" : "Klassisches Fernsehen",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Pfeil",
+    "Blur" : "Verwischen",
+    "Brightness" : "Helligkeit",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Spiegeln X rückgängig",
+    "Flip X" : "Spiegeln X",
+    "Un-flip Y" : "Spiegeln Y rückgängig",
+    "Flip Y" : "Spiegeln Y",
+    "HSV" : "HSV",
+    "Hue" : "Farbton",
+    "Saturation" : "Sättigung",
+    "Value" : "Wert",
+    "Image" : "Bild",
+    "Importing …" : "Importiere …",
+    "+ Add image" : "+ Bild hinzufügen",
+    "Line" : "Linie",
+    "Pen" : "Stift",
+    "Polygon" : "Polygon",
+    "Sides" : "Seiten",
     "Rectangle" : "Rechteck",
+    "Corner Radius" : "Eckenradius",
+    "Width in pixels" : "Breite in Pixel",
+    "Height in pixels" : "Höhe in Pixel",
+    "Toggle ratio lock" : "Verhältnis-Sperre umschalten",
+    "Reset to original image size" : "Auf ursprüngliche Bildgröße zurücksetzen",
+    "Rotate" : "Rotieren",
+    "Text" : "Text",
+    "Text spacing" : "Textabstand",
+    "Text alignment" : "Textausrichtung",
+    "Font family" : "Schriftenfamilie",
+    "Size" : "Größe",
+    "Letter spacing" : "Buchstaben-Abstand",
+    "Line height" : "Zeilenhöhe",
+    "Warmth" : "Wärme",
+    "+ Add watermark" : "+ Wasserzeichen hinzufügen",
+    "Choose watermark type" : "Typ des Wasserzeichens auswählen",
+    "Upload watermark" : "Wasserzeichenhochladen",
+    "Add as text" : "AlsTexthinzufügen",
+    "Padding" : "Auffüllen",
+    "Shadow" : "Schatten",
+    "Horizontal" : "Horizontal",
+    "Vertical" : "Vertikal",
+    "Opacity" : "Deckkraft",
+    "Position" : "Position",
+    "Stroke" : "Strich",
+    "Save image as" : "Bild speichern unter",
+    "Extension" : "Erweiterung",
+    "Name is required." : "Name ist erforderlich.",
+    "Quality" : "Qualität",
+    "Saved image size (width x height)" : "Gespeicherte Bildgröße (Breite x Höhe)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachte, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann.",
+    "Actual size (100%)" : "Tatsächliche Größe (100%)",
+    "Fit size" : "Größe anpassen",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
     "General Failure" : "Allgemeiner Fehler",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 5281af145..dcfaa033f 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Tags" : "Schlagworte",
     "Maps" : "Karten",
     "Settings" : "Einstellungen",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Ein besseres Fotoerlebnis erwartet Sie",
     "Choose the root folder of your timeline to begin" : "Wählen Sie das Wurzelverzeichnis Ihrer Zeitleiste um zu beginnen",
     "If you just installed Memories, run:" : "Wenn Sie Memorys gerade installiert haben, führen Sie Folgendes aus:",
@@ -25,6 +26,11 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Start Ihrer Zeitleiste auswählen",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuchen Sie es nochmal.",
     "Found {total} photos in {path}" : "{total} Fotos gefunden in {path}",
+    "Image saved successfully" : "Bild erfolgreich gespeichert",
+    "Error saving image" : "Fehler beim Speichern des Bildes",
+    "Unsaved changes" : "Ungespeicherte Änderungen",
+    "Drop changes" : "Änderungen verwerfen",
+    "Edit" : "Bearbeiten",
     "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
@@ -49,7 +55,10 @@ OC.L10N.register(
     "Choose the root for the folders view" : "Wählen Sie das Stammverzeichnis für die Ordneransicht",
     "Your Timeline" : "Ihre Zeitleiste",
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
+    "Share" : "Teilen",
     "Sidebar" : "Seitenleiste",
+    "Video sharing not supported yet" : "Teilen von Videos wird bislang nicht unterstützt",
+    "Cannot share this type of data" : "Diese Art von Daten kann nicht geteilt werden",
     "Processing … {n}/{m}" : "Verarbeite… {n}/{m}",
     "{n} photos added to album" : "{n} Fotos zum Album hinzugefügt",
     "Search for collaborators" : "Suche nach Mitbearbeitenden",
@@ -125,8 +134,90 @@ OC.L10N.register(
     "Share folder" : "Ordner teilen",
     "Move left" : "Nach links verschieben",
     "Move right" : "Nach rechts verschieben",
+    "Save as" : "Speichern als",
+    "Reset" : "Zurücksetzen",
+    "All changes will be lost." : "Alle Änderungen gehen verloren.",
+    "Are you sure you want to continue?" : "Sind Sie sich sicher, dass Sie fortsetzen wollen?",
+    "Continue" : "Fortsetzen",
+    "Undo" : "Rückgängig",
+    "Redo" : "Wiederherstellen",
+    "Show original image" : "Originalbild anzeigen",
+    "Zoom in" : "Hineinzoomen",
+    "Zoom out" : "Hinauszoomen",
+    "Toggle zoom menu" : "Zoom-Menü umschalten",
+    "Adjust" : "Anpassen",
+    "Fine-tune" : "Feinabstimmung",
+    "Filters" : "Filter",
+    "Watermark" : "Wasserzeichen",
+    "Draw" : "Zeichnen",
+    "Resize" : "Größe ändern",
+    "Invalid image." : "Ungültiges Bild.",
+    "Error while uploading the image." : "Fehler beim Hochladen des Bildes.",
+    "are not images" : "Sind keine Bilder",
     "is not an image" : "Ist kein Bild",
+    "to be uploaded" : "zum Hochladen",
+    "Crop" : "Zuschneiden",
+    "Original" : "Original",
+    "Custom" : "Benutzerdefiniert",
+    "Square" : "Quadrat",
+    "Landscape" : "Querformat",
+    "Portrait" : "Hochformat",
+    "Ellipse" : "Ellipse",
+    "Classic TV" : "Klassisches Fernsehen",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Pfeil",
+    "Blur" : "Verwischen",
+    "Brightness" : "Helligkeit",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Spiegeln X rückgängig",
+    "Flip X" : "Spiegeln X",
+    "Un-flip Y" : "Spiegeln Y rückgängig",
+    "Flip Y" : "Spiegeln Y",
+    "HSV" : "HSV",
+    "Hue" : "Farbton",
+    "Saturation" : "Sättigung",
+    "Value" : "Wert",
+    "Image" : "Bild",
+    "Importing …" : "Importiere…",
+    "+ Add image" : "+ Bild hinzufügen",
+    "Line" : "Linie",
+    "Pen" : "Stift",
+    "Polygon" : "Polygon",
+    "Sides" : "Seiten",
     "Rectangle" : "Rechteck",
+    "Corner Radius" : "Eckenradius",
+    "Width in pixels" : "Breite in Pixel",
+    "Height in pixels" : "Höhe in Pixel",
+    "Toggle ratio lock" : "Verhältnis-Sperre umschalten",
+    "Reset to original image size" : "Auf ursprüngliche Bildgröße zurücksetzen",
+    "Rotate" : "Drehen",
+    "Text" : "Text",
+    "Text spacing" : "Text-Abstand",
+    "Text alignment" : "Textausrichtung",
+    "Font family" : "Schriftenfamilie",
+    "Size" : "Größe",
+    "Letter spacing" : "Buchstaben-Abstand",
+    "Line height" : "Zeilenhöhe",
+    "Warmth" : "Wärme",
+    "+ Add watermark" : "+ Wasserzeichen hinzufügen",
+    "Choose watermark type" : "Wasserzeichentyp auswählen",
+    "Upload watermark" : "Wasserzeichen hochladen",
+    "Add as text" : "Als Text hinzufügen",
+    "Padding" : "Auffüllen",
+    "Shadow" : "Schatten",
+    "Horizontal" : "Horizontal",
+    "Vertical" : "Vertikal",
+    "Opacity" : "Deckkraft",
+    "Position" : "Position",
+    "Stroke" : " Strich",
+    "Save image as" : "Bild speichern als",
+    "Extension" : "Erweiterung",
+    "Name is required." : "Name ist erforderlich.",
+    "Quality" : "Qualität",
+    "Saved image size (width x height)" : "Gespeicherte Bildgröße (Breite x Höhe)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachten Sie, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann",
+    "Actual size (100%)" : "Tatsächliche Größe (100%)",
+    "Fit size" : "Größe anpassen",
     "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 72ca58517..0bdf5d210 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -13,6 +13,7 @@
     "Tags" : "Schlagworte",
     "Maps" : "Karten",
     "Settings" : "Einstellungen",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Ein besseres Fotoerlebnis erwartet Sie",
     "Choose the root folder of your timeline to begin" : "Wählen Sie das Wurzelverzeichnis Ihrer Zeitleiste um zu beginnen",
     "If you just installed Memories, run:" : "Wenn Sie Memorys gerade installiert haben, führen Sie Folgendes aus:",
@@ -23,6 +24,11 @@
     "Choose the root of your timeline" : "Start Ihrer Zeitleiste auswählen",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuchen Sie es nochmal.",
     "Found {total} photos in {path}" : "{total} Fotos gefunden in {path}",
+    "Image saved successfully" : "Bild erfolgreich gespeichert",
+    "Error saving image" : "Fehler beim Speichern des Bildes",
+    "Unsaved changes" : "Ungespeicherte Änderungen",
+    "Drop changes" : "Änderungen verwerfen",
+    "Edit" : "Bearbeiten",
     "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
@@ -47,7 +53,10 @@
     "Choose the root for the folders view" : "Wählen Sie das Stammverzeichnis für die Ordneransicht",
     "Your Timeline" : "Ihre Zeitleiste",
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
+    "Share" : "Teilen",
     "Sidebar" : "Seitenleiste",
+    "Video sharing not supported yet" : "Teilen von Videos wird bislang nicht unterstützt",
+    "Cannot share this type of data" : "Diese Art von Daten kann nicht geteilt werden",
     "Processing … {n}/{m}" : "Verarbeite… {n}/{m}",
     "{n} photos added to album" : "{n} Fotos zum Album hinzugefügt",
     "Search for collaborators" : "Suche nach Mitbearbeitenden",
@@ -123,8 +132,90 @@
     "Share folder" : "Ordner teilen",
     "Move left" : "Nach links verschieben",
     "Move right" : "Nach rechts verschieben",
+    "Save as" : "Speichern als",
+    "Reset" : "Zurücksetzen",
+    "All changes will be lost." : "Alle Änderungen gehen verloren.",
+    "Are you sure you want to continue?" : "Sind Sie sich sicher, dass Sie fortsetzen wollen?",
+    "Continue" : "Fortsetzen",
+    "Undo" : "Rückgängig",
+    "Redo" : "Wiederherstellen",
+    "Show original image" : "Originalbild anzeigen",
+    "Zoom in" : "Hineinzoomen",
+    "Zoom out" : "Hinauszoomen",
+    "Toggle zoom menu" : "Zoom-Menü umschalten",
+    "Adjust" : "Anpassen",
+    "Fine-tune" : "Feinabstimmung",
+    "Filters" : "Filter",
+    "Watermark" : "Wasserzeichen",
+    "Draw" : "Zeichnen",
+    "Resize" : "Größe ändern",
+    "Invalid image." : "Ungültiges Bild.",
+    "Error while uploading the image." : "Fehler beim Hochladen des Bildes.",
+    "are not images" : "Sind keine Bilder",
     "is not an image" : "Ist kein Bild",
+    "to be uploaded" : "zum Hochladen",
+    "Crop" : "Zuschneiden",
+    "Original" : "Original",
+    "Custom" : "Benutzerdefiniert",
+    "Square" : "Quadrat",
+    "Landscape" : "Querformat",
+    "Portrait" : "Hochformat",
+    "Ellipse" : "Ellipse",
+    "Classic TV" : "Klassisches Fernsehen",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Pfeil",
+    "Blur" : "Verwischen",
+    "Brightness" : "Helligkeit",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Spiegeln X rückgängig",
+    "Flip X" : "Spiegeln X",
+    "Un-flip Y" : "Spiegeln Y rückgängig",
+    "Flip Y" : "Spiegeln Y",
+    "HSV" : "HSV",
+    "Hue" : "Farbton",
+    "Saturation" : "Sättigung",
+    "Value" : "Wert",
+    "Image" : "Bild",
+    "Importing …" : "Importiere…",
+    "+ Add image" : "+ Bild hinzufügen",
+    "Line" : "Linie",
+    "Pen" : "Stift",
+    "Polygon" : "Polygon",
+    "Sides" : "Seiten",
     "Rectangle" : "Rechteck",
+    "Corner Radius" : "Eckenradius",
+    "Width in pixels" : "Breite in Pixel",
+    "Height in pixels" : "Höhe in Pixel",
+    "Toggle ratio lock" : "Verhältnis-Sperre umschalten",
+    "Reset to original image size" : "Auf ursprüngliche Bildgröße zurücksetzen",
+    "Rotate" : "Drehen",
+    "Text" : "Text",
+    "Text spacing" : "Text-Abstand",
+    "Text alignment" : "Textausrichtung",
+    "Font family" : "Schriftenfamilie",
+    "Size" : "Größe",
+    "Letter spacing" : "Buchstaben-Abstand",
+    "Line height" : "Zeilenhöhe",
+    "Warmth" : "Wärme",
+    "+ Add watermark" : "+ Wasserzeichen hinzufügen",
+    "Choose watermark type" : "Wasserzeichentyp auswählen",
+    "Upload watermark" : "Wasserzeichen hochladen",
+    "Add as text" : "Als Text hinzufügen",
+    "Padding" : "Auffüllen",
+    "Shadow" : "Schatten",
+    "Horizontal" : "Horizontal",
+    "Vertical" : "Vertikal",
+    "Opacity" : "Deckkraft",
+    "Position" : "Position",
+    "Stroke" : " Strich",
+    "Save image as" : "Bild speichern als",
+    "Extension" : "Erweiterung",
+    "Name is required." : "Name ist erforderlich.",
+    "Quality" : "Qualität",
+    "Saved image size (width x height)" : "Gespeicherte Bildgröße (Breite x Höhe)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachten Sie, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann",
+    "Actual size (100%)" : "Tatsächliche Größe (100%)",
+    "Fit size" : "Größe anpassen",
     "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
diff --git a/l10n/el.js b/l10n/el.js
index a59760138..053e8f434 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Tags" : "Ετικέτες",
     "Maps" : "Χάρτες",
     "Settings" : "Ρυθμίσεις",
+    "Unsaved changes" : "Μη αποθηκευμένες αλλαγές",
+    "Edit" : "Επεξεργασία",
     "Loading …" : "Φόρτωση …",
     "Cancel" : "Ακύρωση",
     "Delete" : "Διαγραφή",
@@ -19,6 +21,7 @@ OC.L10N.register(
     "Favorite" : "Αγαπημένο",
     "Unarchive" : "Αναίρεση αρχειοθέτησης",
     "View in folder" : "Προβολή στον φάκελο",
+    "Share" : "Διαμοιρασμός",
     "Copy public link" : "Αντιγραφή δημόσιου συνδέσμου",
     "Public link" : "Δημόσιος σύνδεσμος",
     "Back" : "Πίσω",
@@ -32,6 +35,21 @@ OC.L10N.register(
     "Name" : "Όνομα",
     "Update" : "Ενημέρωση",
     "Refresh" : "Ανανέωση",
-    "Share folder" : "Διαμοιρασμός φακέλου"
+    "Share folder" : "Διαμοιρασμός φακέλου",
+    "Reset" : "Επαναφορά",
+    "Continue" : "Συνεχίστε",
+    "Undo" : "Ακύρωση ενέργειας",
+    "Redo" : "Ξανακάντε",
+    "Zoom in" : "Εστίαση",
+    "Original" : "Πρωτότυπο",
+    "Custom" : "Προσαρμοσμένο",
+    "Value" : "Τιμή",
+    "Image" : "Εικόνα",
+    "Text" : "Κείμενο",
+    "Size" : "Μέγεθος",
+    "Position" : "Θέση",
+    "Extension" : "Επέκταση",
+    "Name is required." : "Απαιτείται όνομα.",
+    "Quality" : "Ποιότητα"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/el.json b/l10n/el.json
index 465b8331c..55ec07396 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -10,6 +10,8 @@
     "Tags" : "Ετικέτες",
     "Maps" : "Χάρτες",
     "Settings" : "Ρυθμίσεις",
+    "Unsaved changes" : "Μη αποθηκευμένες αλλαγές",
+    "Edit" : "Επεξεργασία",
     "Loading …" : "Φόρτωση …",
     "Cancel" : "Ακύρωση",
     "Delete" : "Διαγραφή",
@@ -17,6 +19,7 @@
     "Favorite" : "Αγαπημένο",
     "Unarchive" : "Αναίρεση αρχειοθέτησης",
     "View in folder" : "Προβολή στον φάκελο",
+    "Share" : "Διαμοιρασμός",
     "Copy public link" : "Αντιγραφή δημόσιου συνδέσμου",
     "Public link" : "Δημόσιος σύνδεσμος",
     "Back" : "Πίσω",
@@ -30,6 +33,21 @@
     "Name" : "Όνομα",
     "Update" : "Ενημέρωση",
     "Refresh" : "Ανανέωση",
-    "Share folder" : "Διαμοιρασμός φακέλου"
+    "Share folder" : "Διαμοιρασμός φακέλου",
+    "Reset" : "Επαναφορά",
+    "Continue" : "Συνεχίστε",
+    "Undo" : "Ακύρωση ενέργειας",
+    "Redo" : "Ξανακάντε",
+    "Zoom in" : "Εστίαση",
+    "Original" : "Πρωτότυπο",
+    "Custom" : "Προσαρμοσμένο",
+    "Value" : "Τιμή",
+    "Image" : "Εικόνα",
+    "Text" : "Κείμενο",
+    "Size" : "Μέγεθος",
+    "Position" : "Θέση",
+    "Extension" : "Επέκταση",
+    "Name is required." : "Απαιτείται όνομα.",
+    "Quality" : "Ποιότητα"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 14be8fd88..6f170977f 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -8,6 +8,8 @@ OC.L10N.register(
     "Tags" : "Tags",
     "Maps" : "Maps",
     "Settings" : "Settings",
+    "Unsaved changes" : "Unsaved changes",
+    "Edit" : "Edit",
     "Loading …" : "Loading …",
     "Cancel" : "Cancel",
     "Delete" : "Delete",
@@ -15,6 +17,7 @@ OC.L10N.register(
     "Favorite" : "Favourite",
     "Unarchive" : "Unarchive",
     "View in folder" : "View in folder",
+    "Share" : "Share",
     "Public link" : "Public link",
     "Back" : "Back",
     "Save" : "Save",
@@ -25,6 +28,15 @@ OC.L10N.register(
     "Name" : "Surname",
     "Update" : "Update",
     "Refresh" : "Refresh",
-    "Image" : "Image"
+    "Reset" : "Reset",
+    "Continue" : "Continue",
+    "Undo" : "Undo",
+    "Original" : "Original",
+    "Custom" : "Custom",
+    "Value" : "Value",
+    "Image" : "Image",
+    "Text" : "Text",
+    "Size" : "Size",
+    "Position" : "Position"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index efc395518..465fab69e 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -6,6 +6,8 @@
     "Tags" : "Tags",
     "Maps" : "Maps",
     "Settings" : "Settings",
+    "Unsaved changes" : "Unsaved changes",
+    "Edit" : "Edit",
     "Loading …" : "Loading …",
     "Cancel" : "Cancel",
     "Delete" : "Delete",
@@ -13,6 +15,7 @@
     "Favorite" : "Favourite",
     "Unarchive" : "Unarchive",
     "View in folder" : "View in folder",
+    "Share" : "Share",
     "Public link" : "Public link",
     "Back" : "Back",
     "Save" : "Save",
@@ -23,6 +26,15 @@
     "Name" : "Surname",
     "Update" : "Update",
     "Refresh" : "Refresh",
-    "Image" : "Image"
+    "Reset" : "Reset",
+    "Continue" : "Continue",
+    "Undo" : "Undo",
+    "Original" : "Original",
+    "Custom" : "Custom",
+    "Value" : "Value",
+    "Image" : "Image",
+    "Text" : "Text",
+    "Size" : "Size",
+    "Position" : "Position"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/eo.js b/l10n/eo.js
index 2a35d7224..caa415f20 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -9,12 +9,15 @@ OC.L10N.register(
     "Tags" : "Etikedoj",
     "Maps" : "Mapoj",
     "Settings" : "Agordoj",
+    "Unsaved changes" : "Nekonservitaj ŝanĝoj",
+    "Edit" : "Modifi",
     "Loading …" : "Ŝargas …",
     "Cancel" : "Nuligi",
     "Delete" : "Forigi",
     "Download" : "Elŝuti",
     "Favorite" : "Pliŝatati",
     "View in folder" : "Vidi en dosierujo",
+    "Share" : "Kunhavigi",
     "Public link" : "Publika ligilo",
     "Back" : "Antaŭen",
     "Save" : "Konservi",
@@ -24,6 +27,15 @@ OC.L10N.register(
     "Hour" : "Horo",
     "Name" : "Nomo",
     "Update" : "Ĝisdatigi",
-    "Refresh" : "Aktualigi"
+    "Refresh" : "Aktualigi",
+    "Reset" : "Restarigi",
+    "Continue" : "Daŭrigi",
+    "Undo" : "Malfari",
+    "Redo" : "Refari",
+    "Custom" : "Propra",
+    "Text" : "Teksto",
+    "Size" : "Grando",
+    "Position" : "Loko",
+    "Extension" : "Dosiersufikso"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/eo.json b/l10n/eo.json
index 793de0012..d2830e886 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -7,12 +7,15 @@
     "Tags" : "Etikedoj",
     "Maps" : "Mapoj",
     "Settings" : "Agordoj",
+    "Unsaved changes" : "Nekonservitaj ŝanĝoj",
+    "Edit" : "Modifi",
     "Loading …" : "Ŝargas …",
     "Cancel" : "Nuligi",
     "Delete" : "Forigi",
     "Download" : "Elŝuti",
     "Favorite" : "Pliŝatati",
     "View in folder" : "Vidi en dosierujo",
+    "Share" : "Kunhavigi",
     "Public link" : "Publika ligilo",
     "Back" : "Antaŭen",
     "Save" : "Konservi",
@@ -22,6 +25,15 @@
     "Hour" : "Horo",
     "Name" : "Nomo",
     "Update" : "Ĝisdatigi",
-    "Refresh" : "Aktualigi"
+    "Refresh" : "Aktualigi",
+    "Reset" : "Restarigi",
+    "Continue" : "Daŭrigi",
+    "Undo" : "Malfari",
+    "Redo" : "Refari",
+    "Custom" : "Propra",
+    "Text" : "Teksto",
+    "Size" : "Grando",
+    "Position" : "Loko",
+    "Extension" : "Dosiersufikso"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
index d4f84f16a..9259f07ad 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Una mejor experiencia de fotos te espera",
     "Choose the root folder of your timeline to begin" : "Escoja la carpeta raíz de su línea de tiempo para comenzar",
     "If you just installed Memories, run:" : "Si acaba de instalar Memories, ejecute:",
@@ -25,6 +26,11 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Seleccione la raíz de su línea de tiempo",
     "The selected folder does not seem to be valid. Try again." : "La carpeta seleccionada no parece ser válida. Intente de nuevo.",
     "Found {total} photos in {path}" : "Se encontraron {total} fotos en {path}",
+    "Image saved successfully" : "La imagen se guardó exitósamente",
+    "Error saving image" : "Error guardando imágen",
+    "Unsaved changes" : "Cambios sin guardar",
+    "Drop changes" : "Descartar cambios",
+    "Edit" : "Editar",
     "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
@@ -49,7 +55,10 @@ OC.L10N.register(
     "Choose the root for the folders view" : "Seleccione la raíz de la vista de carpetas",
     "Your Timeline" : "Su línea de tiempo",
     "Failed to load some photos" : "Fallo al cargar algunas fotos",
+    "Share" : "Compartir",
     "Sidebar" : "Barra lateral",
+    "Video sharing not supported yet" : "Compartir videos no es soportado todavía",
+    "Cannot share this type of data" : "No se puede compartir este tipo de datos",
     "Processing … {n}/{m}" : "Procesando ... {n}/{m}",
     "{n} photos added to album" : "Se agregaron {n} fotos al álbum",
     "Search for collaborators" : "Buscar colaboradores",
@@ -125,9 +134,90 @@ OC.L10N.register(
     "Share folder" : "Compartir carpeta",
     "Move left" : "Mover a la izquierda",
     "Move right" : "Mover a la derecha",
+    "Save as" : "Guardar como",
+    "Reset" : "Restablecer",
+    "All changes will be lost." : "Todos los cambios se perderán.",
+    "Are you sure you want to continue?" : "¿Está seguro que desea continuar?",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Redo" : "Rehacer",
+    "Show original image" : "Mostrar mensaje original",
+    "Zoom in" : "Acercar",
+    "Zoom out" : "Alejar",
+    "Toggle zoom menu" : "Conmutar menú de zoom",
+    "Adjust" : "Ajustar",
+    "Fine-tune" : "Entonar",
+    "Filters" : "Filtros",
+    "Watermark" : "Marca de agua",
+    "Draw" : "Dibujar",
+    "Resize" : "Redimensionar",
+    "Invalid image." : "Imágen inválida",
+    "Error while uploading the image." : "Se encontró un error al cargar la imagen.",
+    "are not images" : "no son imágenes",
     "is not an image" : "no es una imágen",
+    "to be uploaded" : "a cargar",
+    "Crop" : "Recortar",
+    "Original" : "Original",
+    "Custom" : "Personalizado",
+    "Square" : "Cuadrado",
+    "Landscape" : "Paisaje",
+    "Portrait" : "Retrato",
+    "Ellipse" : "Elipse",
+    "Classic TV" : "TV clásica",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Flecha",
+    "Blur" : "Difuminar",
+    "Brightness" : "Brillo",
+    "Contrast" : "Contraste",
+    "Un-flip X" : "Revertir voltear X",
+    "Flip X" : "Voltear X",
+    "Un-flip Y" : "Revertir voltear Y",
+    "Flip Y" : "Voltear Y",
+    "HSV" : "HSV",
+    "Hue" : "Tone",
+    "Saturation" : "Saturación",
+    "Value" : "Valor",
     "Image" : "Imagen",
+    "Importing …" : "Importando ...",
+    "+ Add image" : "+ Añadir imágen",
+    "Line" : "Línea",
+    "Pen" : "Pluma",
+    "Polygon" : "Polígono",
+    "Sides" : "Lados",
     "Rectangle" : "Rectángulo",
+    "Corner Radius" : "Radio de esquina",
+    "Width in pixels" : "Ancho en píxeles",
+    "Height in pixels" : "Altura en píxeles",
+    "Toggle ratio lock" : "Conmutar bloqueo de proporción",
+    "Reset to original image size" : "Reajustar a tamaño original de la imágen",
+    "Rotate" : "Rotar",
+    "Text" : "Texto",
+    "Text spacing" : "Espacio del texto",
+    "Text alignment" : "Alineación del texto",
+    "Font family" : "Familia de fuente",
+    "Size" : "Tamaño",
+    "Letter spacing" : "Espacio entre letras",
+    "Line height" : "Altura de línea",
+    "Warmth" : "Calidez",
+    "+ Add watermark" : "+ Añadir marca de agua",
+    "Choose watermark type" : "Seleccione el tipo de marca de agua",
+    "Upload watermark" : "Cargar marca de agua",
+    "Add as text" : "Añadir como texto",
+    "Padding" : "Desplazamiento",
+    "Shadow" : "Sombra",
+    "Horizontal" : "Horizontal",
+    "Vertical" : "Vertical",
+    "Opacity" : "Opacidad",
+    "Position" : "Posición",
+    "Stroke" : "Trazo",
+    "Save image as" : "Guardar imagen como",
+    "Extension" : "Extensión",
+    "Name is required." : "Se requiere Nombre.",
+    "Quality" : "Calidad",
+    "Saved image size (width x height)" : "Tamaño de la imagen guardada (anchura x altura)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tenga en cuenta que el área a recortar es menor al redimensionamiento aplicado lo que puede causar pérdida de calidad",
+    "Actual size (100%)" : "Tamaño actual (100%)",
+    "Fit size" : "Ajustar tamaño",
     "Shared Folder" : "Carpeta compartida",
     "Failed to create {albumName}." : "Fallo al crear {albumName}",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Fallo al renombrar {currentAlbumName} a {newAlbumName}.",
diff --git a/l10n/es.json b/l10n/es.json
index ddc227acb..a9a970e77 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -13,6 +13,7 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Una mejor experiencia de fotos te espera",
     "Choose the root folder of your timeline to begin" : "Escoja la carpeta raíz de su línea de tiempo para comenzar",
     "If you just installed Memories, run:" : "Si acaba de instalar Memories, ejecute:",
@@ -23,6 +24,11 @@
     "Choose the root of your timeline" : "Seleccione la raíz de su línea de tiempo",
     "The selected folder does not seem to be valid. Try again." : "La carpeta seleccionada no parece ser válida. Intente de nuevo.",
     "Found {total} photos in {path}" : "Se encontraron {total} fotos en {path}",
+    "Image saved successfully" : "La imagen se guardó exitósamente",
+    "Error saving image" : "Error guardando imágen",
+    "Unsaved changes" : "Cambios sin guardar",
+    "Drop changes" : "Descartar cambios",
+    "Edit" : "Editar",
     "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
@@ -47,7 +53,10 @@
     "Choose the root for the folders view" : "Seleccione la raíz de la vista de carpetas",
     "Your Timeline" : "Su línea de tiempo",
     "Failed to load some photos" : "Fallo al cargar algunas fotos",
+    "Share" : "Compartir",
     "Sidebar" : "Barra lateral",
+    "Video sharing not supported yet" : "Compartir videos no es soportado todavía",
+    "Cannot share this type of data" : "No se puede compartir este tipo de datos",
     "Processing … {n}/{m}" : "Procesando ... {n}/{m}",
     "{n} photos added to album" : "Se agregaron {n} fotos al álbum",
     "Search for collaborators" : "Buscar colaboradores",
@@ -123,9 +132,90 @@
     "Share folder" : "Compartir carpeta",
     "Move left" : "Mover a la izquierda",
     "Move right" : "Mover a la derecha",
+    "Save as" : "Guardar como",
+    "Reset" : "Restablecer",
+    "All changes will be lost." : "Todos los cambios se perderán.",
+    "Are you sure you want to continue?" : "¿Está seguro que desea continuar?",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Redo" : "Rehacer",
+    "Show original image" : "Mostrar mensaje original",
+    "Zoom in" : "Acercar",
+    "Zoom out" : "Alejar",
+    "Toggle zoom menu" : "Conmutar menú de zoom",
+    "Adjust" : "Ajustar",
+    "Fine-tune" : "Entonar",
+    "Filters" : "Filtros",
+    "Watermark" : "Marca de agua",
+    "Draw" : "Dibujar",
+    "Resize" : "Redimensionar",
+    "Invalid image." : "Imágen inválida",
+    "Error while uploading the image." : "Se encontró un error al cargar la imagen.",
+    "are not images" : "no son imágenes",
     "is not an image" : "no es una imágen",
+    "to be uploaded" : "a cargar",
+    "Crop" : "Recortar",
+    "Original" : "Original",
+    "Custom" : "Personalizado",
+    "Square" : "Cuadrado",
+    "Landscape" : "Paisaje",
+    "Portrait" : "Retrato",
+    "Ellipse" : "Elipse",
+    "Classic TV" : "TV clásica",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Flecha",
+    "Blur" : "Difuminar",
+    "Brightness" : "Brillo",
+    "Contrast" : "Contraste",
+    "Un-flip X" : "Revertir voltear X",
+    "Flip X" : "Voltear X",
+    "Un-flip Y" : "Revertir voltear Y",
+    "Flip Y" : "Voltear Y",
+    "HSV" : "HSV",
+    "Hue" : "Tone",
+    "Saturation" : "Saturación",
+    "Value" : "Valor",
     "Image" : "Imagen",
+    "Importing …" : "Importando ...",
+    "+ Add image" : "+ Añadir imágen",
+    "Line" : "Línea",
+    "Pen" : "Pluma",
+    "Polygon" : "Polígono",
+    "Sides" : "Lados",
     "Rectangle" : "Rectángulo",
+    "Corner Radius" : "Radio de esquina",
+    "Width in pixels" : "Ancho en píxeles",
+    "Height in pixels" : "Altura en píxeles",
+    "Toggle ratio lock" : "Conmutar bloqueo de proporción",
+    "Reset to original image size" : "Reajustar a tamaño original de la imágen",
+    "Rotate" : "Rotar",
+    "Text" : "Texto",
+    "Text spacing" : "Espacio del texto",
+    "Text alignment" : "Alineación del texto",
+    "Font family" : "Familia de fuente",
+    "Size" : "Tamaño",
+    "Letter spacing" : "Espacio entre letras",
+    "Line height" : "Altura de línea",
+    "Warmth" : "Calidez",
+    "+ Add watermark" : "+ Añadir marca de agua",
+    "Choose watermark type" : "Seleccione el tipo de marca de agua",
+    "Upload watermark" : "Cargar marca de agua",
+    "Add as text" : "Añadir como texto",
+    "Padding" : "Desplazamiento",
+    "Shadow" : "Sombra",
+    "Horizontal" : "Horizontal",
+    "Vertical" : "Vertical",
+    "Opacity" : "Opacidad",
+    "Position" : "Posición",
+    "Stroke" : "Trazo",
+    "Save image as" : "Guardar imagen como",
+    "Extension" : "Extensión",
+    "Name is required." : "Se requiere Nombre.",
+    "Quality" : "Calidad",
+    "Saved image size (width x height)" : "Tamaño de la imagen guardada (anchura x altura)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tenga en cuenta que el área a recortar es menor al redimensionamiento aplicado lo que puede causar pérdida de calidad",
+    "Actual size (100%)" : "Tamaño actual (100%)",
+    "Fit size" : "Ajustar tamaño",
     "Shared Folder" : "Carpeta compartida",
     "Failed to create {albumName}." : "Fallo al crear {albumName}",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Fallo al renombrar {currentAlbumName} a {newAlbumName}.",
diff --git a/l10n/es_419.js b/l10n/es_419.js
index 4b50b7e7c..2cc3b9c23 100644
--- a/l10n/es_419.js
+++ b/l10n/es_419.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -22,6 +25,14 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Reset" : "Restaurar",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_419.json b/l10n/es_419.json
index b5bc3af91..63c1ca037 100644
--- a/l10n/es_419.json
+++ b/l10n/es_419.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -20,6 +23,14 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Actualizar"
+    "Refresh" : "Actualizar",
+    "Reset" : "Restaurar",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_AR.js b/l10n/es_AR.js
index 5fe830c88..5a7fa98df 100644
--- a/l10n/es_AR.js
+++ b/l10n/es_AR.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Edit" : "Editar",
     "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
@@ -16,6 +17,7 @@ OC.L10N.register(
     "Favorite" : "Favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Copy public link" : "Copiar link publico",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -25,6 +27,14 @@ OC.L10N.register(
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Recargar"
+    "Refresh" : "Recargar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
+    "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_AR.json b/l10n/es_AR.json
index 3669447f5..d04ebd58d 100644
--- a/l10n/es_AR.json
+++ b/l10n/es_AR.json
@@ -7,6 +7,7 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Edit" : "Editar",
     "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
@@ -14,6 +15,7 @@
     "Favorite" : "Favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Copy public link" : "Copiar link publico",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -23,6 +25,14 @@
     "Hour" : "Hora",
     "Name" : "Nombre",
     "Update" : "Actualizar",
-    "Refresh" : "Recargar"
+    "Refresh" : "Recargar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
+    "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_CL.js b/l10n/es_CL.js
index 7273c36ef..d05665f0d 100644
--- a/l10n/es_CL.js
+++ b/l10n/es_CL.js
@@ -8,6 +8,8 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
@@ -15,6 +17,7 @@ OC.L10N.register(
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -25,6 +28,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_CL.json b/l10n/es_CL.json
index a3bcebc5d..f20787944 100644
--- a/l10n/es_CL.json
+++ b/l10n/es_CL.json
@@ -6,6 +6,8 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
@@ -13,6 +15,7 @@
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -23,6 +26,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_CO.js b/l10n/es_CO.js
index 617d2b315..4f1cfbb66 100644
--- a/l10n/es_CO.js
+++ b/l10n/es_CO.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -24,6 +27,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Reiniciar",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_CO.json b/l10n/es_CO.json
index 2eaf178a6..15e8297cd 100644
--- a/l10n/es_CO.json
+++ b/l10n/es_CO.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -22,6 +25,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Reiniciar",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_CR.js b/l10n/es_CR.js
index 617d2b315..263dd8e7c 100644
--- a/l10n/es_CR.js
+++ b/l10n/es_CR.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -24,6 +27,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_CR.json b/l10n/es_CR.json
index 2eaf178a6..0a64cf38b 100644
--- a/l10n/es_CR.json
+++ b/l10n/es_CR.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -22,6 +25,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_DO.js b/l10n/es_DO.js
index 617d2b315..263dd8e7c 100644
--- a/l10n/es_DO.js
+++ b/l10n/es_DO.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -24,6 +27,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_DO.json b/l10n/es_DO.json
index 2eaf178a6..0a64cf38b 100644
--- a/l10n/es_DO.json
+++ b/l10n/es_DO.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -22,6 +25,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
index 78b7f08e9..7cbe2cdca 100644
--- a/l10n/es_EC.js
+++ b/l10n/es_EC.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -24,6 +27,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
index 0bfe384d9..aedb8049b 100644
--- a/l10n/es_EC.json
+++ b/l10n/es_EC.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -22,6 +25,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index d45f5ceec..6a026f1e7 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -24,6 +27,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index b643018d8..89a47fb59 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -22,6 +25,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
index 617d2b315..263dd8e7c 100644
--- a/l10n/es_HN.js
+++ b/l10n/es_HN.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -24,6 +27,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
index 2eaf178a6..0a64cf38b 100644
--- a/l10n/es_HN.json
+++ b/l10n/es_HN.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -22,6 +25,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index d58963080..330996111 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Download" : "Descargar",
     "Favorite" : "Marcar como favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Copy public link" : "Copiar enlace público",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
@@ -25,6 +28,15 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
-    "Position" : "Posición"
+    "Reset" : "Reiniciar",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Redo" : "Rehacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
+    "Position" : "Posición",
+    "Name is required." : "Nombre es requerido."
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index 07d1d3272..095407796 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Eliminar",
     "Download" : "Descargar",
     "Favorite" : "Marcar como favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Copy public link" : "Copiar enlace público",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
@@ -23,6 +26,15 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
-    "Position" : "Posición"
+    "Reset" : "Reiniciar",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Redo" : "Rehacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
+    "Position" : "Posición",
+    "Name is required." : "Nombre es requerido."
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_NI.js b/l10n/es_NI.js
index 78a3e317e..e03c9d429 100644
--- a/l10n/es_NI.js
+++ b/l10n/es_NI.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -23,6 +26,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_NI.json b/l10n/es_NI.json
index 1d6fc85c2..c424f6887 100644
--- a/l10n/es_NI.json
+++ b/l10n/es_NI.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -21,6 +24,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
index 78a3e317e..e03c9d429 100644
--- a/l10n/es_PA.js
+++ b/l10n/es_PA.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -23,6 +26,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
index 1d6fc85c2..c424f6887 100644
--- a/l10n/es_PA.json
+++ b/l10n/es_PA.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -21,6 +24,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_PE.js b/l10n/es_PE.js
index 52fb7cffb..5da469777 100644
--- a/l10n/es_PE.js
+++ b/l10n/es_PE.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -23,6 +26,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_PE.json b/l10n/es_PE.json
index 38ec4f7f3..6b75d0ebe 100644
--- a/l10n/es_PE.json
+++ b/l10n/es_PE.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Ajustes",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -21,6 +24,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
index 78a3e317e..e03c9d429 100644
--- a/l10n/es_PR.js
+++ b/l10n/es_PR.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -23,6 +26,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
index 1d6fc85c2..c424f6887 100644
--- a/l10n/es_PR.json
+++ b/l10n/es_PR.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -21,6 +24,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_PY.js b/l10n/es_PY.js
index 78a3e317e..e03c9d429 100644
--- a/l10n/es_PY.js
+++ b/l10n/es_PY.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -23,6 +26,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_PY.json b/l10n/es_PY.json
index 1d6fc85c2..c424f6887 100644
--- a/l10n/es_PY.json
+++ b/l10n/es_PY.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -21,6 +24,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
index 617d2b315..263dd8e7c 100644
--- a/l10n/es_SV.js
+++ b/l10n/es_SV.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -24,6 +27,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
index 2eaf178a6..0a64cf38b 100644
--- a/l10n/es_SV.json
+++ b/l10n/es_SV.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Public link" : "Liga pública",
     "Back" : "Atrás",
     "Save" : "Guardar",
@@ -22,6 +25,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
index 78a3e317e..e03c9d429 100644
--- a/l10n/es_UY.js
+++ b/l10n/es_UY.js
@@ -8,12 +8,15 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -23,6 +26,13 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
index 1d6fc85c2..c424f6887 100644
--- a/l10n/es_UY.json
+++ b/l10n/es_UY.json
@@ -6,12 +6,15 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Configuraciones ",
+    "Unsaved changes" : "Cambios no guardados",
+    "Edit" : "Editar",
     "Cancel" : "Cancelar",
     "Delete" : "Borrar",
     "Download" : "Descargar",
     "Favorite" : "Hacer favorito",
     "Unarchive" : "Desarchivar",
     "View in folder" : "Ver en la carpeta",
+    "Share" : "Compartir",
     "Back" : "Atrás",
     "Save" : "Guardar",
     "Month" : "Mes",
@@ -21,6 +24,13 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restablecer",
+    "Continue" : "Continuar",
+    "Undo" : "Deshacer",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
     "Position" : "Posición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index f36dd1d53..81adb9950 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -8,11 +8,14 @@ OC.L10N.register(
     "Tags" : "Sildid",
     "Maps" : "Kaardid",
     "Settings" : "Seaded",
+    "Unsaved changes" : "Salvestamata muutused",
+    "Edit" : "Redigeeri",
     "Cancel" : "Loobu",
     "Delete" : "Kustuta",
     "Download" : "Lae alla",
     "Favorite" : "Lemmik",
     "View in folder" : "Vaata kaustas",
+    "Share" : "Jaga",
     "Copy public link" : "Kopeeri avalik link",
     "Public link" : "Avalik link",
     "Back" : "Tagasi",
@@ -24,6 +27,10 @@ OC.L10N.register(
     "Name" : "Nimi",
     "Update" : "Uuenda",
     "Refresh" : "Värskenda",
+    "Reset" : "Lähtesta",
+    "Continue" : "Jätka",
+    "Custom" : "Kohandatud",
+    "Size" : "Suurus",
     "Position" : "Asukoht"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index 657bb765b..94ba71a6c 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -6,11 +6,14 @@
     "Tags" : "Sildid",
     "Maps" : "Kaardid",
     "Settings" : "Seaded",
+    "Unsaved changes" : "Salvestamata muutused",
+    "Edit" : "Redigeeri",
     "Cancel" : "Loobu",
     "Delete" : "Kustuta",
     "Download" : "Lae alla",
     "Favorite" : "Lemmik",
     "View in folder" : "Vaata kaustas",
+    "Share" : "Jaga",
     "Copy public link" : "Kopeeri avalik link",
     "Public link" : "Avalik link",
     "Back" : "Tagasi",
@@ -22,6 +25,10 @@
     "Name" : "Nimi",
     "Update" : "Uuenda",
     "Refresh" : "Värskenda",
+    "Reset" : "Lähtesta",
+    "Continue" : "Jätka",
+    "Custom" : "Kohandatud",
+    "Size" : "Suurus",
     "Position" : "Asukoht"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/eu.js b/l10n/eu.js
index 9f4e1cf53..897d483db 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -14,6 +14,10 @@ OC.L10N.register(
     "Tags" : "Etiketak",
     "Maps" : "Mapak",
     "Settings" : "Ezarpenak",
+    "Error saving image" : "Errorea irudia gordetzean",
+    "Unsaved changes" : "Gorde gabeko aldaketak",
+    "Drop changes" : "Jaregin aldaketak",
+    "Edit" : "Aldatu",
     "Loading …" : "Kargatzen …",
     "Cancel" : "Utzi",
     "Delete" : "Ezabatu",
@@ -32,6 +36,7 @@ OC.L10N.register(
     "Show hidden folders" : "Erakutsi ezkutuko karpetak",
     "Your Timeline" : "Zure denbora-lerroa",
     "Failed to load some photos" : "Argazki batzuk kargatzeak huts egin du",
+    "Share" : "Partekatu",
     "Sidebar" : "Alboko barra",
     "Processing … {n}/{m}" : "Prozesatzen ... {n}/{m}",
     "Search for collaborators" : "Bilatu kolaboratzaileak",
@@ -87,18 +92,90 @@ OC.L10N.register(
     "Delete album" : "Ezabatu albuma",
     "Merge with different person" : "Bateratu beste pertsona batekin",
     "Share folder" : "Partekatu karpeta",
+    "Save as" : "Gorde honela",
+    "Reset" : "Berrezarri",
+    "All changes will be lost." : "Aldaketa guztiak galduko dira.",
     "Are you sure you want to continue?" : "Ziur zaude jarraitu nahi duzula?",
+    "Continue" : "Jarraitu",
+    "Undo" : "Desegin",
+    "Redo" : "Berregin",
     "Show original image" : "Erakutsi jatorrizko irudia",
+    "Zoom in" : "Hurbildu",
+    "Zoom out" : "Txikiagotu",
     "Toggle zoom menu" : "Aldatu zoom menua",
+    "Adjust" : "Egokitu",
+    "Fine-tune" : "Doitu",
+    "Filters" : "Iragazkiak",
+    "Watermark" : "Ur-marka",
+    "Draw" : "Margotu",
     "Resize" : "Tamaina aldatu",
+    "Invalid image." : "Irudi baliogabea.",
+    "Error while uploading the image." : "Errorea irudia kargatzean.",
+    "are not images" : "ez da irudirik",
     "is not an image" : "ez da irudi bat",
+    "to be uploaded" : "igotzeko",
+    "Crop" : "Moztu",
+    "Original" : "Jatorrizkoa",
+    "Custom" : "Pertsonalizatua",
+    "Square" : "Karratua",
+    "Landscape" : "Paisaia",
+    "Portrait" : "Erretratua",
     "Ellipse" : "Elipsea",
+    "Classic TV" : "Telebista klasikoa",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Gezia",
+    "Blur" : "Lausotu",
+    "Brightness" : "Distira",
+    "Contrast" : "Kontrastea",
+    "Un-flip X" : "Desegin X irauli",
+    "Flip X" : "Irauli X",
+    "Un-flip Y" : "Desegin Y irauli",
+    "Flip Y" : "Irauli Y",
+    "HSV" : "HSV",
+    "Hue" : "Ñabardura",
+    "Saturation" : "Saturazioa",
+    "Value" : "Balioa",
     "Image" : "Irudia",
+    "Importing …" : "Inportatzen ...",
+    "+ Add image" : "+ Gehitu irudia",
+    "Line" : "Lerro",
+    "Pen" : "Boligrafoa",
+    "Polygon" : "Poligonoa",
+    "Sides" : "Aldeak",
     "Rectangle" : "Laukizuzena",
     "Corner Radius" : "Izkinako erradioa",
+    "Width in pixels" : "Zabalera pixeletan",
+    "Height in pixels" : "Altuera pixeletan",
+    "Toggle ratio lock" : "Etengabeko erlazioaren blokeoa",
+    "Reset to original image size" : "Berrezarri jatorrizko irudiaren tamainara",
+    "Rotate" : "Biratu",
+    "Text" : "Testua",
+    "Text spacing" : "Testu-tarteak",
+    "Text alignment" : "Testuaren lerrokatzea",
+    "Font family" : "Letra-tipoen familia",
+    "Size" : "Tamaina",
+    "Letter spacing" : "Letren tartea",
+    "Line height" : "Lerroaren altuera",
+    "Warmth" : "Epeltasuna",
+    "+ Add watermark" : "+ Gehitu ur-marka",
+    "Choose watermark type" : "Aukeratu ur-marka mota",
+    "Upload watermark" : "Kargatu ur-marka",
+    "Add as text" : "Gehitu testu gisa",
+    "Padding" : "Betegarria",
+    "Shadow" : "Itzala",
+    "Horizontal" : "Horizontala",
+    "Vertical" : "Bertikala",
+    "Opacity" : "Opakotasuna",
     "Position" : "Kokalekua",
+    "Stroke" : "Trazua",
+    "Save image as" : "Gorde irudia honela:",
+    "Extension" : "Hedapena",
+    "Name is required." : "Izena beharrezkoa da",
+    "Quality" : "Kalitatea",
     "Saved image size (width x height)" : "Gordetako irudiaren tamaina (zabalera x altuera)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Kontuan izan hautatutako mozte-eremua aplikatutako tamaina baino txikiagoa dela eta horrek kalitatea gutxitzea eragin dezakeela",
     "Actual size (100%)" : "Benetako tamaina (% 100)",
+    "Fit size" : "Egokitu tamaina",
     "Failed to create {albumName}." : "Ezin izan da {albumName} sortu.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Ezin izan da {currentAlbumName} berrizendatu {newAlbumName} gisa.",
     "General Failure" : "Hutsegite orokorra",
diff --git a/l10n/eu.json b/l10n/eu.json
index 5cd6b3d0a..ca9ecc541 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -12,6 +12,10 @@
     "Tags" : "Etiketak",
     "Maps" : "Mapak",
     "Settings" : "Ezarpenak",
+    "Error saving image" : "Errorea irudia gordetzean",
+    "Unsaved changes" : "Gorde gabeko aldaketak",
+    "Drop changes" : "Jaregin aldaketak",
+    "Edit" : "Aldatu",
     "Loading …" : "Kargatzen …",
     "Cancel" : "Utzi",
     "Delete" : "Ezabatu",
@@ -30,6 +34,7 @@
     "Show hidden folders" : "Erakutsi ezkutuko karpetak",
     "Your Timeline" : "Zure denbora-lerroa",
     "Failed to load some photos" : "Argazki batzuk kargatzeak huts egin du",
+    "Share" : "Partekatu",
     "Sidebar" : "Alboko barra",
     "Processing … {n}/{m}" : "Prozesatzen ... {n}/{m}",
     "Search for collaborators" : "Bilatu kolaboratzaileak",
@@ -85,18 +90,90 @@
     "Delete album" : "Ezabatu albuma",
     "Merge with different person" : "Bateratu beste pertsona batekin",
     "Share folder" : "Partekatu karpeta",
+    "Save as" : "Gorde honela",
+    "Reset" : "Berrezarri",
+    "All changes will be lost." : "Aldaketa guztiak galduko dira.",
     "Are you sure you want to continue?" : "Ziur zaude jarraitu nahi duzula?",
+    "Continue" : "Jarraitu",
+    "Undo" : "Desegin",
+    "Redo" : "Berregin",
     "Show original image" : "Erakutsi jatorrizko irudia",
+    "Zoom in" : "Hurbildu",
+    "Zoom out" : "Txikiagotu",
     "Toggle zoom menu" : "Aldatu zoom menua",
+    "Adjust" : "Egokitu",
+    "Fine-tune" : "Doitu",
+    "Filters" : "Iragazkiak",
+    "Watermark" : "Ur-marka",
+    "Draw" : "Margotu",
     "Resize" : "Tamaina aldatu",
+    "Invalid image." : "Irudi baliogabea.",
+    "Error while uploading the image." : "Errorea irudia kargatzean.",
+    "are not images" : "ez da irudirik",
     "is not an image" : "ez da irudi bat",
+    "to be uploaded" : "igotzeko",
+    "Crop" : "Moztu",
+    "Original" : "Jatorrizkoa",
+    "Custom" : "Pertsonalizatua",
+    "Square" : "Karratua",
+    "Landscape" : "Paisaia",
+    "Portrait" : "Erretratua",
     "Ellipse" : "Elipsea",
+    "Classic TV" : "Telebista klasikoa",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Gezia",
+    "Blur" : "Lausotu",
+    "Brightness" : "Distira",
+    "Contrast" : "Kontrastea",
+    "Un-flip X" : "Desegin X irauli",
+    "Flip X" : "Irauli X",
+    "Un-flip Y" : "Desegin Y irauli",
+    "Flip Y" : "Irauli Y",
+    "HSV" : "HSV",
+    "Hue" : "Ñabardura",
+    "Saturation" : "Saturazioa",
+    "Value" : "Balioa",
     "Image" : "Irudia",
+    "Importing …" : "Inportatzen ...",
+    "+ Add image" : "+ Gehitu irudia",
+    "Line" : "Lerro",
+    "Pen" : "Boligrafoa",
+    "Polygon" : "Poligonoa",
+    "Sides" : "Aldeak",
     "Rectangle" : "Laukizuzena",
     "Corner Radius" : "Izkinako erradioa",
+    "Width in pixels" : "Zabalera pixeletan",
+    "Height in pixels" : "Altuera pixeletan",
+    "Toggle ratio lock" : "Etengabeko erlazioaren blokeoa",
+    "Reset to original image size" : "Berrezarri jatorrizko irudiaren tamainara",
+    "Rotate" : "Biratu",
+    "Text" : "Testua",
+    "Text spacing" : "Testu-tarteak",
+    "Text alignment" : "Testuaren lerrokatzea",
+    "Font family" : "Letra-tipoen familia",
+    "Size" : "Tamaina",
+    "Letter spacing" : "Letren tartea",
+    "Line height" : "Lerroaren altuera",
+    "Warmth" : "Epeltasuna",
+    "+ Add watermark" : "+ Gehitu ur-marka",
+    "Choose watermark type" : "Aukeratu ur-marka mota",
+    "Upload watermark" : "Kargatu ur-marka",
+    "Add as text" : "Gehitu testu gisa",
+    "Padding" : "Betegarria",
+    "Shadow" : "Itzala",
+    "Horizontal" : "Horizontala",
+    "Vertical" : "Bertikala",
+    "Opacity" : "Opakotasuna",
     "Position" : "Kokalekua",
+    "Stroke" : "Trazua",
+    "Save image as" : "Gorde irudia honela:",
+    "Extension" : "Hedapena",
+    "Name is required." : "Izena beharrezkoa da",
+    "Quality" : "Kalitatea",
     "Saved image size (width x height)" : "Gordetako irudiaren tamaina (zabalera x altuera)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Kontuan izan hautatutako mozte-eremua aplikatutako tamaina baino txikiagoa dela eta horrek kalitatea gutxitzea eragin dezakeela",
     "Actual size (100%)" : "Benetako tamaina (% 100)",
+    "Fit size" : "Egokitu tamaina",
     "Failed to create {albumName}." : "Ezin izan da {albumName} sortu.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Ezin izan da {currentAlbumName} berrizendatu {newAlbumName} gisa.",
     "General Failure" : "Hutsegite orokorra",
diff --git a/l10n/fa.js b/l10n/fa.js
index 68b375721..8e23505b6 100644
--- a/l10n/fa.js
+++ b/l10n/fa.js
@@ -10,12 +10,14 @@ OC.L10N.register(
     "Tags" : "برچسب ها",
     "Maps" : "نقشه‌ها",
     "Settings" : "تنظیمات",
+    "Edit" : "ویرایش",
     "Loading …" : "بارگذاری …",
     "Cancel" : "لغو",
     "Delete" : "حذف",
     "Download" : "بارگیری",
     "Favorite" : "مورد‌ ‌علاقه‌",
     "View in folder" : "مشاهده در پوشه",
+    "Share" : "هم‌رسانی",
     "Copy public link" : "پیوند عمومی را کپی کنید",
     "Public link" : "پیوند عمومی",
     "Back" : "بازگشت",
@@ -27,6 +29,14 @@ OC.L10N.register(
     "Name" : "نام",
     "Update" : "یه‌روزرسانی",
     "Refresh" : "تازه‌سازی",
-    "Share folder" : "اشتراک‌گذاری پوشه"
+    "Share folder" : "اشتراک‌گذاری پوشه",
+    "Reset" : "بازنشاندن",
+    "Continue" : "ادامه دادن",
+    "Undo" : "برگرداندن",
+    "Original" : "اصلی",
+    "Value" : "مقدار",
+    "Text" : "متن",
+    "Size" : "اندازه",
+    "Extension" : "گسترش"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/fa.json b/l10n/fa.json
index 4870dbfbf..d2b23b3ce 100644
--- a/l10n/fa.json
+++ b/l10n/fa.json
@@ -8,12 +8,14 @@
     "Tags" : "برچسب ها",
     "Maps" : "نقشه‌ها",
     "Settings" : "تنظیمات",
+    "Edit" : "ویرایش",
     "Loading …" : "بارگذاری …",
     "Cancel" : "لغو",
     "Delete" : "حذف",
     "Download" : "بارگیری",
     "Favorite" : "مورد‌ ‌علاقه‌",
     "View in folder" : "مشاهده در پوشه",
+    "Share" : "هم‌رسانی",
     "Copy public link" : "پیوند عمومی را کپی کنید",
     "Public link" : "پیوند عمومی",
     "Back" : "بازگشت",
@@ -25,6 +27,14 @@
     "Name" : "نام",
     "Update" : "یه‌روزرسانی",
     "Refresh" : "تازه‌سازی",
-    "Share folder" : "اشتراک‌گذاری پوشه"
+    "Share folder" : "اشتراک‌گذاری پوشه",
+    "Reset" : "بازنشاندن",
+    "Continue" : "ادامه دادن",
+    "Undo" : "برگرداندن",
+    "Original" : "اصلی",
+    "Value" : "مقدار",
+    "Text" : "متن",
+    "Size" : "اندازه",
+    "Extension" : "گسترش"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/fi.js b/l10n/fi.js
index e2b5fc3e1..bd961a505 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -24,6 +24,9 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Valitse aikajanan juurihakemisto",
     "The selected folder does not seem to be valid. Try again." : "Valittu hakemisto ei ole kelvollinen. Yritä uudelleen.",
     "Found {total} photos in {path}" : "{total} kuvaa löytyi polusta {path}",
+    "Error saving image" : "Virhe kuvaa tallentaessa",
+    "Unsaved changes" : "Tallentamattomia muutoksia",
+    "Edit" : "Muokkaa",
     "Loading …" : "Ladataan…",
     "Cancel" : "Peruuta",
     "Delete" : "Poista",
@@ -48,6 +51,7 @@ OC.L10N.register(
     "Choose the root for the folders view" : "Valitse kansionäkymän juurihakemisto",
     "Your Timeline" : "Aikajanasi",
     "Failed to load some photos" : "Joidenkin kuvien lataus epäonnistui",
+    "Share" : "Jaa",
     "Sidebar" : "Sivupalkki",
     "Processing … {n}/{m}" : "Käsitellään… {n}/{m}",
     "{n} photos added to album" : "{n} kuvaa lisätty albumiin",
@@ -109,12 +113,51 @@ OC.L10N.register(
     "Share folder" : "Jaa kansio",
     "Move left" : "Siirry vasemmalle",
     "Move right" : "Siirry oikealle",
+    "Save as" : "Tallenna nimellä",
+    "Reset" : "Palauta",
+    "All changes will be lost." : "Kaikki muutokset menetetään.",
     "Are you sure you want to continue?" : "Haluatko varmasti jatkaa?",
+    "Continue" : "Jatka",
+    "Undo" : "Kumoa",
+    "Redo" : "Tee uudelleen",
     "Show original image" : "Näytä alkuperäinen kuva",
+    "Zoom in" : "Lähennä",
+    "Zoom out" : "Loitonna",
+    "Adjust" : "Säädä",
+    "Fine-tune" : "Hienosäädä",
+    "Filters" : "Suodattimet",
+    "Watermark" : "Vesileima",
     "Resize" : "Muuta kokoa",
+    "Invalid image." : "Virheellinen kuva.",
+    "Crop" : "Rajaa",
+    "Original" : "Alkuperäinen",
+    "Custom" : "Omavalintainen",
+    "Landscape" : "Maisema",
+    "Portrait" : "Muotokuva",
+    "Blur" : "Sumennus",
+    "Brightness" : "Kirkkaus",
+    "Contrast" : "Kontrasti",
+    "Value" : "Arvo",
     "Image" : "Kuva",
+    "Importing …" : "Tuodaan…",
+    "+ Add image" : "+ Lisää kuva",
+    "Line" : "Viiva",
+    "Width in pixels" : "Leveys kuvapisteinä",
+    "Height in pixels" : "Korkeus kuvapisteinä",
+    "Toggle ratio lock" : "Suhdelukitus päälle/pois",
+    "Rotate" : "Kierrä",
+    "Text" : "Teksti",
+    "Size" : "Koko",
+    "+ Add watermark" : "+ Lisää vesileima",
+    "Choose watermark type" : "Valitse vesileiman tyyppi",
+    "Upload watermark" : "Lähetä vesileima",
+    "Add as text" : "Lisää tekstinä",
     "Position" : "Sijainti",
+    "Extension" : "Tiedostopääte",
+    "Name is required." : "Nimi vaaditaan.",
+    "Quality" : "Laatu",
     "Actual size (100%)" : "Todellinen koko (100 %)",
+    "Fit size" : "Sovita koko",
     "Shared Folder" : "Jaa kansio",
     "Failed to create {albumName}." : "Albumin {albumName} luominen epäonnistui.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Albumin {currentAlbumName} nimen muuttaminen muotoon {newAlbumName} epäonnistui.",
diff --git a/l10n/fi.json b/l10n/fi.json
index 7f5be971f..8195e5fd1 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -22,6 +22,9 @@
     "Choose the root of your timeline" : "Valitse aikajanan juurihakemisto",
     "The selected folder does not seem to be valid. Try again." : "Valittu hakemisto ei ole kelvollinen. Yritä uudelleen.",
     "Found {total} photos in {path}" : "{total} kuvaa löytyi polusta {path}",
+    "Error saving image" : "Virhe kuvaa tallentaessa",
+    "Unsaved changes" : "Tallentamattomia muutoksia",
+    "Edit" : "Muokkaa",
     "Loading …" : "Ladataan…",
     "Cancel" : "Peruuta",
     "Delete" : "Poista",
@@ -46,6 +49,7 @@
     "Choose the root for the folders view" : "Valitse kansionäkymän juurihakemisto",
     "Your Timeline" : "Aikajanasi",
     "Failed to load some photos" : "Joidenkin kuvien lataus epäonnistui",
+    "Share" : "Jaa",
     "Sidebar" : "Sivupalkki",
     "Processing … {n}/{m}" : "Käsitellään… {n}/{m}",
     "{n} photos added to album" : "{n} kuvaa lisätty albumiin",
@@ -107,12 +111,51 @@
     "Share folder" : "Jaa kansio",
     "Move left" : "Siirry vasemmalle",
     "Move right" : "Siirry oikealle",
+    "Save as" : "Tallenna nimellä",
+    "Reset" : "Palauta",
+    "All changes will be lost." : "Kaikki muutokset menetetään.",
     "Are you sure you want to continue?" : "Haluatko varmasti jatkaa?",
+    "Continue" : "Jatka",
+    "Undo" : "Kumoa",
+    "Redo" : "Tee uudelleen",
     "Show original image" : "Näytä alkuperäinen kuva",
+    "Zoom in" : "Lähennä",
+    "Zoom out" : "Loitonna",
+    "Adjust" : "Säädä",
+    "Fine-tune" : "Hienosäädä",
+    "Filters" : "Suodattimet",
+    "Watermark" : "Vesileima",
     "Resize" : "Muuta kokoa",
+    "Invalid image." : "Virheellinen kuva.",
+    "Crop" : "Rajaa",
+    "Original" : "Alkuperäinen",
+    "Custom" : "Omavalintainen",
+    "Landscape" : "Maisema",
+    "Portrait" : "Muotokuva",
+    "Blur" : "Sumennus",
+    "Brightness" : "Kirkkaus",
+    "Contrast" : "Kontrasti",
+    "Value" : "Arvo",
     "Image" : "Kuva",
+    "Importing …" : "Tuodaan…",
+    "+ Add image" : "+ Lisää kuva",
+    "Line" : "Viiva",
+    "Width in pixels" : "Leveys kuvapisteinä",
+    "Height in pixels" : "Korkeus kuvapisteinä",
+    "Toggle ratio lock" : "Suhdelukitus päälle/pois",
+    "Rotate" : "Kierrä",
+    "Text" : "Teksti",
+    "Size" : "Koko",
+    "+ Add watermark" : "+ Lisää vesileima",
+    "Choose watermark type" : "Valitse vesileiman tyyppi",
+    "Upload watermark" : "Lähetä vesileima",
+    "Add as text" : "Lisää tekstinä",
     "Position" : "Sijainti",
+    "Extension" : "Tiedostopääte",
+    "Name is required." : "Nimi vaaditaan.",
+    "Quality" : "Laatu",
     "Actual size (100%)" : "Todellinen koko (100 %)",
+    "Fit size" : "Sovita koko",
     "Shared Folder" : "Jaa kansio",
     "Failed to create {albumName}." : "Albumin {albumName} luominen epäonnistui.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Albumin {currentAlbumName} nimen muuttaminen muotoon {newAlbumName} epäonnistui.",
diff --git a/l10n/fr.js b/l10n/fr.js
index f73f7b7cd..aa4d14bda 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -14,6 +14,10 @@ OC.L10N.register(
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
     "Settings" : "Paramètres",
+    "Error saving image" : "Erreur lors de l'enregistrement de l'image",
+    "Unsaved changes" : "Modifications non enregistrées",
+    "Drop changes" : "Abandonner les changements",
+    "Edit" : "Modifier",
     "Loading …" : "Chargement …",
     "Cancel" : "Annuler",
     "Delete" : "Supprimer",
@@ -31,6 +35,7 @@ OC.L10N.register(
     "Timeline Path" : "Emplacement du Fil chronologique",
     "Show hidden folders" : "Afficher les dossiers cachés",
     "Failed to load some photos" : "Échec du chargement de certaines photos",
+    "Share" : "Partage",
     "Sidebar" : "Panneau latéral",
     "Search for collaborators" : "Rechercher des collaborateurs",
     "Search people or groups" : "Recherche des personnes ou des groupes",
@@ -84,18 +89,90 @@ OC.L10N.register(
     "Delete album" : "Supprimer l'album",
     "Merge with different person" : "Fusionner avec une différente personne",
     "Share folder" : "Partager le dossier",
+    "Save as" : "Enregistrer sous",
+    "Reset" : "Réinitialiser",
+    "All changes will be lost." : "Tous les changements seront perdus.",
     "Are you sure you want to continue?" : "Êtes-vous sûr de vouloir continuer ?",
+    "Continue" : "Continuer",
+    "Undo" : "Annuler",
+    "Redo" : "Rétablir",
     "Show original image" : "Afficher l'image originale",
+    "Zoom in" : "Zoomer",
+    "Zoom out" : "Dézoomer",
     "Toggle zoom menu" : "Afficher/Masquer le menu de zoom",
+    "Adjust" : "Ajuster",
+    "Fine-tune" : "Réglages fins",
+    "Filters" : "Filtres",
+    "Watermark" : "Filigrane",
+    "Draw" : "Dessiner",
     "Resize" : "Redimensionner",
+    "Invalid image." : "Image invalide.",
+    "Error while uploading the image." : "Erreur lors du téléversement de l'image",
+    "are not images" : "ne sont pas des images",
     "is not an image" : "n'est pas une image",
+    "to be uploaded" : "à téléverser",
+    "Crop" : "Recadrer",
+    "Original" : "Original",
+    "Custom" : "Personnalisé",
+    "Square" : "Carré",
+    "Landscape" : "Paysage",
+    "Portrait" : "Portrait",
     "Ellipse" : "Ellipse",
+    "Classic TV" : "Télévision Classique",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Flèche",
+    "Blur" : "Flou",
+    "Brightness" : "Luminosité",
+    "Contrast" : "Contraste",
+    "Un-flip X" : "Suppr. miroir horiz.",
+    "Flip X" : "Miroir horiz.",
+    "Un-flip Y" : "Suppr. miroir vertic.",
+    "Flip Y" : "Miroir vertic.",
+    "HSV" : "TSV",
+    "Hue" : "Teinte",
+    "Saturation" : "Saturation",
+    "Value" : "Valeur",
     "Image" : "Image",
+    "Importing …" : "Importation...",
+    "+ Add image" : "+ Ajouter une image",
+    "Line" : "Ligne",
+    "Pen" : "Stylo",
+    "Polygon" : "Polygone",
+    "Sides" : "Diapositives",
     "Rectangle" : "Rectangle",
     "Corner Radius" : "Rayon d'angle",
+    "Width in pixels" : "Largeur en pixels",
+    "Height in pixels" : "Hauteur en pixels",
+    "Toggle ratio lock" : "Activer/Désactiver la conservation des proportions",
+    "Reset to original image size" : "Rétablir la taille originale de l'image",
+    "Rotate" : "Faire pivoter",
+    "Text" : "Texte",
+    "Text spacing" : "Espacement du texte",
+    "Text alignment" : "Alignement du texte",
+    "Font family" : "Police de caractère",
+    "Size" : "Taille",
+    "Letter spacing" : "Espacement des caractères",
+    "Line height" : "Hauteur de ligne",
+    "Warmth" : "Température",
+    "+ Add watermark" : "+ Ajouter un filigrane",
+    "Choose watermark type" : "Choisir un type de filigrane",
+    "Upload watermark" : "Téléverser un filigrane",
+    "Add as text" : "Ajouter comme texte",
+    "Padding" : "Marge interne",
+    "Shadow" : "Ombre",
+    "Horizontal" : "Horizontal",
+    "Vertical" : "Vertical",
+    "Opacity" : "Opacité",
     "Position" : "Position",
+    "Stroke" : "Coutour",
+    "Save image as" : "Enregistrer l'image sous",
+    "Extension" : "Extension",
+    "Name is required." : "Le nom est obligatoire.",
+    "Quality" : "Qualité",
     "Saved image size (width x height)" : "Taille de l'image sauvegardée (largeur x hauteur)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Notez que la zone de recadrage sélectionnée est inférieure au redimensionnement appliqué, ce qui peut entraîner une baisse de qualité.",
     "Actual size (100%)" : "Taille actuelle (100%)",
+    "Fit size" : "Adapter à la taille",
     "Failed to create {albumName}." : "Échec de la création de {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Échec du renommage de {currentAlbumName} en {newAlbumName}.",
     "General Failure" : "Échec général",
diff --git a/l10n/fr.json b/l10n/fr.json
index 9a472ca86..a9a582e92 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -12,6 +12,10 @@
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
     "Settings" : "Paramètres",
+    "Error saving image" : "Erreur lors de l'enregistrement de l'image",
+    "Unsaved changes" : "Modifications non enregistrées",
+    "Drop changes" : "Abandonner les changements",
+    "Edit" : "Modifier",
     "Loading …" : "Chargement …",
     "Cancel" : "Annuler",
     "Delete" : "Supprimer",
@@ -29,6 +33,7 @@
     "Timeline Path" : "Emplacement du Fil chronologique",
     "Show hidden folders" : "Afficher les dossiers cachés",
     "Failed to load some photos" : "Échec du chargement de certaines photos",
+    "Share" : "Partage",
     "Sidebar" : "Panneau latéral",
     "Search for collaborators" : "Rechercher des collaborateurs",
     "Search people or groups" : "Recherche des personnes ou des groupes",
@@ -82,18 +87,90 @@
     "Delete album" : "Supprimer l'album",
     "Merge with different person" : "Fusionner avec une différente personne",
     "Share folder" : "Partager le dossier",
+    "Save as" : "Enregistrer sous",
+    "Reset" : "Réinitialiser",
+    "All changes will be lost." : "Tous les changements seront perdus.",
     "Are you sure you want to continue?" : "Êtes-vous sûr de vouloir continuer ?",
+    "Continue" : "Continuer",
+    "Undo" : "Annuler",
+    "Redo" : "Rétablir",
     "Show original image" : "Afficher l'image originale",
+    "Zoom in" : "Zoomer",
+    "Zoom out" : "Dézoomer",
     "Toggle zoom menu" : "Afficher/Masquer le menu de zoom",
+    "Adjust" : "Ajuster",
+    "Fine-tune" : "Réglages fins",
+    "Filters" : "Filtres",
+    "Watermark" : "Filigrane",
+    "Draw" : "Dessiner",
     "Resize" : "Redimensionner",
+    "Invalid image." : "Image invalide.",
+    "Error while uploading the image." : "Erreur lors du téléversement de l'image",
+    "are not images" : "ne sont pas des images",
     "is not an image" : "n'est pas une image",
+    "to be uploaded" : "à téléverser",
+    "Crop" : "Recadrer",
+    "Original" : "Original",
+    "Custom" : "Personnalisé",
+    "Square" : "Carré",
+    "Landscape" : "Paysage",
+    "Portrait" : "Portrait",
     "Ellipse" : "Ellipse",
+    "Classic TV" : "Télévision Classique",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Flèche",
+    "Blur" : "Flou",
+    "Brightness" : "Luminosité",
+    "Contrast" : "Contraste",
+    "Un-flip X" : "Suppr. miroir horiz.",
+    "Flip X" : "Miroir horiz.",
+    "Un-flip Y" : "Suppr. miroir vertic.",
+    "Flip Y" : "Miroir vertic.",
+    "HSV" : "TSV",
+    "Hue" : "Teinte",
+    "Saturation" : "Saturation",
+    "Value" : "Valeur",
     "Image" : "Image",
+    "Importing …" : "Importation...",
+    "+ Add image" : "+ Ajouter une image",
+    "Line" : "Ligne",
+    "Pen" : "Stylo",
+    "Polygon" : "Polygone",
+    "Sides" : "Diapositives",
     "Rectangle" : "Rectangle",
     "Corner Radius" : "Rayon d'angle",
+    "Width in pixels" : "Largeur en pixels",
+    "Height in pixels" : "Hauteur en pixels",
+    "Toggle ratio lock" : "Activer/Désactiver la conservation des proportions",
+    "Reset to original image size" : "Rétablir la taille originale de l'image",
+    "Rotate" : "Faire pivoter",
+    "Text" : "Texte",
+    "Text spacing" : "Espacement du texte",
+    "Text alignment" : "Alignement du texte",
+    "Font family" : "Police de caractère",
+    "Size" : "Taille",
+    "Letter spacing" : "Espacement des caractères",
+    "Line height" : "Hauteur de ligne",
+    "Warmth" : "Température",
+    "+ Add watermark" : "+ Ajouter un filigrane",
+    "Choose watermark type" : "Choisir un type de filigrane",
+    "Upload watermark" : "Téléverser un filigrane",
+    "Add as text" : "Ajouter comme texte",
+    "Padding" : "Marge interne",
+    "Shadow" : "Ombre",
+    "Horizontal" : "Horizontal",
+    "Vertical" : "Vertical",
+    "Opacity" : "Opacité",
     "Position" : "Position",
+    "Stroke" : "Coutour",
+    "Save image as" : "Enregistrer l'image sous",
+    "Extension" : "Extension",
+    "Name is required." : "Le nom est obligatoire.",
+    "Quality" : "Qualité",
     "Saved image size (width x height)" : "Taille de l'image sauvegardée (largeur x hauteur)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Notez que la zone de recadrage sélectionnée est inférieure au redimensionnement appliqué, ce qui peut entraîner une baisse de qualité.",
     "Actual size (100%)" : "Taille actuelle (100%)",
+    "Fit size" : "Adapter à la taille",
     "Failed to create {albumName}." : "Échec de la création de {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Échec du renommage de {currentAlbumName} en {newAlbumName}.",
     "General Failure" : "Échec général",
diff --git a/l10n/gd.js b/l10n/gd.js
index 94dc3adfe..8ac62503e 100644
--- a/l10n/gd.js
+++ b/l10n/gd.js
@@ -10,9 +10,11 @@ OC.L10N.register(
     "Delete" : "Sguab às",
     "Download" : "Luchdaich a-nuas",
     "Favorite" : "Annsachd",
+    "Share" : "Co-roinn",
     "Back" : "Air ais",
     "Save" : "Sàbhail",
     "Name" : "Ainm",
-    "Refresh" : "Ath-nuadhaich"
+    "Refresh" : "Ath-nuadhaich",
+    "Undo" : "Neo-dhèan"
 },
 "nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;");
diff --git a/l10n/gd.json b/l10n/gd.json
index 36466d674..8e08a751a 100644
--- a/l10n/gd.json
+++ b/l10n/gd.json
@@ -8,9 +8,11 @@
     "Delete" : "Sguab às",
     "Download" : "Luchdaich a-nuas",
     "Favorite" : "Annsachd",
+    "Share" : "Co-roinn",
     "Back" : "Air ais",
     "Save" : "Sàbhail",
     "Name" : "Ainm",
-    "Refresh" : "Ath-nuadhaich"
+    "Refresh" : "Ath-nuadhaich",
+    "Undo" : "Neo-dhèan"
 },"pluralForm" :"nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/gl.js b/l10n/gl.js
index d752d3548..c7ebd8097 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Axustes",
+    "Unsaved changes" : "Cambios sen gardar",
     "Edit" : "Editar",
     "Loading …" : "Cargando…",
     "Cancel" : "Cancelar",
@@ -18,6 +19,7 @@ OC.L10N.register(
     "Favorite" : "Favorito",
     "Unarchive" : "Desarquivar",
     "View in folder" : "Ver no cartafol",
+    "Share" : "Compartir",
     "Copy public link" : "Copiar a ligazón pública",
     "Public link" : "Ligazón pública",
     "Back" : "Atrás",
@@ -31,7 +33,21 @@ OC.L10N.register(
     "Name" : "Nome",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restabelecer",
+    "Continue" : "Continuar",
+    "Undo" : "Desfacer",
+    "Redo" : "Refacer",
+    "Zoom in" : "Achegar",
+    "Original" : "Orixinal",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
     "Image" : "Imaxe",
-    "Position" : "Posicion"
+    "Line" : "Liña",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
+    "Position" : "Posicion",
+    "Extension" : "Extensión",
+    "Name is required." : "É obrigatorio  o nome.",
+    "Quality" : "Calidade"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/gl.json b/l10n/gl.json
index 5a2697c0a..414678711 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -8,6 +8,7 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Axustes",
+    "Unsaved changes" : "Cambios sen gardar",
     "Edit" : "Editar",
     "Loading …" : "Cargando…",
     "Cancel" : "Cancelar",
@@ -16,6 +17,7 @@
     "Favorite" : "Favorito",
     "Unarchive" : "Desarquivar",
     "View in folder" : "Ver no cartafol",
+    "Share" : "Compartir",
     "Copy public link" : "Copiar a ligazón pública",
     "Public link" : "Ligazón pública",
     "Back" : "Atrás",
@@ -29,7 +31,21 @@
     "Name" : "Nome",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Restabelecer",
+    "Continue" : "Continuar",
+    "Undo" : "Desfacer",
+    "Redo" : "Refacer",
+    "Zoom in" : "Achegar",
+    "Original" : "Orixinal",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
     "Image" : "Imaxe",
-    "Position" : "Posicion"
+    "Line" : "Liña",
+    "Text" : "Texto",
+    "Size" : "Tamaño",
+    "Position" : "Posicion",
+    "Extension" : "Extensión",
+    "Name is required." : "É obrigatorio  o nome.",
+    "Quality" : "Calidade"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/he.js b/l10n/he.js
index b4120872f..2eba18292 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Tags" : "תגיות",
     "Maps" : "מפות",
     "Settings" : "הגדרות",
+    "Unsaved changes" : "שינויים שלא נשמרו",
     "Edit" : "עריכה",
     "Loading …" : "בטעינה…",
     "Cancel" : "ביטול",
@@ -17,6 +18,7 @@ OC.L10N.register(
     "Favorite" : "סימון כמועדף",
     "Unarchive" : "הוצאה מהארכיון",
     "View in folder" : "הצג בתיקייה",
+    "Share" : "שתף",
     "Copy public link" : "העתקת הקישור הציבורי",
     "Public link" : "קישור ציבורי",
     "Back" : "חזרה",
@@ -30,7 +32,19 @@ OC.L10N.register(
     "Name" : "שם",
     "Update" : "עדכון",
     "Refresh" : "רענון",
+    "Reset" : "איפוס",
+    "Continue" : "להמשך",
+    "Undo" : "ביטול",
+    "Redo" : "שחזור",
+    "Zoom in" : "התקרבות",
+    "Custom" : "מותאם אישית",
+    "Value" : "ערך",
     "Image" : "תמונה",
-    "Position" : "מיקום"
+    "Text" : "טקסט",
+    "Size" : "גודל",
+    "Position" : "מיקום",
+    "Extension" : "הרחבה",
+    "Name is required." : "נדרש שם.",
+    "Quality" : "איכות"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
diff --git a/l10n/he.json b/l10n/he.json
index 3850c5fa3..ba773d2f4 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -7,6 +7,7 @@
     "Tags" : "תגיות",
     "Maps" : "מפות",
     "Settings" : "הגדרות",
+    "Unsaved changes" : "שינויים שלא נשמרו",
     "Edit" : "עריכה",
     "Loading …" : "בטעינה…",
     "Cancel" : "ביטול",
@@ -15,6 +16,7 @@
     "Favorite" : "סימון כמועדף",
     "Unarchive" : "הוצאה מהארכיון",
     "View in folder" : "הצג בתיקייה",
+    "Share" : "שתף",
     "Copy public link" : "העתקת הקישור הציבורי",
     "Public link" : "קישור ציבורי",
     "Back" : "חזרה",
@@ -28,7 +30,19 @@
     "Name" : "שם",
     "Update" : "עדכון",
     "Refresh" : "רענון",
+    "Reset" : "איפוס",
+    "Continue" : "להמשך",
+    "Undo" : "ביטול",
+    "Redo" : "שחזור",
+    "Zoom in" : "התקרבות",
+    "Custom" : "מותאם אישית",
+    "Value" : "ערך",
     "Image" : "תמונה",
-    "Position" : "מיקום"
+    "Text" : "טקסט",
+    "Size" : "גודל",
+    "Position" : "מיקום",
+    "Extension" : "הרחבה",
+    "Name is required." : "נדרש שם.",
+    "Quality" : "איכות"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/hr.js b/l10n/hr.js
index 1ba42e874..a8a34d0d7 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Tags" : "Oznake",
     "Maps" : "Karte",
     "Settings" : "Postavke",
+    "Unsaved changes" : "Nespremljene promjene",
     "Edit" : "Uredi",
     "Loading …" : "Učitavanje…",
     "Cancel" : "Odustani",
@@ -18,6 +19,7 @@ OC.L10N.register(
     "Favorite" : "Favorit",
     "Unarchive" : "Dearhiviraj",
     "View in folder" : "Prikaži u mapi",
+    "Share" : "Dijeli",
     "Copy public link" : "Kopiraj javnu poveznicu",
     "Public link" : "Javna poveznica",
     "Back" : "Natrag",
@@ -32,7 +34,20 @@ OC.L10N.register(
     "Update" : "Ažuriraj",
     "Refresh" : "Osvježi",
     "Share folder" : "Dijeli mapu",
+    "Reset" : "Resetiraj",
+    "Continue" : "Nastavi",
+    "Undo" : "Poništi",
+    "Redo" : "Ponovno",
+    "Zoom in" : "Uvećaj",
+    "Original" : "Izvornik",
+    "Custom" : "Prilagođeno",
+    "Value" : "Vrijednost",
     "Image" : "Slika",
-    "Position" : "Položaj"
+    "Text" : "Tekst",
+    "Size" : "Veličina",
+    "Position" : "Položaj",
+    "Extension" : "Proširenje",
+    "Name is required." : "Ime je obavezno.",
+    "Quality" : "Kvaliteta"
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/l10n/hr.json b/l10n/hr.json
index 9d0098db3..66422a5de 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -8,6 +8,7 @@
     "Tags" : "Oznake",
     "Maps" : "Karte",
     "Settings" : "Postavke",
+    "Unsaved changes" : "Nespremljene promjene",
     "Edit" : "Uredi",
     "Loading …" : "Učitavanje…",
     "Cancel" : "Odustani",
@@ -16,6 +17,7 @@
     "Favorite" : "Favorit",
     "Unarchive" : "Dearhiviraj",
     "View in folder" : "Prikaži u mapi",
+    "Share" : "Dijeli",
     "Copy public link" : "Kopiraj javnu poveznicu",
     "Public link" : "Javna poveznica",
     "Back" : "Natrag",
@@ -30,7 +32,20 @@
     "Update" : "Ažuriraj",
     "Refresh" : "Osvježi",
     "Share folder" : "Dijeli mapu",
+    "Reset" : "Resetiraj",
+    "Continue" : "Nastavi",
+    "Undo" : "Poništi",
+    "Redo" : "Ponovno",
+    "Zoom in" : "Uvećaj",
+    "Original" : "Izvornik",
+    "Custom" : "Prilagođeno",
+    "Value" : "Vrijednost",
     "Image" : "Slika",
-    "Position" : "Položaj"
+    "Text" : "Tekst",
+    "Size" : "Veličina",
+    "Position" : "Položaj",
+    "Extension" : "Proširenje",
+    "Name is required." : "Ime je obavezno.",
+    "Quality" : "Kvaliteta"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/hu.js b/l10n/hu.js
index ef375ed2c..b16cd11f1 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Tags" : "Címkék",
     "Maps" : "Térképek",
     "Settings" : "Beállítások",
+    "Unsaved changes" : "Mentetlen változtatások",
+    "Drop changes" : "Változtatások elvetése",
     "Edit" : "Szerkesztés",
     "Loading …" : "Betöltés…",
     "Cancel" : "Mégse",
@@ -34,6 +36,7 @@ OC.L10N.register(
     "Show hidden folders" : "Rejtett mappák megjelenítése",
     "Your Timeline" : "Saját idővonal",
     "Failed to load some photos" : "Nem sikerült betölteni néhány fényképet",
+    "Share" : "Megosztás",
     "Sidebar" : "Oldalsáv",
     "Processing … {n}/{m}" : "Feldolgozás… {n}/{m}",
     "Search for collaborators" : "Közreműködők keresése",
@@ -82,20 +85,90 @@ OC.L10N.register(
     "Delete album" : "Album törlése",
     "Merge with different person" : "Összevonás egy másik személlyel",
     "Share folder" : "Mappa megosztása",
+    "Save as" : "Mentés másként",
+    "Reset" : "Alaphelyzetbe állítás",
+    "All changes will be lost." : "Az összes változtatás elvész.",
     "Are you sure you want to continue?" : "Biztos, hogy folytatja?",
+    "Continue" : "Folytatás",
+    "Undo" : "Visszavonás",
+    "Redo" : "Újra",
     "Show original image" : "Eredeti kép megjelenítése",
+    "Zoom in" : "Nagyítás",
+    "Zoom out" : "Kicsinyítés",
     "Toggle zoom menu" : "Nagyítási menü be/ki",
+    "Adjust" : "Igazítás",
+    "Fine-tune" : "Finomhangolás",
+    "Filters" : "Szűrők",
+    "Watermark" : "Vízjel",
+    "Draw" : "Rajzolás",
     "Resize" : "Átméretezés",
+    "Invalid image." : "Érvénytelen kép.",
+    "Error while uploading the image." : "Hiba történt a kép feltöltése során.",
+    "are not images" : "nem képek",
     "is not an image" : "nem kép",
+    "to be uploaded" : "feltöltendő",
+    "Crop" : "Levágás",
+    "Original" : "Eredeti",
+    "Custom" : "Egyéni",
+    "Square" : "Négyzetes",
+    "Landscape" : "Fekvő",
+    "Portrait" : "Álló",
     "Ellipse" : "Ellipszis",
+    "Classic TV" : "Klasszikus TV",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Nyíl",
+    "Blur" : "Elmosás",
+    "Brightness" : "Fényerő",
+    "Contrast" : "Kontraszt",
+    "Un-flip X" : "X-tengelyre tükrözés visszavonása",
+    "Flip X" : "X-tengelyre tükrözés",
+    "Un-flip Y" : "Y-tengelyre tükrözés visszavonása",
+    "Flip Y" : "Y-tengelyre tükrözés",
+    "HSV" : "HSV",
     "Hue" : "Fényerő",
+    "Saturation" : "Telítettség",
+    "Value" : "Érték",
     "Image" : "Kép",
+    "Importing …" : "Importálás…",
+    "+ Add image" : "+ Kép hozzáadása",
+    "Line" : "Vonal",
+    "Pen" : "Toll",
+    "Polygon" : "Sokszög",
+    "Sides" : "Oldalak",
     "Rectangle" : "Téglalap",
     "Corner Radius" : "Saroklekerekítés sugara",
+    "Width in pixels" : "Szélesség képpontokban",
+    "Height in pixels" : "Magasság képpontokban",
+    "Toggle ratio lock" : "Arányzárolás be/ki",
+    "Reset to original image size" : "Visszaállítás az eredeti képméretre",
+    "Rotate" : "Forgatás",
+    "Text" : "Szöveg",
+    "Text spacing" : "Szövegtávolság",
+    "Text alignment" : "Szöveg igazítása",
+    "Font family" : "Betűkészletcsalád",
+    "Size" : "Méret",
+    "Letter spacing" : "Betűköz",
+    "Line height" : "Sormagasság",
+    "Warmth" : "Melegség",
+    "+ Add watermark" : "+ Vízjel hozzáadása",
+    "Choose watermark type" : "Válasszon vízjeltípust",
+    "Upload watermark" : "Vízjel feltöltése",
+    "Add as text" : "Hozzáadás szövegként",
+    "Padding" : "Helykitöltés",
+    "Shadow" : "Árnyék",
     "Horizontal" : "Vízszintes",
+    "Vertical" : "Függőleges",
+    "Opacity" : "Átlátszatlanság",
     "Position" : "Pozíció",
+    "Stroke" : "Körberajzolás",
+    "Save image as" : "Kép mentése másként",
+    "Extension" : "Kiterjesztés",
+    "Name is required." : "A név kötelező.",
+    "Quality" : "Minőség",
     "Saved image size (width x height)" : "Mentett kép mérete (szélesség×magasság)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Vegye figyelembe, hogy a kijelölt levágási terület kisebb mint az alkalmazott átméretezés, amely minőségcsökkenést okozhat",
     "Actual size (100%)" : "Tényleges méret (100%)",
+    "Fit size" : "Illeszkedő méret",
     "Failed to create {albumName}." : "A(z) {albumName} létrehozása sikertelen.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "A(z) {currentAlbumName} átnevezése a következőre sikertelen: {newAlbumName}.",
     "Failed to delete files." : "A fájlok törlése sikertelen.",
diff --git a/l10n/hu.json b/l10n/hu.json
index 6b0ef90f1..236e1e7cc 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -12,6 +12,8 @@
     "Tags" : "Címkék",
     "Maps" : "Térképek",
     "Settings" : "Beállítások",
+    "Unsaved changes" : "Mentetlen változtatások",
+    "Drop changes" : "Változtatások elvetése",
     "Edit" : "Szerkesztés",
     "Loading …" : "Betöltés…",
     "Cancel" : "Mégse",
@@ -32,6 +34,7 @@
     "Show hidden folders" : "Rejtett mappák megjelenítése",
     "Your Timeline" : "Saját idővonal",
     "Failed to load some photos" : "Nem sikerült betölteni néhány fényképet",
+    "Share" : "Megosztás",
     "Sidebar" : "Oldalsáv",
     "Processing … {n}/{m}" : "Feldolgozás… {n}/{m}",
     "Search for collaborators" : "Közreműködők keresése",
@@ -80,20 +83,90 @@
     "Delete album" : "Album törlése",
     "Merge with different person" : "Összevonás egy másik személlyel",
     "Share folder" : "Mappa megosztása",
+    "Save as" : "Mentés másként",
+    "Reset" : "Alaphelyzetbe állítás",
+    "All changes will be lost." : "Az összes változtatás elvész.",
     "Are you sure you want to continue?" : "Biztos, hogy folytatja?",
+    "Continue" : "Folytatás",
+    "Undo" : "Visszavonás",
+    "Redo" : "Újra",
     "Show original image" : "Eredeti kép megjelenítése",
+    "Zoom in" : "Nagyítás",
+    "Zoom out" : "Kicsinyítés",
     "Toggle zoom menu" : "Nagyítási menü be/ki",
+    "Adjust" : "Igazítás",
+    "Fine-tune" : "Finomhangolás",
+    "Filters" : "Szűrők",
+    "Watermark" : "Vízjel",
+    "Draw" : "Rajzolás",
     "Resize" : "Átméretezés",
+    "Invalid image." : "Érvénytelen kép.",
+    "Error while uploading the image." : "Hiba történt a kép feltöltése során.",
+    "are not images" : "nem képek",
     "is not an image" : "nem kép",
+    "to be uploaded" : "feltöltendő",
+    "Crop" : "Levágás",
+    "Original" : "Eredeti",
+    "Custom" : "Egyéni",
+    "Square" : "Négyzetes",
+    "Landscape" : "Fekvő",
+    "Portrait" : "Álló",
     "Ellipse" : "Ellipszis",
+    "Classic TV" : "Klasszikus TV",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Nyíl",
+    "Blur" : "Elmosás",
+    "Brightness" : "Fényerő",
+    "Contrast" : "Kontraszt",
+    "Un-flip X" : "X-tengelyre tükrözés visszavonása",
+    "Flip X" : "X-tengelyre tükrözés",
+    "Un-flip Y" : "Y-tengelyre tükrözés visszavonása",
+    "Flip Y" : "Y-tengelyre tükrözés",
+    "HSV" : "HSV",
     "Hue" : "Fényerő",
+    "Saturation" : "Telítettség",
+    "Value" : "Érték",
     "Image" : "Kép",
+    "Importing …" : "Importálás…",
+    "+ Add image" : "+ Kép hozzáadása",
+    "Line" : "Vonal",
+    "Pen" : "Toll",
+    "Polygon" : "Sokszög",
+    "Sides" : "Oldalak",
     "Rectangle" : "Téglalap",
     "Corner Radius" : "Saroklekerekítés sugara",
+    "Width in pixels" : "Szélesség képpontokban",
+    "Height in pixels" : "Magasság képpontokban",
+    "Toggle ratio lock" : "Arányzárolás be/ki",
+    "Reset to original image size" : "Visszaállítás az eredeti képméretre",
+    "Rotate" : "Forgatás",
+    "Text" : "Szöveg",
+    "Text spacing" : "Szövegtávolság",
+    "Text alignment" : "Szöveg igazítása",
+    "Font family" : "Betűkészletcsalád",
+    "Size" : "Méret",
+    "Letter spacing" : "Betűköz",
+    "Line height" : "Sormagasság",
+    "Warmth" : "Melegség",
+    "+ Add watermark" : "+ Vízjel hozzáadása",
+    "Choose watermark type" : "Válasszon vízjeltípust",
+    "Upload watermark" : "Vízjel feltöltése",
+    "Add as text" : "Hozzáadás szövegként",
+    "Padding" : "Helykitöltés",
+    "Shadow" : "Árnyék",
     "Horizontal" : "Vízszintes",
+    "Vertical" : "Függőleges",
+    "Opacity" : "Átlátszatlanság",
     "Position" : "Pozíció",
+    "Stroke" : "Körberajzolás",
+    "Save image as" : "Kép mentése másként",
+    "Extension" : "Kiterjesztés",
+    "Name is required." : "A név kötelező.",
+    "Quality" : "Minőség",
     "Saved image size (width x height)" : "Mentett kép mérete (szélesség×magasság)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Vegye figyelembe, hogy a kijelölt levágási terület kisebb mint az alkalmazott átméretezés, amely minőségcsökkenést okozhat",
     "Actual size (100%)" : "Tényleges méret (100%)",
+    "Fit size" : "Illeszkedő méret",
     "Failed to create {albumName}." : "A(z) {albumName} létrehozása sikertelen.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "A(z) {currentAlbumName} átnevezése a következőre sikertelen: {newAlbumName}.",
     "Failed to delete files." : "A fájlok törlése sikertelen.",
diff --git a/l10n/hy.js b/l10n/hy.js
index f02352b3e..eaf9a18b6 100644
--- a/l10n/hy.js
+++ b/l10n/hy.js
@@ -7,12 +7,15 @@ OC.L10N.register(
     "Cancel" : "ընդհատել",
     "Delete" : "հեռացնել",
     "Download" : "Ներբեռնել",
+    "Share" : "Կիսվել",
     "Save" : "Պահպանել",
     "Month" : "Ամիս",
     "Day" : "Օր",
     "Time" : "Ժամ",
     "Name" : "Անուն",
     "Update" : "Թարմացնել",
-    "Refresh" : "Թարմացնել"
+    "Refresh" : "Թարմացնել",
+    "Continue" : "Շարունակել",
+    "Size" : "Չափս"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/hy.json b/l10n/hy.json
index 6fe5bf64b..071c0dbf5 100644
--- a/l10n/hy.json
+++ b/l10n/hy.json
@@ -5,12 +5,15 @@
     "Cancel" : "ընդհատել",
     "Delete" : "հեռացնել",
     "Download" : "Ներբեռնել",
+    "Share" : "Կիսվել",
     "Save" : "Պահպանել",
     "Month" : "Ամիս",
     "Day" : "Օր",
     "Time" : "Ժամ",
     "Name" : "Անուն",
     "Update" : "Թարմացնել",
-    "Refresh" : "Թարմացնել"
+    "Refresh" : "Թարմացնել",
+    "Continue" : "Շարունակել",
+    "Size" : "Չափս"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ia.js b/l10n/ia.js
index e87cc3f18..5b0b550c2 100644
--- a/l10n/ia.js
+++ b/l10n/ia.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "Download" : "Discargar",
     "Favorite" : "Favorite",
     "View in folder" : "Vider in dossier",
+    "Share" : "Compartir",
     "Back" : "Retro",
     "Save" : "Salveguardar",
     "Month" : "Mense",
@@ -18,6 +19,10 @@ OC.L10N.register(
     "Time" : "Tempore",
     "Name" : "Nomine",
     "Update" : "Actualisation",
-    "Refresh" : "Refrescar"
+    "Refresh" : "Refrescar",
+    "Reset" : "Re-fixar",
+    "Undo" : "Disfacer",
+    "Custom" : "Personalisate",
+    "Size" : "Dimension"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ia.json b/l10n/ia.json
index 9a15db2f7..3a86bcb0d 100644
--- a/l10n/ia.json
+++ b/l10n/ia.json
@@ -9,6 +9,7 @@
     "Download" : "Discargar",
     "Favorite" : "Favorite",
     "View in folder" : "Vider in dossier",
+    "Share" : "Compartir",
     "Back" : "Retro",
     "Save" : "Salveguardar",
     "Month" : "Mense",
@@ -16,6 +17,10 @@
     "Time" : "Tempore",
     "Name" : "Nomine",
     "Update" : "Actualisation",
-    "Refresh" : "Refrescar"
+    "Refresh" : "Refrescar",
+    "Reset" : "Re-fixar",
+    "Undo" : "Disfacer",
+    "Custom" : "Personalisate",
+    "Size" : "Dimension"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/id.js b/l10n/id.js
index f0233b57e..f312e392c 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Download" : "Unduh",
     "Favorite" : "Favorit",
     "View in folder" : "Lihat dalam folder",
+    "Share" : "Bagikan",
     "Copy public link" : "Salin tautan publik",
     "Back" : "Kembali",
     "Save" : "Simpan",
@@ -24,6 +25,10 @@ OC.L10N.register(
     "Hour" : "Jam",
     "Name" : "Nama",
     "Update" : "Perbarui",
-    "Refresh" : "Muat ulang"
+    "Refresh" : "Muat ulang",
+    "Reset" : "Setel ulang",
+    "Continue" : "Lanjutkan",
+    "Undo" : "Undo",
+    "Size" : "Ukuran"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/id.json b/l10n/id.json
index 844701335..e333d4c6b 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -13,6 +13,7 @@
     "Download" : "Unduh",
     "Favorite" : "Favorit",
     "View in folder" : "Lihat dalam folder",
+    "Share" : "Bagikan",
     "Copy public link" : "Salin tautan publik",
     "Back" : "Kembali",
     "Save" : "Simpan",
@@ -22,6 +23,10 @@
     "Hour" : "Jam",
     "Name" : "Nama",
     "Update" : "Perbarui",
-    "Refresh" : "Muat ulang"
+    "Refresh" : "Muat ulang",
+    "Reset" : "Setel ulang",
+    "Continue" : "Lanjutkan",
+    "Undo" : "Undo",
+    "Size" : "Ukuran"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/is.js b/l10n/is.js
index 285237735..934f28a25 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "Tags" : "Merki",
     "Maps" : "Landakort",
     "Settings" : "Stillingar",
+    "Unsaved changes" : "Óvistaðar breytingar",
     "Edit" : "Breyta",
     "Loading …" : "Hleð inn …",
     "Cancel" : "Hætta við",
@@ -19,6 +20,7 @@ OC.L10N.register(
     "Favorite" : "Eftirlæti",
     "Unarchive" : "Taka úr geymslu",
     "View in folder" : "Skoða í möppu",
+    "Share" : "Deila",
     "Copy public link" : "Afrita opinberan tengil",
     "Public link" : "Opinber tengill",
     "Back" : "Til baka",
@@ -32,7 +34,20 @@ OC.L10N.register(
     "Name" : "Heiti",
     "Update" : "Uppfæra",
     "Refresh" : "Endurnýja",
+    "Reset" : "Endurstilla",
+    "Continue" : "Halda áfram",
+    "Undo" : "Undo",
+    "Redo" : "Redo",
+    "Zoom in" : "Renna að",
+    "Original" : "Upprunalegt",
+    "Custom" : "Sérsniðið",
+    "Value" : "Gildi",
     "Image" : "Mynd",
-    "Position" : "Staða"
+    "Text" : "Texti",
+    "Size" : "Size",
+    "Position" : "Staða",
+    "Extension" : "Skráarending",
+    "Name is required." : "Nafn er nauðsynlegt.",
+    "Quality" : "Quality"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/l10n/is.json b/l10n/is.json
index 5be889b05..62e1bfa9f 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -9,6 +9,7 @@
     "Tags" : "Merki",
     "Maps" : "Landakort",
     "Settings" : "Stillingar",
+    "Unsaved changes" : "Óvistaðar breytingar",
     "Edit" : "Breyta",
     "Loading …" : "Hleð inn …",
     "Cancel" : "Hætta við",
@@ -17,6 +18,7 @@
     "Favorite" : "Eftirlæti",
     "Unarchive" : "Taka úr geymslu",
     "View in folder" : "Skoða í möppu",
+    "Share" : "Deila",
     "Copy public link" : "Afrita opinberan tengil",
     "Public link" : "Opinber tengill",
     "Back" : "Til baka",
@@ -30,7 +32,20 @@
     "Name" : "Heiti",
     "Update" : "Uppfæra",
     "Refresh" : "Endurnýja",
+    "Reset" : "Endurstilla",
+    "Continue" : "Halda áfram",
+    "Undo" : "Undo",
+    "Redo" : "Redo",
+    "Zoom in" : "Renna að",
+    "Original" : "Upprunalegt",
+    "Custom" : "Sérsniðið",
+    "Value" : "Gildi",
     "Image" : "Mynd",
-    "Position" : "Staða"
+    "Text" : "Texti",
+    "Size" : "Size",
+    "Position" : "Staða",
+    "Extension" : "Skráarending",
+    "Name is required." : "Nafn er nauðsynlegt.",
+    "Quality" : "Quality"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/l10n/it.js b/l10n/it.js
index 8e1559591..b2e3c51ce 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Tags" : "Etichette",
     "Maps" : "Mappe",
     "Settings" : "Impostazioni",
+    "Unsaved changes" : "Modifiche non salvate",
     "Edit" : "Modifica",
     "Loading …" : "Caricamento …",
     "Cancel" : "Annulla",
@@ -20,6 +21,7 @@ OC.L10N.register(
     "Favorite" : "Preferito",
     "Unarchive" : "Togli dall'archivio",
     "View in folder" : "Visualizza nella cartella",
+    "Share" : "Condividi",
     "Search for collaborators" : "Cerca collaboratori",
     "Search people or groups" : "Cerca persone o gruppi",
     "No collaborators available" : "Nessun collaboratore disponibile",
@@ -55,7 +57,23 @@ OC.L10N.register(
     "Delete album" : "Elimina album",
     "Merge with different person" : "Unisci ad un'altra persona",
     "Share folder" : "Condividi cartella",
+    "Reset" : "Ripristina",
+    "Continue" : "Continua",
+    "Undo" : "Annulla",
+    "Redo" : "Rifai",
+    "Zoom in" : "Ingrandisci",
+    "Draw" : "Disegna",
+    "Original" : "Originale",
+    "Custom" : "Personalizzato",
+    "Landscape" : "Paesaggio",
+    "Value" : "Valore",
     "Image" : "Immagine",
-    "Position" : "Posizione"
+    "Line" : "Linea",
+    "Text" : "Testo",
+    "Size" : "Dimensione",
+    "Position" : "Posizione",
+    "Extension" : "Estensione",
+    "Name is required." : "Il nome è richiesto.",
+    "Quality" : "Qualità"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/it.json b/l10n/it.json
index 12528702a..2581fd8b2 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -10,6 +10,7 @@
     "Tags" : "Etichette",
     "Maps" : "Mappe",
     "Settings" : "Impostazioni",
+    "Unsaved changes" : "Modifiche non salvate",
     "Edit" : "Modifica",
     "Loading …" : "Caricamento …",
     "Cancel" : "Annulla",
@@ -18,6 +19,7 @@
     "Favorite" : "Preferito",
     "Unarchive" : "Togli dall'archivio",
     "View in folder" : "Visualizza nella cartella",
+    "Share" : "Condividi",
     "Search for collaborators" : "Cerca collaboratori",
     "Search people or groups" : "Cerca persone o gruppi",
     "No collaborators available" : "Nessun collaboratore disponibile",
@@ -53,7 +55,23 @@
     "Delete album" : "Elimina album",
     "Merge with different person" : "Unisci ad un'altra persona",
     "Share folder" : "Condividi cartella",
+    "Reset" : "Ripristina",
+    "Continue" : "Continua",
+    "Undo" : "Annulla",
+    "Redo" : "Rifai",
+    "Zoom in" : "Ingrandisci",
+    "Draw" : "Disegna",
+    "Original" : "Originale",
+    "Custom" : "Personalizzato",
+    "Landscape" : "Paesaggio",
+    "Value" : "Valore",
     "Image" : "Immagine",
-    "Position" : "Posizione"
+    "Line" : "Linea",
+    "Text" : "Testo",
+    "Size" : "Dimensione",
+    "Position" : "Posizione",
+    "Extension" : "Estensione",
+    "Name is required." : "Il nome è richiesto.",
+    "Quality" : "Qualità"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/ja.js b/l10n/ja.js
index f57299f18..6a950368a 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Tags" : "タグ",
     "Maps" : "地図",
     "Settings" : "設定",
+    "Error saving image" : "画像保存でのエラー",
+    "Unsaved changes" : "保存していない変更点",
     "Edit" : "編集",
     "Loading …" : "読み込み中…",
     "Cancel" : "キャンセル",
@@ -19,6 +21,7 @@ OC.L10N.register(
     "Favorite" : "お気に入り",
     "Unarchive" : "アーカイブを解除",
     "View in folder" : "フォルダー内で表示",
+    "Share" : "共有",
     "Copy public link" : "公開リンクをコピー",
     "Public link" : "公開リンク",
     "Create new album" : "新しいアルバムを作成",
@@ -40,12 +43,36 @@ OC.L10N.register(
     "Update" : "更新",
     "Refresh" : "更新",
     "Share folder" : "フォルダーを共有",
+    "Reset" : "リセット",
+    "All changes will be lost." : "全ての変更がなくなります",
     "Are you sure you want to continue?" : "本当に続けてよろしいですか？",
+    "Continue" : "続ける",
+    "Undo" : "元に戻す",
+    "Redo" : "やり直し",
     "Show original image" : "オリジナル画像を表示する",
+    "Zoom in" : "拡大",
     "Zoom out" : "縮小",
+    "Filters" : "フィルター",
+    "Draw" : "描画",
     "Resize" : "リサイズ",
+    "Invalid image." : "無効な画像",
+    "Error while uploading the image." : "画像のアップロードでのエラー",
+    "are not images" : "画像ではありません",
     "is not an image" : "画像ではありません",
+    "to be uploaded" : "アップロードされる",
+    "Crop" : "クロップ",
+    "Original" : "オリジナル",
+    "Custom" : "カスタム",
+    "Landscape" : "ランドスケープ",
+    "Portrait" : "ポートレート",
+    "Value" : "値",
     "Image" : "画像",
-    "Position" : "位置"
+    "Rotate" : "回転",
+    "Text" : "テキスト",
+    "Size" : "サイズ",
+    "Position" : "位置",
+    "Extension" : "拡張",
+    "Name is required." : "名前は必須です。",
+    "Quality" : "品質"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ja.json b/l10n/ja.json
index e2b4923c3..553a3c6f0 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -9,6 +9,8 @@
     "Tags" : "タグ",
     "Maps" : "地図",
     "Settings" : "設定",
+    "Error saving image" : "画像保存でのエラー",
+    "Unsaved changes" : "保存していない変更点",
     "Edit" : "編集",
     "Loading …" : "読み込み中…",
     "Cancel" : "キャンセル",
@@ -17,6 +19,7 @@
     "Favorite" : "お気に入り",
     "Unarchive" : "アーカイブを解除",
     "View in folder" : "フォルダー内で表示",
+    "Share" : "共有",
     "Copy public link" : "公開リンクをコピー",
     "Public link" : "公開リンク",
     "Create new album" : "新しいアルバムを作成",
@@ -38,12 +41,36 @@
     "Update" : "更新",
     "Refresh" : "更新",
     "Share folder" : "フォルダーを共有",
+    "Reset" : "リセット",
+    "All changes will be lost." : "全ての変更がなくなります",
     "Are you sure you want to continue?" : "本当に続けてよろしいですか？",
+    "Continue" : "続ける",
+    "Undo" : "元に戻す",
+    "Redo" : "やり直し",
     "Show original image" : "オリジナル画像を表示する",
+    "Zoom in" : "拡大",
     "Zoom out" : "縮小",
+    "Filters" : "フィルター",
+    "Draw" : "描画",
     "Resize" : "リサイズ",
+    "Invalid image." : "無効な画像",
+    "Error while uploading the image." : "画像のアップロードでのエラー",
+    "are not images" : "画像ではありません",
     "is not an image" : "画像ではありません",
+    "to be uploaded" : "アップロードされる",
+    "Crop" : "クロップ",
+    "Original" : "オリジナル",
+    "Custom" : "カスタム",
+    "Landscape" : "ランドスケープ",
+    "Portrait" : "ポートレート",
+    "Value" : "値",
     "Image" : "画像",
-    "Position" : "位置"
+    "Rotate" : "回転",
+    "Text" : "テキスト",
+    "Size" : "サイズ",
+    "Position" : "位置",
+    "Extension" : "拡張",
+    "Name is required." : "名前は必須です。",
+    "Quality" : "品質"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js
index b4b1c01e1..20ed4c078 100644
--- a/l10n/ka_GE.js
+++ b/l10n/ka_GE.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Tags" : "ტეგები",
     "Maps" : "რუკები",
     "Settings" : "პარამეტრები",
+    "Unsaved changes" : "შეუნახავი ცვლილებები",
     "Edit" : "შეცვლა",
     "Cancel" : "უარყოფა",
     "Delete" : "წაშლა",
@@ -15,6 +16,7 @@ OC.L10N.register(
     "Favorite" : "რჩეული",
     "Unarchive" : "ამოღება",
     "View in folder" : "ჩვენება დირექტორიაში",
+    "Share" : "გაზიარება",
     "Back" : "უკან",
     "Save" : "შენახვა",
     "Month" : "თვე",
@@ -24,6 +26,13 @@ OC.L10N.register(
     "Name" : "სახელი",
     "Update" : "განახლება",
     "Refresh" : "განახლება",
+    "Reset" : "საწყის მდოგმარეობაში დაბრუნება",
+    "Continue" : "გაგრძელება",
+    "Undo" : "დაბრუნება",
+    "Custom" : "ინდივიდუალური",
+    "Value" : "მნიშვნელობა",
+    "Text" : "ტექსტი",
+    "Size" : "ზომა",
     "Position" : "პოზიცია"
 },
 "nplurals=2; plural=(n!=1);");
diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json
index 1d49782a6..02df1df35 100644
--- a/l10n/ka_GE.json
+++ b/l10n/ka_GE.json
@@ -6,6 +6,7 @@
     "Tags" : "ტეგები",
     "Maps" : "რუკები",
     "Settings" : "პარამეტრები",
+    "Unsaved changes" : "შეუნახავი ცვლილებები",
     "Edit" : "შეცვლა",
     "Cancel" : "უარყოფა",
     "Delete" : "წაშლა",
@@ -13,6 +14,7 @@
     "Favorite" : "რჩეული",
     "Unarchive" : "ამოღება",
     "View in folder" : "ჩვენება დირექტორიაში",
+    "Share" : "გაზიარება",
     "Back" : "უკან",
     "Save" : "შენახვა",
     "Month" : "თვე",
@@ -22,6 +24,13 @@
     "Name" : "სახელი",
     "Update" : "განახლება",
     "Refresh" : "განახლება",
+    "Reset" : "საწყის მდოგმარეობაში დაბრუნება",
+    "Continue" : "გაგრძელება",
+    "Undo" : "დაბრუნება",
+    "Custom" : "ინდივიდუალური",
+    "Value" : "მნიშვნელობა",
+    "Text" : "ტექსტი",
+    "Size" : "ზომა",
     "Position" : "პოზიცია"
 },"pluralForm" :"nplurals=2; plural=(n!=1);"
 }
\ No newline at end of file
diff --git a/l10n/kab.js b/l10n/kab.js
index 4a51f7a29..22fbcc307 100644
--- a/l10n/kab.js
+++ b/l10n/kab.js
@@ -10,10 +10,13 @@ OC.L10N.register(
     "Delete" : "Kkes",
     "Download" : "Sider",
     "Favorite" : "Menyif",
+    "Share" : "Bḍu",
     "Back" : "Retour",
     "Save" : "Sekles",
     "Hour" : "Asrag",
     "Name" : "Nom",
-    "Refresh" : "Sismeḍ"
+    "Refresh" : "Sismeḍ",
+    "Continue" : "Continuer",
+    "Size" : "Teɣzi"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/kab.json b/l10n/kab.json
index c064068a5..684a0cc6c 100644
--- a/l10n/kab.json
+++ b/l10n/kab.json
@@ -8,10 +8,13 @@
     "Delete" : "Kkes",
     "Download" : "Sider",
     "Favorite" : "Menyif",
+    "Share" : "Bḍu",
     "Back" : "Retour",
     "Save" : "Sekles",
     "Hour" : "Asrag",
     "Name" : "Nom",
-    "Refresh" : "Sismeḍ"
+    "Refresh" : "Sismeḍ",
+    "Continue" : "Continuer",
+    "Size" : "Teɣzi"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/km.js b/l10n/km.js
index 64e5305ac..26df0d0e5 100644
--- a/l10n/km.js
+++ b/l10n/km.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Cancel" : "បោះបង់",
     "Delete" : "លុប",
     "Download" : "ទាញយក",
+    "Share" : "ចែក​រំលែក",
     "Back" : "ត្រឡប់ក្រោយ",
     "Save" : "រក្សាទុក",
     "Year" : "ឆ្នាំ",
@@ -16,6 +17,10 @@ OC.L10N.register(
     "Day" : "ថ្ងៃ",
     "Time" : "ម៉ោង",
     "Name" : "ឈ្មោះ",
-    "Update" : "ធ្វើ​បច្ចុប្បន្នភាព"
+    "Update" : "ធ្វើ​បច្ចុប្បន្នភាព",
+    "Continue" : "បន្ត",
+    "Value" : "តម្លៃ",
+    "Line" : "បន្ទាត់",
+    "Size" : "ទំហំ"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/km.json b/l10n/km.json
index 97930a028..0b6458d4c 100644
--- a/l10n/km.json
+++ b/l10n/km.json
@@ -7,6 +7,7 @@
     "Cancel" : "បោះបង់",
     "Delete" : "លុប",
     "Download" : "ទាញយក",
+    "Share" : "ចែក​រំលែក",
     "Back" : "ត្រឡប់ក្រោយ",
     "Save" : "រក្សាទុក",
     "Year" : "ឆ្នាំ",
@@ -14,6 +15,10 @@
     "Day" : "ថ្ងៃ",
     "Time" : "ម៉ោង",
     "Name" : "ឈ្មោះ",
-    "Update" : "ធ្វើ​បច្ចុប្បន្នភាព"
+    "Update" : "ធ្វើ​បច្ចុប្បន្នភាព",
+    "Continue" : "បន្ត",
+    "Value" : "តម្លៃ",
+    "Line" : "បន្ទាត់",
+    "Size" : "ទំហំ"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/kn.js b/l10n/kn.js
new file mode 100644
index 000000000..6d74274b7
--- /dev/null
+++ b/l10n/kn.js
@@ -0,0 +1,20 @@
+OC.L10N.register(
+    "memories",
+    {
+    "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
+    "Maps" : "ನಕಾಶೆ",
+    "Settings" : "ಆಯ್ಕೆ",
+    "Edit" : "ಸಂಪಾದಿಸು",
+    "Cancel" : "ರದ್ದು",
+    "Delete" : "ಅಳಿಸಿ",
+    "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
+    "Favorite" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
+    "Save" : "ಉಳಿಸಿ",
+    "Time" : "ಸಮಯ",
+    "Name" : "ಹೆಸರು",
+    "Reset" : "ಮರುಹೊಂದಿಸಿ",
+    "Continue" : "ಮುಂದುವರಿಸಿ",
+    "Size" : " ಗಾತ್ರ"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/l10n/kn.json b/l10n/kn.json
new file mode 100644
index 000000000..5c6a20ba6
--- /dev/null
+++ b/l10n/kn.json
@@ -0,0 +1,18 @@
+{ "translations": {
+    "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
+    "Maps" : "ನಕಾಶೆ",
+    "Settings" : "ಆಯ್ಕೆ",
+    "Edit" : "ಸಂಪಾದಿಸು",
+    "Cancel" : "ರದ್ದು",
+    "Delete" : "ಅಳಿಸಿ",
+    "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
+    "Favorite" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
+    "Save" : "ಉಳಿಸಿ",
+    "Time" : "ಸಮಯ",
+    "Name" : "ಹೆಸರು",
+    "Reset" : "ಮರುಹೊಂದಿಸಿ",
+    "Continue" : "ಮುಂದುವರಿಸಿ",
+    "Size" : " ಗಾತ್ರ"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/l10n/ko.js b/l10n/ko.js
index eee75c382..f5a37f8ec 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Tags" : "태그",
     "Maps" : "지도",
     "Settings" : "설정",
+    "Unsaved changes" : "저장하지 않은 변경 사항",
     "Edit" : "편집",
     "Loading …" : "불러오는 중 …",
     "Cancel" : "취소",
@@ -17,6 +18,7 @@ OC.L10N.register(
     "Favorite" : "즐겨찾기",
     "Unarchive" : "보관 해제",
     "View in folder" : "폴더에서 보기",
+    "Share" : "공유",
     "Copy public link" : "공용 링크 복사",
     "Public link" : "공개 링크",
     "Back" : "뒤로",
@@ -29,6 +31,18 @@ OC.L10N.register(
     "Name" : "이름",
     "Update" : "업데이트",
     "Refresh" : "새로 고침",
-    "Position" : "위치"
+    "Reset" : "초기화",
+    "Continue" : "계속",
+    "Undo" : "실행 취소",
+    "Redo" : "다시 실행",
+    "Zoom in" : "확대",
+    "Original" : "원본",
+    "Custom" : "사용자 정의",
+    "Value" : "값",
+    "Text" : "텍스트",
+    "Size" : "크기",
+    "Position" : "위치",
+    "Extension" : "확장자",
+    "Quality" : "품질"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ko.json b/l10n/ko.json
index 151677c8c..db5349d7f 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -7,6 +7,7 @@
     "Tags" : "태그",
     "Maps" : "지도",
     "Settings" : "설정",
+    "Unsaved changes" : "저장하지 않은 변경 사항",
     "Edit" : "편집",
     "Loading …" : "불러오는 중 …",
     "Cancel" : "취소",
@@ -15,6 +16,7 @@
     "Favorite" : "즐겨찾기",
     "Unarchive" : "보관 해제",
     "View in folder" : "폴더에서 보기",
+    "Share" : "공유",
     "Copy public link" : "공용 링크 복사",
     "Public link" : "공개 링크",
     "Back" : "뒤로",
@@ -27,6 +29,18 @@
     "Name" : "이름",
     "Update" : "업데이트",
     "Refresh" : "새로 고침",
-    "Position" : "위치"
+    "Reset" : "초기화",
+    "Continue" : "계속",
+    "Undo" : "실행 취소",
+    "Redo" : "다시 실행",
+    "Zoom in" : "확대",
+    "Original" : "원본",
+    "Custom" : "사용자 정의",
+    "Value" : "값",
+    "Text" : "텍스트",
+    "Size" : "크기",
+    "Position" : "위치",
+    "Extension" : "확장자",
+    "Quality" : "품질"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/lb.js b/l10n/lb.js
index 83b0c0d6f..98b930622 100644
--- a/l10n/lb.js
+++ b/l10n/lb.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "Download" : "Eroflueden",
     "Favorite" : "Favorit",
     "View in folder" : "Kuk am Dossier ",
+    "Share" : "Deelen",
     "Back" : "Zeréck",
     "Save" : "Späicheren",
     "Month" : "Mount",
@@ -19,6 +20,10 @@ OC.L10N.register(
     "Hour" : "Stonn",
     "Name" : "Numm",
     "Update" : "Update",
-    "Refresh" : "Opfrëschen"
+    "Refresh" : "Opfrëschen",
+    "Reset" : "Zeréck setzen",
+    "Continue" : "Weider",
+    "Custom" : "Individualiséier",
+    "Size" : "Gréisst"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/lb.json b/l10n/lb.json
index 1e2dc4751..0fc2e70c0 100644
--- a/l10n/lb.json
+++ b/l10n/lb.json
@@ -9,6 +9,7 @@
     "Download" : "Eroflueden",
     "Favorite" : "Favorit",
     "View in folder" : "Kuk am Dossier ",
+    "Share" : "Deelen",
     "Back" : "Zeréck",
     "Save" : "Späicheren",
     "Month" : "Mount",
@@ -17,6 +18,10 @@
     "Hour" : "Stonn",
     "Name" : "Numm",
     "Update" : "Update",
-    "Refresh" : "Opfrëschen"
+    "Refresh" : "Opfrëschen",
+    "Reset" : "Zeréck setzen",
+    "Continue" : "Weider",
+    "Custom" : "Individualiséier",
+    "Size" : "Gréisst"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/lo.js b/l10n/lo.js
index 69b0ba35a..808a3fbb2 100644
--- a/l10n/lo.js
+++ b/l10n/lo.js
@@ -12,9 +12,13 @@ OC.L10N.register(
     "Download" : "ດາວໂຫລດ",
     "Favorite" : "ລາຍການທີ່ມັກ",
     "View in folder" : "ເບິ່ງໃນໂຟນເດີ",
+    "Share" : "ແບ່ງປັນ",
     "Back" : "ຫຼັງ",
     "Save" : "ບັນທຶກ",
     "Name" : "ຊື່",
-    "Refresh" : "Refresh"
+    "Refresh" : "Refresh",
+    "Continue" : "ສືບຕໍ່",
+    "Original" : "ຕົ້ນສະບັບ",
+    "Size" : "ຂະຫນາດ"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/lo.json b/l10n/lo.json
index 3fe1c8c01..1f4179ecd 100644
--- a/l10n/lo.json
+++ b/l10n/lo.json
@@ -10,9 +10,13 @@
     "Download" : "ດາວໂຫລດ",
     "Favorite" : "ລາຍການທີ່ມັກ",
     "View in folder" : "ເບິ່ງໃນໂຟນເດີ",
+    "Share" : "ແບ່ງປັນ",
     "Back" : "ຫຼັງ",
     "Save" : "ບັນທຶກ",
     "Name" : "ຊື່",
-    "Refresh" : "Refresh"
+    "Refresh" : "Refresh",
+    "Continue" : "ສືບຕໍ່",
+    "Original" : "ຕົ້ນສະບັບ",
+    "Size" : "ຂະຫນາດ"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 48578144d..08a81994c 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Maps" : "Žemėlapiai",
     "Settings" : "Nustatymai",
     "Click here to start" : "Spustelėkite čia, norėdami pradėti",
+    "Unsaved changes" : "Neįrašyti pakeitimai",
     "Edit" : "Taisyti",
     "Loading …" : "Įkeliama…",
     "Cancel" : "Atsisakyti",
@@ -35,6 +36,7 @@ OC.L10N.register(
     "Square grid mode" : "Kvadratinio tinklelio veiksena",
     "Your Timeline" : "Jūsų laiko juostą",
     "Failed to load some photos" : "Nepavyko įkelti kai kurių nuotraukų",
+    "Share" : "Bendrinti",
     "Sidebar" : "Šoninė juosta",
     "Processing … {n}/{m}" : "Apdorojama… {n}/{m}",
     "Search people or groups" : "Ieškoti žmonių ar grupių",
@@ -90,11 +92,29 @@ OC.L10N.register(
     "Share folder" : "Bendrinti aplanką",
     "Move left" : "Perkelti kairėn",
     "Move right" : "Perkelti dešinėn",
+    "Save as" : "Įrašyti kaip",
+    "Reset" : "Atstatyti",
+    "All changes will be lost." : "Visi pakeitimai bus prarasti.",
     "Are you sure you want to continue?" : "Ar tikrai norite tęsti?",
+    "Continue" : "Tęsti",
     "Undo" : "Atšaukti",
+    "Redo" : "Grąžinti",
+    "Zoom in" : "Didinti",
     "Resize" : "Keisti dydį",
+    "Crop" : "Apkirpti",
+    "Custom" : "Tinkinti",
+    "Landscape" : "Kraštovaizdis",
+    "Portrait" : "Portretas",
+    "Value" : "Reikšmė",
     "Image" : "Paveikslas",
+    "Rotate" : "Pasukti",
+    "Text" : "Tekstas",
+    "Font family" : "Šriftas",
+    "Size" : "Dydis",
+    "Add as text" : "Pridėti kaip tekstą",
     "Position" : "Vieta",
+    "Name is required." : "Vardas yra būtinas.",
+    "Quality" : "Kokybė",
     "Failed to create {albumName}." : "Nepavyko sukurti {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepavyko pervadinti {currentAlbumName} į {newAlbumName}.",
     "General Failure" : "Bendrinė nesėkmė",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index a71e3ca55..79b18500e 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -13,6 +13,7 @@
     "Maps" : "Žemėlapiai",
     "Settings" : "Nustatymai",
     "Click here to start" : "Spustelėkite čia, norėdami pradėti",
+    "Unsaved changes" : "Neįrašyti pakeitimai",
     "Edit" : "Taisyti",
     "Loading …" : "Įkeliama…",
     "Cancel" : "Atsisakyti",
@@ -33,6 +34,7 @@
     "Square grid mode" : "Kvadratinio tinklelio veiksena",
     "Your Timeline" : "Jūsų laiko juostą",
     "Failed to load some photos" : "Nepavyko įkelti kai kurių nuotraukų",
+    "Share" : "Bendrinti",
     "Sidebar" : "Šoninė juosta",
     "Processing … {n}/{m}" : "Apdorojama… {n}/{m}",
     "Search people or groups" : "Ieškoti žmonių ar grupių",
@@ -88,11 +90,29 @@
     "Share folder" : "Bendrinti aplanką",
     "Move left" : "Perkelti kairėn",
     "Move right" : "Perkelti dešinėn",
+    "Save as" : "Įrašyti kaip",
+    "Reset" : "Atstatyti",
+    "All changes will be lost." : "Visi pakeitimai bus prarasti.",
     "Are you sure you want to continue?" : "Ar tikrai norite tęsti?",
+    "Continue" : "Tęsti",
     "Undo" : "Atšaukti",
+    "Redo" : "Grąžinti",
+    "Zoom in" : "Didinti",
     "Resize" : "Keisti dydį",
+    "Crop" : "Apkirpti",
+    "Custom" : "Tinkinti",
+    "Landscape" : "Kraštovaizdis",
+    "Portrait" : "Portretas",
+    "Value" : "Reikšmė",
     "Image" : "Paveikslas",
+    "Rotate" : "Pasukti",
+    "Text" : "Tekstas",
+    "Font family" : "Šriftas",
+    "Size" : "Dydis",
+    "Add as text" : "Pridėti kaip tekstą",
     "Position" : "Vieta",
+    "Name is required." : "Vardas yra būtinas.",
+    "Quality" : "Kokybė",
     "Failed to create {albumName}." : "Nepavyko sukurti {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepavyko pervadinti {currentAlbumName} į {newAlbumName}.",
     "General Failure" : "Bendrinė nesėkmė",
diff --git a/l10n/lv.js b/l10n/lv.js
index a7f2c2d51..c6d053982 100644
--- a/l10n/lv.js
+++ b/l10n/lv.js
@@ -8,12 +8,14 @@ OC.L10N.register(
     "Tags" : "Birkas",
     "Maps" : "Karte",
     "Settings" : "Iestatījumi",
+    "EXIF" : "EXIF",
     "Edit" : "Rediģēt",
     "Cancel" : "Atcelt",
     "Delete" : "Dzēst",
     "Download" : "Lejupielādēt",
     "Favorite" : "Favorīts",
     "View in folder" : "Skatīt mapē",
+    "Share" : "Koplietot",
     "Sidebar" : "Sānjosla",
     "Back" : "Atpakaļ",
     "Save" : "Saglabāt",
@@ -24,8 +26,18 @@ OC.L10N.register(
     "Hour" : "Stunda",
     "Name" : "Vārds",
     "Update" : "Atjaunināt",
+    "Share Folder" : "Kopīgot mapi",
     "Refresh" : "Atsvaidzināt",
+    "Save as" : "Saglabāt kā",
+    "Reset" : "Atiestatīt",
+    "Continue" : "Turpināt",
     "Undo" : "Atsaukt",
-    "Image" : "Attēli"
+    "Redo" : "Atcelt atsaukšanu",
+    "Custom" : "Pielāgots",
+    "Value" : "Vērtība",
+    "Image" : "Attēli",
+    "Text" : "Teksts",
+    "Size" : "Izmērs",
+    "Shared Folder" : "Koplietotā mape"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/l10n/lv.json b/l10n/lv.json
index 3b874bf80..ef5d53ceb 100644
--- a/l10n/lv.json
+++ b/l10n/lv.json
@@ -6,12 +6,14 @@
     "Tags" : "Birkas",
     "Maps" : "Karte",
     "Settings" : "Iestatījumi",
+    "EXIF" : "EXIF",
     "Edit" : "Rediģēt",
     "Cancel" : "Atcelt",
     "Delete" : "Dzēst",
     "Download" : "Lejupielādēt",
     "Favorite" : "Favorīts",
     "View in folder" : "Skatīt mapē",
+    "Share" : "Koplietot",
     "Sidebar" : "Sānjosla",
     "Back" : "Atpakaļ",
     "Save" : "Saglabāt",
@@ -22,8 +24,18 @@
     "Hour" : "Stunda",
     "Name" : "Vārds",
     "Update" : "Atjaunināt",
+    "Share Folder" : "Kopīgot mapi",
     "Refresh" : "Atsvaidzināt",
+    "Save as" : "Saglabāt kā",
+    "Reset" : "Atiestatīt",
+    "Continue" : "Turpināt",
     "Undo" : "Atsaukt",
-    "Image" : "Attēli"
+    "Redo" : "Atcelt atsaukšanu",
+    "Custom" : "Pielāgots",
+    "Value" : "Vērtība",
+    "Image" : "Attēli",
+    "Text" : "Teksts",
+    "Size" : "Izmērs",
+    "Shared Folder" : "Koplietotā mape"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/mk.js b/l10n/mk.js
index 7a8d11112..6d7c0ab58 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Tags" : "Ознаки",
     "Maps" : "Мапи",
     "Settings" : "Параметри",
+    "Unsaved changes" : "Незачувани промени",
     "Edit" : "Уреди",
     "Loading …" : "Се вчитува…",
     "Cancel" : "Откажи",
@@ -20,6 +21,7 @@ OC.L10N.register(
     "Favorite" : "Омилен",
     "View in folder" : "Погледни во папката",
     "Add to album" : "Додади во албум",
+    "Share" : "Сподели",
     "Sidebar" : "Странична лента",
     "Copy public link" : "Копирај јавен линк",
     "Public link" : "Јавен линк",
@@ -46,17 +48,52 @@ OC.L10N.register(
     "Delete album" : "Избриши албум",
     "Merge with different person" : "Спој со друга личност",
     "Share folder" : "Сподели папка",
+    "Save as" : "Зачувај како",
+    "Reset" : "Ресетирање",
+    "All changes will be lost." : "Сите промени ќе се изгубат.",
     "Are you sure you want to continue?" : "Дали си сигурен дека сакаш да продолжиш?",
+    "Continue" : "Продолжи",
     "Undo" : "Назад",
+    "Redo" : "Напред",
     "Show original image" : "Прикажи ја оргиналната слика",
+    "Zoom in" : "Зумирај",
     "Zoom out" : "Од зумирај",
     "Toggle zoom menu" : "Прикажи мени за зумирање",
+    "Adjust" : "Прилагоди",
+    "Fine-tune" : "Фимо прилагодување",
+    "Filters" : "Филтри",
+    "Watermark" : "Воден печат",
+    "Draw" : "Нацрт",
     "Resize" : "Промени големина",
+    "Invalid image." : "Невалидна слика.",
+    "Error while uploading the image." : "Грешка при прикачување на сликата.",
+    "are not images" : "не се слики",
     "is not an image" : "не е слика",
+    "to be uploaded" : "за да се орикачат",
+    "Crop" : "Пресечи",
+    "Original" : "Оргинал",
+    "Custom" : "Прилагодено",
+    "Square" : "Квадрат",
+    "Landscape" : "Пејсаж",
+    "Portrait" : "Портрет",
     "Ellipse" : "Елипса",
+    "Classic TV" : "Класичен ТВ",
+    "Arrow" : "Стрела",
+    "Brightness" : "Светлина",
+    "Contrast" : "Контраст",
+    "Value" : "Вредност",
     "Image" : "Слика",
+    "+ Add image" : "+ Додади слика",
+    "Line" : "Линија",
+    "Text" : "Текст",
+    "Size" : "Големина",
     "Position" : "Позиција",
+    "Save image as" : "Зачувај ја сликата како",
+    "Extension" : "Екстензија",
+    "Name is required." : "Потребно е име.",
+    "Quality" : "Квалитет",
     "Actual size (100%)" : "Актуелна големина (100%)",
+    "Fit size" : "Соодветна големина",
     "Failed to create {albumName}." : "Неуспешно креирање {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименување на {currentAlbumName} во {newAlbumName}.",
     "Failed to favorite {fileName}." : "Неуспешно додавање во омилени {fileName}."
diff --git a/l10n/mk.json b/l10n/mk.json
index f364ea194..8ac7d3958 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -10,6 +10,7 @@
     "Tags" : "Ознаки",
     "Maps" : "Мапи",
     "Settings" : "Параметри",
+    "Unsaved changes" : "Незачувани промени",
     "Edit" : "Уреди",
     "Loading …" : "Се вчитува…",
     "Cancel" : "Откажи",
@@ -18,6 +19,7 @@
     "Favorite" : "Омилен",
     "View in folder" : "Погледни во папката",
     "Add to album" : "Додади во албум",
+    "Share" : "Сподели",
     "Sidebar" : "Странична лента",
     "Copy public link" : "Копирај јавен линк",
     "Public link" : "Јавен линк",
@@ -44,17 +46,52 @@
     "Delete album" : "Избриши албум",
     "Merge with different person" : "Спој со друга личност",
     "Share folder" : "Сподели папка",
+    "Save as" : "Зачувај како",
+    "Reset" : "Ресетирање",
+    "All changes will be lost." : "Сите промени ќе се изгубат.",
     "Are you sure you want to continue?" : "Дали си сигурен дека сакаш да продолжиш?",
+    "Continue" : "Продолжи",
     "Undo" : "Назад",
+    "Redo" : "Напред",
     "Show original image" : "Прикажи ја оргиналната слика",
+    "Zoom in" : "Зумирај",
     "Zoom out" : "Од зумирај",
     "Toggle zoom menu" : "Прикажи мени за зумирање",
+    "Adjust" : "Прилагоди",
+    "Fine-tune" : "Фимо прилагодување",
+    "Filters" : "Филтри",
+    "Watermark" : "Воден печат",
+    "Draw" : "Нацрт",
     "Resize" : "Промени големина",
+    "Invalid image." : "Невалидна слика.",
+    "Error while uploading the image." : "Грешка при прикачување на сликата.",
+    "are not images" : "не се слики",
     "is not an image" : "не е слика",
+    "to be uploaded" : "за да се орикачат",
+    "Crop" : "Пресечи",
+    "Original" : "Оргинал",
+    "Custom" : "Прилагодено",
+    "Square" : "Квадрат",
+    "Landscape" : "Пејсаж",
+    "Portrait" : "Портрет",
     "Ellipse" : "Елипса",
+    "Classic TV" : "Класичен ТВ",
+    "Arrow" : "Стрела",
+    "Brightness" : "Светлина",
+    "Contrast" : "Контраст",
+    "Value" : "Вредност",
     "Image" : "Слика",
+    "+ Add image" : "+ Додади слика",
+    "Line" : "Линија",
+    "Text" : "Текст",
+    "Size" : "Големина",
     "Position" : "Позиција",
+    "Save image as" : "Зачувај ја сликата како",
+    "Extension" : "Екстензија",
+    "Name is required." : "Потребно е име.",
+    "Quality" : "Квалитет",
     "Actual size (100%)" : "Актуелна големина (100%)",
+    "Fit size" : "Соодветна големина",
     "Failed to create {albumName}." : "Неуспешно креирање {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименување на {currentAlbumName} во {newAlbumName}.",
     "Failed to favorite {fileName}." : "Неуспешно додавање во омилени {fileName}."
diff --git a/l10n/mn.js b/l10n/mn.js
index d134579d8..aed6d47f5 100644
--- a/l10n/mn.js
+++ b/l10n/mn.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Favorite" : "Дуртай",
     "Unarchive" : "Архиваас гаргах",
     "View in folder" : "Хавтасыг нээх",
+    "Share" : "Түгээх",
     "Back" : "буцах",
     "Save" : "Хадгалах",
     "Month" : "Сар",
@@ -24,7 +25,12 @@ OC.L10N.register(
     "Name" : "Нэр",
     "Update" : "Шинэчлэх",
     "Refresh" : "Сэргээх",
+    "Reset" : "тохируулах",
+    "Continue" : "үргэлжлүүлэх",
     "Undo" : "буцах",
+    "Custom" : "Дурын",
+    "Value" : "Үнийн дүн",
+    "Size" : "Хэмжээ",
     "Position" : "Байр"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/mn.json b/l10n/mn.json
index 2ffc8ffd9..f8ef9ff88 100644
--- a/l10n/mn.json
+++ b/l10n/mn.json
@@ -14,6 +14,7 @@
     "Favorite" : "Дуртай",
     "Unarchive" : "Архиваас гаргах",
     "View in folder" : "Хавтасыг нээх",
+    "Share" : "Түгээх",
     "Back" : "буцах",
     "Save" : "Хадгалах",
     "Month" : "Сар",
@@ -22,7 +23,12 @@
     "Name" : "Нэр",
     "Update" : "Шинэчлэх",
     "Refresh" : "Сэргээх",
+    "Reset" : "тохируулах",
+    "Continue" : "үргэлжлүүлэх",
     "Undo" : "буцах",
+    "Custom" : "Дурын",
+    "Value" : "Үнийн дүн",
+    "Size" : "Хэмжээ",
     "Position" : "Байр"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ms_MY.js b/l10n/ms_MY.js
index 6e021516c..35fa16f99 100644
--- a/l10n/ms_MY.js
+++ b/l10n/ms_MY.js
@@ -7,12 +7,14 @@ OC.L10N.register(
     "Cancel" : "Batal",
     "Delete" : "Padam",
     "Download" : "Muat turun",
+    "Share" : "Kongsi",
     "Back" : "Kembali",
     "Save" : "Simpan",
     "Month" : "Bulan",
     "Day" : "Hari",
     "Name" : "Nama",
     "Update" : "Kemaskini",
-    "Refresh" : "Refresh"
+    "Refresh" : "Refresh",
+    "Size" : "Saiz"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ms_MY.json b/l10n/ms_MY.json
index e5dfbe6c3..962e6ba6e 100644
--- a/l10n/ms_MY.json
+++ b/l10n/ms_MY.json
@@ -5,12 +5,14 @@
     "Cancel" : "Batal",
     "Delete" : "Padam",
     "Download" : "Muat turun",
+    "Share" : "Kongsi",
     "Back" : "Kembali",
     "Save" : "Simpan",
     "Month" : "Bulan",
     "Day" : "Hari",
     "Name" : "Nama",
     "Update" : "Kemaskini",
-    "Refresh" : "Refresh"
+    "Refresh" : "Refresh",
+    "Size" : "Saiz"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/nb.js b/l10n/nb.js
index 3776a5096..2f04739d5 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "Tags" : "Merkelapper",
     "Maps" : "Kart",
     "Settings" : "Innstillinger",
+    "Unsaved changes" : "Ulagrede endringer",
     "Edit" : "Rediger",
     "Loading …" : "Laster ...",
     "Cancel" : "Avbryt",
@@ -19,6 +20,7 @@ OC.L10N.register(
     "Favorite" : "Favoritt",
     "Unarchive" : "Dearkivere",
     "View in folder" : "Vis i mappe",
+    "Share" : "Del",
     "Copy public link" : "Kopier offentlig lenke",
     "Public link" : "Offentlig lenke",
     "Back" : "Tilbake",
@@ -32,15 +34,46 @@ OC.L10N.register(
     "Update" : "Oppdater",
     "Refresh" : "Oppdater",
     "Share folder" : "Del mappe",
+    "Save as" : "Lagre som",
+    "Reset" : "Tilbakestill",
+    "All changes will be lost." : "Alle endringer vil gå tapt.",
     "Are you sure you want to continue?" : "Er du sikker på at du vil fortsette?",
+    "Continue" : "Fortsett",
     "Undo" : "Angre",
+    "Redo" : "Gjør om",
     "Show original image" : "Vis originalbilde",
+    "Zoom in" : "Zoom inn",
     "Zoom out" : "Zoom ut",
+    "Adjust" : "Juster",
+    "Fine-tune" : "Fininnstill",
+    "Filters" : "Filtere",
+    "Watermark" : "Vannmerke",
+    "Draw" : "Tegn",
     "Resize" : "Endre størrelse",
+    "Invalid image." : "Ugyldig bilde.",
+    "Original" : "Original",
+    "Custom" : "Egendefinert",
+    "Value" : "Verdi",
     "Image" : "Bilde",
+    "Importing …" : "Importerer…",
+    "+ Add image" : "+ Legg til bilde",
+    "Line" : "Linje",
+    "Rotate" : "Roter",
+    "Text" : "Tekst",
+    "Font family" : "Font-familie",
+    "Size" : "Størrelse",
+    "+ Add watermark" : "+ Legg til vannmerke",
     "Choose watermark type" : "Velg vannmerke-type",
+    "Upload watermark" : "Last opp vannmerke",
+    "Add as text" : "Legg til som tekst",
+    "Shadow" : "Skygge",
     "Horizontal" : "Horisontal",
+    "Vertical" : "Vertikal",
+    "Opacity" : "Gjennomsiktighet",
     "Position" : "Posisjon",
-    "Name is required." : "Navn er påkrevd."
+    "Save image as" : "Lagre bilde som",
+    "Extension" : "Filetternavn",
+    "Name is required." : "Navn er påkrevd.",
+    "Quality" : "Kvalitet"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/nb.json b/l10n/nb.json
index f063ca8ea..ff3202595 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -9,6 +9,7 @@
     "Tags" : "Merkelapper",
     "Maps" : "Kart",
     "Settings" : "Innstillinger",
+    "Unsaved changes" : "Ulagrede endringer",
     "Edit" : "Rediger",
     "Loading …" : "Laster ...",
     "Cancel" : "Avbryt",
@@ -17,6 +18,7 @@
     "Favorite" : "Favoritt",
     "Unarchive" : "Dearkivere",
     "View in folder" : "Vis i mappe",
+    "Share" : "Del",
     "Copy public link" : "Kopier offentlig lenke",
     "Public link" : "Offentlig lenke",
     "Back" : "Tilbake",
@@ -30,15 +32,46 @@
     "Update" : "Oppdater",
     "Refresh" : "Oppdater",
     "Share folder" : "Del mappe",
+    "Save as" : "Lagre som",
+    "Reset" : "Tilbakestill",
+    "All changes will be lost." : "Alle endringer vil gå tapt.",
     "Are you sure you want to continue?" : "Er du sikker på at du vil fortsette?",
+    "Continue" : "Fortsett",
     "Undo" : "Angre",
+    "Redo" : "Gjør om",
     "Show original image" : "Vis originalbilde",
+    "Zoom in" : "Zoom inn",
     "Zoom out" : "Zoom ut",
+    "Adjust" : "Juster",
+    "Fine-tune" : "Fininnstill",
+    "Filters" : "Filtere",
+    "Watermark" : "Vannmerke",
+    "Draw" : "Tegn",
     "Resize" : "Endre størrelse",
+    "Invalid image." : "Ugyldig bilde.",
+    "Original" : "Original",
+    "Custom" : "Egendefinert",
+    "Value" : "Verdi",
     "Image" : "Bilde",
+    "Importing …" : "Importerer…",
+    "+ Add image" : "+ Legg til bilde",
+    "Line" : "Linje",
+    "Rotate" : "Roter",
+    "Text" : "Tekst",
+    "Font family" : "Font-familie",
+    "Size" : "Størrelse",
+    "+ Add watermark" : "+ Legg til vannmerke",
     "Choose watermark type" : "Velg vannmerke-type",
+    "Upload watermark" : "Last opp vannmerke",
+    "Add as text" : "Legg til som tekst",
+    "Shadow" : "Skygge",
     "Horizontal" : "Horisontal",
+    "Vertical" : "Vertikal",
+    "Opacity" : "Gjennomsiktighet",
     "Position" : "Posisjon",
-    "Name is required." : "Navn er påkrevd."
+    "Save image as" : "Lagre bilde som",
+    "Extension" : "Filetternavn",
+    "Name is required." : "Navn er påkrevd.",
+    "Quality" : "Kvalitet"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/nl.js b/l10n/nl.js
index 3d999adb3..78534b435 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Tags" : "Tags",
     "Maps" : "Kaarten",
     "Settings" : "Instellingen",
+    "Unsaved changes" : "Niet opgeslagen veranderingen",
     "Edit" : "Bewerk",
     "Loading …" : "Laden …",
     "Cancel" : "Annuleren",
@@ -20,6 +21,7 @@ OC.L10N.register(
     "Favorite" : "Favoriet",
     "Unarchive" : "Terugzetten uit archief",
     "View in folder" : "Bekijken in map",
+    "Share" : "Delen",
     "Copy public link" : "Kopieer openbare link",
     "Public link" : "Openbare Link",
     "Back" : "Terug",
@@ -34,9 +36,23 @@ OC.L10N.register(
     "Update" : "Update",
     "Refresh" : "Verversen",
     "Share folder" : "Map delen",
+    "Reset" : "Herstellen",
+    "Continue" : "Doorgaan",
     "Undo" : "Ongedaan maken",
+    "Redo" : "Opnieuw doen",
+    "Zoom in" : "Zoom in",
+    "Draw" : "Teken",
+    "Original" : "Origineel",
+    "Custom" : "Maatwerk",
+    "Un-flip X" : "Ontspiegelen X",
+    "Value" : "Waarden",
     "Image" : "Afbeelding",
+    "Line" : "Lijn",
+    "Text" : "Tekst",
+    "Size" : "Omvang",
     "Position" : "Positie",
-    "Name is required." : "Naam is verplicht."
+    "Extension" : "Extensie",
+    "Name is required." : "Naam is verplicht.",
+    "Quality" : "Kwaliteit"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/nl.json b/l10n/nl.json
index fefe81a8e..13d9086d1 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -10,6 +10,7 @@
     "Tags" : "Tags",
     "Maps" : "Kaarten",
     "Settings" : "Instellingen",
+    "Unsaved changes" : "Niet opgeslagen veranderingen",
     "Edit" : "Bewerk",
     "Loading …" : "Laden …",
     "Cancel" : "Annuleren",
@@ -18,6 +19,7 @@
     "Favorite" : "Favoriet",
     "Unarchive" : "Terugzetten uit archief",
     "View in folder" : "Bekijken in map",
+    "Share" : "Delen",
     "Copy public link" : "Kopieer openbare link",
     "Public link" : "Openbare Link",
     "Back" : "Terug",
@@ -32,9 +34,23 @@
     "Update" : "Update",
     "Refresh" : "Verversen",
     "Share folder" : "Map delen",
+    "Reset" : "Herstellen",
+    "Continue" : "Doorgaan",
     "Undo" : "Ongedaan maken",
+    "Redo" : "Opnieuw doen",
+    "Zoom in" : "Zoom in",
+    "Draw" : "Teken",
+    "Original" : "Origineel",
+    "Custom" : "Maatwerk",
+    "Un-flip X" : "Ontspiegelen X",
+    "Value" : "Waarden",
     "Image" : "Afbeelding",
+    "Line" : "Lijn",
+    "Text" : "Tekst",
+    "Size" : "Omvang",
     "Position" : "Positie",
-    "Name is required." : "Naam is verplicht."
+    "Extension" : "Extensie",
+    "Name is required." : "Naam is verplicht.",
+    "Quality" : "Kwaliteit"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/nn_NO.js b/l10n/nn_NO.js
index f36e7f14d..ef9a60123 100644
--- a/l10n/nn_NO.js
+++ b/l10n/nn_NO.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Delete" : "Slett",
     "Download" : "Last ned",
     "Favorite" : "Favoritt",
+    "Share" : "Del",
     "Back" : "Tilbake",
     "Save" : "Lagre",
     "Year" : "År",
@@ -19,6 +20,9 @@ OC.L10N.register(
     "Minute" : "Minutt",
     "Name" : "Namn",
     "Update" : "Oppdater",
-    "Refresh" : "Last inn på nytt"
+    "Refresh" : "Last inn på nytt",
+    "Continue" : "Gå vidare",
+    "Value" : "Verdi",
+    "Size" : "Storleik"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/nn_NO.json b/l10n/nn_NO.json
index 9b8cb81bf..a2c312f5c 100644
--- a/l10n/nn_NO.json
+++ b/l10n/nn_NO.json
@@ -8,6 +8,7 @@
     "Delete" : "Slett",
     "Download" : "Last ned",
     "Favorite" : "Favoritt",
+    "Share" : "Del",
     "Back" : "Tilbake",
     "Save" : "Lagre",
     "Year" : "År",
@@ -17,6 +18,9 @@
     "Minute" : "Minutt",
     "Name" : "Namn",
     "Update" : "Oppdater",
-    "Refresh" : "Last inn på nytt"
+    "Refresh" : "Last inn på nytt",
+    "Continue" : "Gå vidare",
+    "Value" : "Verdi",
+    "Size" : "Storleik"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/oc.js b/l10n/oc.js
index dcaa020ee..7dc87283d 100644
--- a/l10n/oc.js
+++ b/l10n/oc.js
@@ -9,12 +9,14 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Paramètres",
+    "Unsaved changes" : "Modificacions pas enregistradas",
     "Edit" : "Modificar",
     "Loading …" : "Cargament…",
     "Cancel" : "Anullar",
     "Delete" : "Suprimir",
     "Download" : "Telecargar",
     "Favorite" : "Favorit",
+    "Share" : "Partejar",
     "Copy public link" : "Copiar lo ligam public",
     "Public link" : "Ligam public",
     "Back" : "Retorn",
@@ -28,7 +30,17 @@ OC.L10N.register(
     "Name" : "Nom",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Reïnicializar",
+    "Continue" : "Contunhar",
     "Undo" : "Desfar",
-    "Position" : "Posicion"
+    "Redo" : "Refar",
+    "Custom" : "Personalizar",
+    "Portrait" : "Retrach",
+    "Value" : "Valor",
+    "Line" : "Linha",
+    "Text" : "Tèxt",
+    "Size" : "Talha",
+    "Position" : "Posicion",
+    "Extension" : "Extension"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/oc.json b/l10n/oc.json
index 41313f106..fab29d6f7 100644
--- a/l10n/oc.json
+++ b/l10n/oc.json
@@ -7,12 +7,14 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Paramètres",
+    "Unsaved changes" : "Modificacions pas enregistradas",
     "Edit" : "Modificar",
     "Loading …" : "Cargament…",
     "Cancel" : "Anullar",
     "Delete" : "Suprimir",
     "Download" : "Telecargar",
     "Favorite" : "Favorit",
+    "Share" : "Partejar",
     "Copy public link" : "Copiar lo ligam public",
     "Public link" : "Ligam public",
     "Back" : "Retorn",
@@ -26,7 +28,17 @@
     "Name" : "Nom",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Reset" : "Reïnicializar",
+    "Continue" : "Contunhar",
     "Undo" : "Desfar",
-    "Position" : "Posicion"
+    "Redo" : "Refar",
+    "Custom" : "Personalizar",
+    "Portrait" : "Retrach",
+    "Value" : "Valor",
+    "Line" : "Linha",
+    "Text" : "Tèxt",
+    "Size" : "Talha",
+    "Position" : "Posicion",
+    "Extension" : "Extension"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/pl.js b/l10n/pl.js
index 80c9c2168..a718190eb 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -14,6 +14,9 @@ OC.L10N.register(
     "Tags" : "Etykiety",
     "Maps" : "Mapy",
     "Settings" : "Ustawienia",
+    "Error saving image" : "Błąd podczas zapisywania obrazu",
+    "Unsaved changes" : "Niezapisane zmiany",
+    "Drop changes" : "Odrzuć zmiany",
     "Edit" : "Edytuj",
     "Loading …" : "Wczytywanie…",
     "Cancel" : "Anuluj",
@@ -31,6 +34,7 @@ OC.L10N.register(
     "Timeline Path" : "Ścieżka osi czasu",
     "Show hidden folders" : "Pokaż ukryte katalogi",
     "Failed to load some photos" : "Nie udało się załadować niektórych zdjęć",
+    "Share" : "Udostępnij",
     "Sidebar" : "Pasek boczny",
     "Search for collaborators" : "Szukaj współpracowników",
     "Search people or groups" : "Wyszukaj osoby lub grupy",
@@ -81,25 +85,90 @@ OC.L10N.register(
     "Delete album" : "Usuń album",
     "Merge with different person" : "Połącz z inną osobą",
     "Share folder" : "Udostępnij katalog",
+    "Save as" : "Zapisz jako",
+    "Reset" : "Resetuj",
+    "All changes will be lost." : "Wszystkie zmiany zostaną utracone.",
     "Are you sure you want to continue?" : "Jesteś pewien, że chcesz kontynuować?",
+    "Continue" : "Kontynuuj",
     "Undo" : "Cofnij",
+    "Redo" : "Powtórz",
     "Show original image" : "Pokaż oryginalny obraz",
+    "Zoom in" : "Powiększ",
     "Zoom out" : "Pomniejsz",
     "Toggle zoom menu" : "Przełącz menu powiększania",
+    "Adjust" : "Dostosuj",
+    "Fine-tune" : "Dostrój",
+    "Filters" : "Filtry",
+    "Watermark" : "Znak wodny",
+    "Draw" : "Rysuj",
     "Resize" : "Zmień rozmiar",
+    "Invalid image." : "Nieprawidłowy obraz.",
+    "Error while uploading the image." : "Błąd podczas wysyłania obrazu.",
+    "are not images" : "nie są obrazami",
     "is not an image" : "nie jest obrazem",
+    "to be uploaded" : "do wysłania",
+    "Crop" : "Przytnij",
+    "Original" : "Oryginalny",
+    "Custom" : "Dowolnie",
+    "Square" : "Kwadrat",
+    "Landscape" : "Krajobraz",
+    "Portrait" : "Portret",
     "Ellipse" : "Elipsa",
+    "Classic TV" : "Klasyczna TV",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Strzałka",
+    "Blur" : "Plama",
+    "Brightness" : "Jasność",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Odwróć z powrotem X",
+    "Flip X" : "Odwróć X",
+    "Un-flip Y" : "Odwróć z powrotem Y",
+    "Flip Y" : "Odwróć Y",
+    "HSV" : "HSV",
     "Hue" : "Odcień",
+    "Saturation" : "Nasycenie",
+    "Value" : "Wartość",
     "Image" : "Obraz",
+    "Importing …" : "Importowanie…",
+    "+ Add image" : "+ Dodaj obraz",
+    "Line" : "Linia",
+    "Pen" : "Długopis",
+    "Polygon" : "Wielokąt",
+    "Sides" : "Krawędzie",
     "Rectangle" : "Prostokąt",
     "Corner Radius" : "Promień narożnika",
+    "Width in pixels" : "Szerokość w pikselach",
+    "Height in pixels" : "Wysokość w pikselach",
+    "Toggle ratio lock" : "Przełącz blokadę proporcji",
     "Reset to original image size" : "Przywróć oryginalny rozmiar obrazu",
+    "Rotate" : "Obróć",
+    "Text" : "Tekst",
+    "Text spacing" : "Odstępy tekstu",
+    "Text alignment" : "Wyrównanie tekstu",
+    "Font family" : "Rodzina czcionek",
+    "Size" : "Wzrost",
+    "Letter spacing" : "Odstępy między literami",
+    "Line height" : "Wysokość linii",
+    "Warmth" : "Ciepły",
+    "+ Add watermark" : "+ Dodaj znak wodny",
     "Choose watermark type" : "Wybierz typ znaku wodnego",
+    "Upload watermark" : "Wyślij znak wodny",
+    "Add as text" : "Dodaj jako tekst",
+    "Padding" : "Wypełnienie",
+    "Shadow" : "Cień",
     "Horizontal" : "Poziomo",
+    "Vertical" : "Pionowo",
+    "Opacity" : "Nieprzezroczysty",
     "Position" : "Stanowisko",
+    "Stroke" : "Pociągnięcie",
+    "Save image as" : "Zapisz obraz jako",
+    "Extension" : "Rozszerzenie",
     "Name is required." : "Nazwa jest wymagana.",
+    "Quality" : "Jakość",
     "Saved image size (width x height)" : "Rozmiar zapisanego obrazu (szerokość x wysokość)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Zwróć uwagę, że wybrany obszar kadrowania jest mniejszy niż zastosowana zmiana rozmiaru, co może spowodować spadek jakości",
     "Actual size (100%)" : "Rzeczywisty rozmiar (100%)",
+    "Fit size" : "Dopasuj rozmiar",
     "Failed to create {albumName}." : "Nie udało się utworzyć {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nie udało się zmienić nazwy {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Ogólna awaria",
diff --git a/l10n/pl.json b/l10n/pl.json
index f26118b08..47ca4abc5 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -12,6 +12,9 @@
     "Tags" : "Etykiety",
     "Maps" : "Mapy",
     "Settings" : "Ustawienia",
+    "Error saving image" : "Błąd podczas zapisywania obrazu",
+    "Unsaved changes" : "Niezapisane zmiany",
+    "Drop changes" : "Odrzuć zmiany",
     "Edit" : "Edytuj",
     "Loading …" : "Wczytywanie…",
     "Cancel" : "Anuluj",
@@ -29,6 +32,7 @@
     "Timeline Path" : "Ścieżka osi czasu",
     "Show hidden folders" : "Pokaż ukryte katalogi",
     "Failed to load some photos" : "Nie udało się załadować niektórych zdjęć",
+    "Share" : "Udostępnij",
     "Sidebar" : "Pasek boczny",
     "Search for collaborators" : "Szukaj współpracowników",
     "Search people or groups" : "Wyszukaj osoby lub grupy",
@@ -79,25 +83,90 @@
     "Delete album" : "Usuń album",
     "Merge with different person" : "Połącz z inną osobą",
     "Share folder" : "Udostępnij katalog",
+    "Save as" : "Zapisz jako",
+    "Reset" : "Resetuj",
+    "All changes will be lost." : "Wszystkie zmiany zostaną utracone.",
     "Are you sure you want to continue?" : "Jesteś pewien, że chcesz kontynuować?",
+    "Continue" : "Kontynuuj",
     "Undo" : "Cofnij",
+    "Redo" : "Powtórz",
     "Show original image" : "Pokaż oryginalny obraz",
+    "Zoom in" : "Powiększ",
     "Zoom out" : "Pomniejsz",
     "Toggle zoom menu" : "Przełącz menu powiększania",
+    "Adjust" : "Dostosuj",
+    "Fine-tune" : "Dostrój",
+    "Filters" : "Filtry",
+    "Watermark" : "Znak wodny",
+    "Draw" : "Rysuj",
     "Resize" : "Zmień rozmiar",
+    "Invalid image." : "Nieprawidłowy obraz.",
+    "Error while uploading the image." : "Błąd podczas wysyłania obrazu.",
+    "are not images" : "nie są obrazami",
     "is not an image" : "nie jest obrazem",
+    "to be uploaded" : "do wysłania",
+    "Crop" : "Przytnij",
+    "Original" : "Oryginalny",
+    "Custom" : "Dowolnie",
+    "Square" : "Kwadrat",
+    "Landscape" : "Krajobraz",
+    "Portrait" : "Portret",
     "Ellipse" : "Elipsa",
+    "Classic TV" : "Klasyczna TV",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Strzałka",
+    "Blur" : "Plama",
+    "Brightness" : "Jasność",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Odwróć z powrotem X",
+    "Flip X" : "Odwróć X",
+    "Un-flip Y" : "Odwróć z powrotem Y",
+    "Flip Y" : "Odwróć Y",
+    "HSV" : "HSV",
     "Hue" : "Odcień",
+    "Saturation" : "Nasycenie",
+    "Value" : "Wartość",
     "Image" : "Obraz",
+    "Importing …" : "Importowanie…",
+    "+ Add image" : "+ Dodaj obraz",
+    "Line" : "Linia",
+    "Pen" : "Długopis",
+    "Polygon" : "Wielokąt",
+    "Sides" : "Krawędzie",
     "Rectangle" : "Prostokąt",
     "Corner Radius" : "Promień narożnika",
+    "Width in pixels" : "Szerokość w pikselach",
+    "Height in pixels" : "Wysokość w pikselach",
+    "Toggle ratio lock" : "Przełącz blokadę proporcji",
     "Reset to original image size" : "Przywróć oryginalny rozmiar obrazu",
+    "Rotate" : "Obróć",
+    "Text" : "Tekst",
+    "Text spacing" : "Odstępy tekstu",
+    "Text alignment" : "Wyrównanie tekstu",
+    "Font family" : "Rodzina czcionek",
+    "Size" : "Wzrost",
+    "Letter spacing" : "Odstępy między literami",
+    "Line height" : "Wysokość linii",
+    "Warmth" : "Ciepły",
+    "+ Add watermark" : "+ Dodaj znak wodny",
     "Choose watermark type" : "Wybierz typ znaku wodnego",
+    "Upload watermark" : "Wyślij znak wodny",
+    "Add as text" : "Dodaj jako tekst",
+    "Padding" : "Wypełnienie",
+    "Shadow" : "Cień",
     "Horizontal" : "Poziomo",
+    "Vertical" : "Pionowo",
+    "Opacity" : "Nieprzezroczysty",
     "Position" : "Stanowisko",
+    "Stroke" : "Pociągnięcie",
+    "Save image as" : "Zapisz obraz jako",
+    "Extension" : "Rozszerzenie",
     "Name is required." : "Nazwa jest wymagana.",
+    "Quality" : "Jakość",
     "Saved image size (width x height)" : "Rozmiar zapisanego obrazu (szerokość x wysokość)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Zwróć uwagę, że wybrany obszar kadrowania jest mniejszy niż zastosowana zmiana rozmiaru, co może spowodować spadek jakości",
     "Actual size (100%)" : "Rzeczywisty rozmiar (100%)",
+    "Fit size" : "Dopasuj rozmiar",
     "Failed to create {albumName}." : "Nie udało się utworzyć {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nie udało się zmienić nazwy {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Ogólna awaria",
diff --git a/l10n/ps.js b/l10n/ps.js
index 482e274e8..eca8c661f 100644
--- a/l10n/ps.js
+++ b/l10n/ps.js
@@ -9,7 +9,10 @@ OC.L10N.register(
     "Download" : "ښکته کول",
     "Favorite" : "په نښه شوی",
     "View in folder" : "په فولډر کې کتل",
+    "Share" : "شریکول",
     "Save" : "ساتل",
-    "Name" : "نوم"
+    "Name" : "نوم",
+    "Continue" : "وړاندې تګ",
+    "Size" : "کچه"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ps.json b/l10n/ps.json
index 9c583fd49..3a0f3c883 100644
--- a/l10n/ps.json
+++ b/l10n/ps.json
@@ -7,7 +7,10 @@
     "Download" : "ښکته کول",
     "Favorite" : "په نښه شوی",
     "View in folder" : "په فولډر کې کتل",
+    "Share" : "شریکول",
     "Save" : "ساتل",
-    "Name" : "نوم"
+    "Name" : "نوم",
+    "Continue" : "وړاندې تګ",
+    "Size" : "کچه"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index d737359b8..2ab9ca4fb 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -24,6 +24,9 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Escolha a raiz da sua linha do tempo",
     "The selected folder does not seem to be valid. Try again." : "A pasta selecionada não parece ser válida. Tente novamente.",
     "Found {total} photos in {path}" : "Encontrou {total} fotos em {path}",
+    "Error saving image" : "Erro ao salvar imagem",
+    "Unsaved changes" : "Alterações não salvas",
+    "Drop changes" : "Cancelar mudanças",
     "Edit" : "Editar",
     "Loading …" : "Carregando …",
     "Cancel" : "Cancelar",
@@ -48,6 +51,7 @@ OC.L10N.register(
     "Choose the root for the folders view" : "Escolha a raiz para a visualização de pastas",
     "Your Timeline" : "Sua Linha-do-Tempo",
     "Failed to load some photos" : "Falha ao carregar algumas fotos",
+    "Share" : "Compartilhar",
     "Sidebar" : "Barra Lateral",
     "Processing … {n}/{m}" : "Processando … {n}/{m}",
     "Search for collaborators" : "Pesquisar colaboradores",
@@ -112,25 +116,90 @@ OC.L10N.register(
     "Share folder" : "Compartilhar pasta",
     "Move left" : "Mover para a esquerda",
     "Move right" : "Mover para a direita",
+    "Save as" : "Salvar como",
+    "Reset" : "Redefinir",
+    "All changes will be lost." : "Todas as mudanças serão perdidas.",
     "Are you sure you want to continue?" : "Tem certeza que deseja continuar?",
+    "Continue" : "Continuar",
     "Undo" : "Desfazer",
+    "Redo" : "Refazer",
     "Show original image" : "Mostrar imagem original",
+    "Zoom in" : "Ampliar",
     "Zoom out" : "Diminuir zoom",
     "Toggle zoom menu" : "Habilitar menu de zoom",
+    "Adjust" : "Ajustar",
+    "Fine-tune" : "Sintonia fina",
+    "Filters" : "Filtros",
+    "Watermark" : "Marca d'água",
+    "Draw" : "Desenhar",
     "Resize" : "Redimensionar",
+    "Invalid image." : "Imagem inválida.",
+    "Error while uploading the image." : "Erro ao fazer upload da imagem.",
+    "are not images" : "não são imagens",
     "is not an image" : "não é uma imagem",
+    "to be uploaded" : "para enviar",
+    "Crop" : "Cortar",
+    "Original" : "Original",
+    "Custom" : "Personalizar",
+    "Square" : "Quadrado",
+    "Landscape" : "Paisagem",
+    "Portrait" : "Retrato",
     "Ellipse" : "Elipse",
+    "Classic TV" : "TV Clássica",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Flecha",
+    "Blur" : "Embaçar",
+    "Brightness" : "Brilho",
+    "Contrast" : "Contraste",
+    "Un-flip X" : "Desvirar X",
+    "Flip X" : "Inverter X",
+    "Un-flip Y" : "Desvirar Y",
+    "Flip Y" : "Inverter Y",
+    "HSV" : "HSV",
     "Hue" : "Cor",
+    "Saturation" : "Saturação",
+    "Value" : "Valor",
     "Image" : "Imagem",
+    "Importing …" : "Importing …",
+    "+ Add image" : "+ Adicionar imagem",
+    "Line" : "Linha",
+    "Pen" : "Caneta",
+    "Polygon" : "Polígono",
+    "Sides" : "Lados",
     "Rectangle" : "Retângulo",
     "Corner Radius" : "Raio do canto",
+    "Width in pixels" : "Comprimento em pixels",
+    "Height in pixels" : "Altura em pixels",
+    "Toggle ratio lock" : "Habilitar trava de razão",
     "Reset to original image size" : "Voltar ao tamanho original",
+    "Rotate" : "Rotação",
+    "Text" : "Texto",
+    "Text spacing" : "Espaçamento do texto",
+    "Text alignment" : "Alinhamento de texto",
+    "Font family" : "Família da fonte",
+    "Size" : "Tamanho",
+    "Letter spacing" : "Espaçamento entre letras",
+    "Line height" : "Altura da linha",
+    "Warmth" : "Temperatura",
+    "+ Add watermark" : "+ Adicionar marca d'água",
     "Choose watermark type" : "Escolha o tipo de marca d'água",
+    "Upload watermark" : "Enviar marca d'água",
+    "Add as text" : "Adicionar como texto",
+    "Padding" : "Preenchimento",
+    "Shadow" : "Sombra",
     "Horizontal" : "Horizontal",
+    "Vertical" : "Vertical",
+    "Opacity" : "Opacidade",
     "Position" : "Posição",
+    "Stroke" : "Derrame",
+    "Save image as" : "Salvar imagem como",
+    "Extension" : "Extensão",
     "Name is required." : "O nome é obrigatório.",
+    "Quality" : "Qualidade",
     "Saved image size (width x height)" : "Imagem salva (largura x altura)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Observe que a área de corte selecionada é menor que o redimensionamento aplicado, o que pode causar diminuição da qualidade",
     "Actual size (100%)" : "Tamanho real (100%)",
+    "Fit size" : "Encaixar tamanho",
     "Failed to create {albumName}." : "Falha ao criar {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Falha ao renomear {currentAlbumName} para {newAlbumName}.",
     "General Failure" : "Falha Geral",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index ade21a1c4..bf961366b 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -22,6 +22,9 @@
     "Choose the root of your timeline" : "Escolha a raiz da sua linha do tempo",
     "The selected folder does not seem to be valid. Try again." : "A pasta selecionada não parece ser válida. Tente novamente.",
     "Found {total} photos in {path}" : "Encontrou {total} fotos em {path}",
+    "Error saving image" : "Erro ao salvar imagem",
+    "Unsaved changes" : "Alterações não salvas",
+    "Drop changes" : "Cancelar mudanças",
     "Edit" : "Editar",
     "Loading …" : "Carregando …",
     "Cancel" : "Cancelar",
@@ -46,6 +49,7 @@
     "Choose the root for the folders view" : "Escolha a raiz para a visualização de pastas",
     "Your Timeline" : "Sua Linha-do-Tempo",
     "Failed to load some photos" : "Falha ao carregar algumas fotos",
+    "Share" : "Compartilhar",
     "Sidebar" : "Barra Lateral",
     "Processing … {n}/{m}" : "Processando … {n}/{m}",
     "Search for collaborators" : "Pesquisar colaboradores",
@@ -110,25 +114,90 @@
     "Share folder" : "Compartilhar pasta",
     "Move left" : "Mover para a esquerda",
     "Move right" : "Mover para a direita",
+    "Save as" : "Salvar como",
+    "Reset" : "Redefinir",
+    "All changes will be lost." : "Todas as mudanças serão perdidas.",
     "Are you sure you want to continue?" : "Tem certeza que deseja continuar?",
+    "Continue" : "Continuar",
     "Undo" : "Desfazer",
+    "Redo" : "Refazer",
     "Show original image" : "Mostrar imagem original",
+    "Zoom in" : "Ampliar",
     "Zoom out" : "Diminuir zoom",
     "Toggle zoom menu" : "Habilitar menu de zoom",
+    "Adjust" : "Ajustar",
+    "Fine-tune" : "Sintonia fina",
+    "Filters" : "Filtros",
+    "Watermark" : "Marca d'água",
+    "Draw" : "Desenhar",
     "Resize" : "Redimensionar",
+    "Invalid image." : "Imagem inválida.",
+    "Error while uploading the image." : "Erro ao fazer upload da imagem.",
+    "are not images" : "não são imagens",
     "is not an image" : "não é uma imagem",
+    "to be uploaded" : "para enviar",
+    "Crop" : "Cortar",
+    "Original" : "Original",
+    "Custom" : "Personalizar",
+    "Square" : "Quadrado",
+    "Landscape" : "Paisagem",
+    "Portrait" : "Retrato",
     "Ellipse" : "Elipse",
+    "Classic TV" : "TV Clássica",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Flecha",
+    "Blur" : "Embaçar",
+    "Brightness" : "Brilho",
+    "Contrast" : "Contraste",
+    "Un-flip X" : "Desvirar X",
+    "Flip X" : "Inverter X",
+    "Un-flip Y" : "Desvirar Y",
+    "Flip Y" : "Inverter Y",
+    "HSV" : "HSV",
     "Hue" : "Cor",
+    "Saturation" : "Saturação",
+    "Value" : "Valor",
     "Image" : "Imagem",
+    "Importing …" : "Importing …",
+    "+ Add image" : "+ Adicionar imagem",
+    "Line" : "Linha",
+    "Pen" : "Caneta",
+    "Polygon" : "Polígono",
+    "Sides" : "Lados",
     "Rectangle" : "Retângulo",
     "Corner Radius" : "Raio do canto",
+    "Width in pixels" : "Comprimento em pixels",
+    "Height in pixels" : "Altura em pixels",
+    "Toggle ratio lock" : "Habilitar trava de razão",
     "Reset to original image size" : "Voltar ao tamanho original",
+    "Rotate" : "Rotação",
+    "Text" : "Texto",
+    "Text spacing" : "Espaçamento do texto",
+    "Text alignment" : "Alinhamento de texto",
+    "Font family" : "Família da fonte",
+    "Size" : "Tamanho",
+    "Letter spacing" : "Espaçamento entre letras",
+    "Line height" : "Altura da linha",
+    "Warmth" : "Temperatura",
+    "+ Add watermark" : "+ Adicionar marca d'água",
     "Choose watermark type" : "Escolha o tipo de marca d'água",
+    "Upload watermark" : "Enviar marca d'água",
+    "Add as text" : "Adicionar como texto",
+    "Padding" : "Preenchimento",
+    "Shadow" : "Sombra",
     "Horizontal" : "Horizontal",
+    "Vertical" : "Vertical",
+    "Opacity" : "Opacidade",
     "Position" : "Posição",
+    "Stroke" : "Derrame",
+    "Save image as" : "Salvar imagem como",
+    "Extension" : "Extensão",
     "Name is required." : "O nome é obrigatório.",
+    "Quality" : "Qualidade",
     "Saved image size (width x height)" : "Imagem salva (largura x altura)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Observe que a área de corte selecionada é menor que o redimensionamento aplicado, o que pode causar diminuição da qualidade",
     "Actual size (100%)" : "Tamanho real (100%)",
+    "Fit size" : "Encaixar tamanho",
     "Failed to create {albumName}." : "Falha ao criar {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Falha ao renomear {currentAlbumName} para {newAlbumName}.",
     "General Failure" : "Falha Geral",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 0c36d6ef1..3b8c36050 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Definições",
+    "Unsaved changes" : "Modificações não guardadas",
     "Edit" : "Editar",
     "Loading …" : "A carregar...",
     "Cancel" : "Cancelar",
@@ -23,6 +24,7 @@ OC.L10N.register(
     "Timeline Path" : "Caminho da Cronologia",
     "Show hidden folders" : "Mostrar pastas ocultas",
     "Failed to load some photos" : "Não foi possível carregar algumas fotografias",
+    "Share" : "Partilhar",
     "Copy public link" : "Copiar ligação publica",
     "Public link" : "Hiperligação Pública",
     "Back" : "Anterior",
@@ -35,9 +37,18 @@ OC.L10N.register(
     "Update" : "Atualizar",
     "Refresh" : "Atualizar",
     "Share folder" : "Partilhar pasta",
+    "Reset" : "Reiniciar",
+    "Continue" : "Continuar",
     "Undo" : "Desfazer",
+    "Redo" : "Repetir",
+    "Original" : "Original",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
     "Image" : "Imagem",
+    "Text" : "Texto",
+    "Size" : "Altura",
     "Name is required." : "Nome é obrigatório.",
+    "Quality" : "Qualidade",
     "Failed to delete files." : "Não foi possível eliminar os ficheiros.",
     "Failed to delete {fileName}." : "Não foi possível eliminar {fileName}.",
     "Failed to favorite files." : "Não foi possível colocar os ficheiros nos favoritos.",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index 6fbbf7162..37fc45a4c 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -9,6 +9,7 @@
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
     "Settings" : "Definições",
+    "Unsaved changes" : "Modificações não guardadas",
     "Edit" : "Editar",
     "Loading …" : "A carregar...",
     "Cancel" : "Cancelar",
@@ -21,6 +22,7 @@
     "Timeline Path" : "Caminho da Cronologia",
     "Show hidden folders" : "Mostrar pastas ocultas",
     "Failed to load some photos" : "Não foi possível carregar algumas fotografias",
+    "Share" : "Partilhar",
     "Copy public link" : "Copiar ligação publica",
     "Public link" : "Hiperligação Pública",
     "Back" : "Anterior",
@@ -33,9 +35,18 @@
     "Update" : "Atualizar",
     "Refresh" : "Atualizar",
     "Share folder" : "Partilhar pasta",
+    "Reset" : "Reiniciar",
+    "Continue" : "Continuar",
     "Undo" : "Desfazer",
+    "Redo" : "Repetir",
+    "Original" : "Original",
+    "Custom" : "Personalizado",
+    "Value" : "Valor",
     "Image" : "Imagem",
+    "Text" : "Texto",
+    "Size" : "Altura",
     "Name is required." : "Nome é obrigatório.",
+    "Quality" : "Qualidade",
     "Failed to delete files." : "Não foi possível eliminar os ficheiros.",
     "Failed to delete {fileName}." : "Não foi possível eliminar {fileName}.",
     "Failed to favorite files." : "Não foi possível colocar os ficheiros nos favoritos.",
diff --git a/l10n/ro.js b/l10n/ro.js
index 5370645a6..fc13fff64 100644
--- a/l10n/ro.js
+++ b/l10n/ro.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Tags" : "Etichete",
     "Maps" : "Hărți",
     "Settings" : "Setări",
+    "Unsaved changes" : "Modificări nesalvate",
     "Edit" : "Editează",
     "Loading …" : "Se încarcă…",
     "Cancel" : "Anulare",
@@ -15,6 +16,7 @@ OC.L10N.register(
     "Download" : "Descărcare",
     "Favorite" : "Favorite",
     "View in folder" : "Vizualizează în director",
+    "Share" : "Partajează",
     "Copy public link" : "Copiză link-ul public",
     "Public link" : "Link public",
     "Back" : "Înapoi",
@@ -28,7 +30,11 @@ OC.L10N.register(
     "Refresh" : "Reîmprospătează",
     "Share folder" : "Distribuie dosar",
     "Reset" : "Resetare",
+    "Continue" : "Continuă",
     "Undo" : "Anulează ultima acțiune",
+    "Custom" : "Particularizat",
+    "Text" : "Text",
+    "Size" : "Mărime",
     "Position" : "Poziție"
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/l10n/ro.json b/l10n/ro.json
index cb5bc5204..cc83670db 100644
--- a/l10n/ro.json
+++ b/l10n/ro.json
@@ -6,6 +6,7 @@
     "Tags" : "Etichete",
     "Maps" : "Hărți",
     "Settings" : "Setări",
+    "Unsaved changes" : "Modificări nesalvate",
     "Edit" : "Editează",
     "Loading …" : "Se încarcă…",
     "Cancel" : "Anulare",
@@ -13,6 +14,7 @@
     "Download" : "Descărcare",
     "Favorite" : "Favorite",
     "View in folder" : "Vizualizează în director",
+    "Share" : "Partajează",
     "Copy public link" : "Copiză link-ul public",
     "Public link" : "Link public",
     "Back" : "Înapoi",
@@ -26,7 +28,11 @@
     "Refresh" : "Reîmprospătează",
     "Share folder" : "Distribuie dosar",
     "Reset" : "Resetare",
+    "Continue" : "Continuă",
     "Undo" : "Anulează ultima acțiune",
+    "Custom" : "Particularizat",
+    "Text" : "Text",
+    "Size" : "Mărime",
     "Position" : "Poziție"
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
 }
\ No newline at end of file
diff --git a/l10n/ru.js b/l10n/ru.js
index acb5278a1..9fffef910 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -14,6 +14,9 @@ OC.L10N.register(
     "Tags" : "Метки",
     "Maps" : "Карты",
     "Settings" : "Настройки",
+    "Error saving image" : "Не удалось сохранить изображение",
+    "Unsaved changes" : "Несохранённые изменения",
+    "Drop changes" : "Отменить изменения",
     "Edit" : "Редактировать",
     "Loading …" : "Загрузка …",
     "Cancel" : "Отменить",
@@ -27,6 +30,7 @@ OC.L10N.register(
     "Timeline Path" : "Расположение",
     "Show hidden folders" : "Показывать скрытые файлы",
     "Failed to load some photos" : "Не удалось загрузить некоторые фотографии",
+    "Share" : "Поделиться",
     "Sidebar" : "Боковая панель",
     "Copy public link" : "Скопировать общедоступную ссылку",
     "Public link" : "Общедоступная ссылка",
@@ -42,15 +46,36 @@ OC.L10N.register(
     "Update" : "Обновить",
     "Refresh" : "Обновить",
     "Share folder" : "Поделиться папкой",
+    "Save as" : "Сохранить как",
     "Reset" : "Сброс",
+    "All changes will be lost." : "Изменения не будут сохранены.",
     "Are you sure you want to continue?" : "Продолжить?",
+    "Continue" : "Продолжить",
     "Undo" : "Отменить",
+    "Redo" : "Повторить",
     "Show original image" : "Показать исходное изображение",
+    "Zoom in" : "Приблизить",
     "Zoom out" : "Отдалить",
+    "Watermark" : "Водяной знак",
+    "Invalid image." : "Неверный формат изображения.",
+    "Error while uploading the image." : "Не удалось передать изображение на сервер.",
+    "Crop" : "Обрезать",
+    "Original" : "Исходное",
+    "Custom" : "Свои параметры",
+    "Landscape" : "Ландшафт",
+    "Portrait" : "Портрет",
+    "HSV" : "HSV (Тон, насыщенность, значение)",
     "Hue" : "Тон",
+    "Saturation" : "Насыщенность",
+    "Value" : "Значение",
     "Image" : "Изображение",
+    "Line" : "Линия",
+    "Text" : "Текст",
+    "Size" : "Размер",
     "Position" : "Должность",
+    "Extension" : "Расширение",
     "Name is required." : "Необходимо указать имя.",
+    "Quality" : "Качество",
     "Failed to delete files." : "Ошибка удаления файлов.",
     "Failed to delete {fileName}." : "Ошибка удаления файла «{fileName}».",
     "Failed to favorite files." : "Не удалось добавить файлы в избранное.",
diff --git a/l10n/ru.json b/l10n/ru.json
index 6e7c79bb7..b3fb782bb 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -12,6 +12,9 @@
     "Tags" : "Метки",
     "Maps" : "Карты",
     "Settings" : "Настройки",
+    "Error saving image" : "Не удалось сохранить изображение",
+    "Unsaved changes" : "Несохранённые изменения",
+    "Drop changes" : "Отменить изменения",
     "Edit" : "Редактировать",
     "Loading …" : "Загрузка …",
     "Cancel" : "Отменить",
@@ -25,6 +28,7 @@
     "Timeline Path" : "Расположение",
     "Show hidden folders" : "Показывать скрытые файлы",
     "Failed to load some photos" : "Не удалось загрузить некоторые фотографии",
+    "Share" : "Поделиться",
     "Sidebar" : "Боковая панель",
     "Copy public link" : "Скопировать общедоступную ссылку",
     "Public link" : "Общедоступная ссылка",
@@ -40,15 +44,36 @@
     "Update" : "Обновить",
     "Refresh" : "Обновить",
     "Share folder" : "Поделиться папкой",
+    "Save as" : "Сохранить как",
     "Reset" : "Сброс",
+    "All changes will be lost." : "Изменения не будут сохранены.",
     "Are you sure you want to continue?" : "Продолжить?",
+    "Continue" : "Продолжить",
     "Undo" : "Отменить",
+    "Redo" : "Повторить",
     "Show original image" : "Показать исходное изображение",
+    "Zoom in" : "Приблизить",
     "Zoom out" : "Отдалить",
+    "Watermark" : "Водяной знак",
+    "Invalid image." : "Неверный формат изображения.",
+    "Error while uploading the image." : "Не удалось передать изображение на сервер.",
+    "Crop" : "Обрезать",
+    "Original" : "Исходное",
+    "Custom" : "Свои параметры",
+    "Landscape" : "Ландшафт",
+    "Portrait" : "Портрет",
+    "HSV" : "HSV (Тон, насыщенность, значение)",
     "Hue" : "Тон",
+    "Saturation" : "Насыщенность",
+    "Value" : "Значение",
     "Image" : "Изображение",
+    "Line" : "Линия",
+    "Text" : "Текст",
+    "Size" : "Размер",
     "Position" : "Должность",
+    "Extension" : "Расширение",
     "Name is required." : "Необходимо указать имя.",
+    "Quality" : "Качество",
     "Failed to delete files." : "Ошибка удаления файлов.",
     "Failed to delete {fileName}." : "Ошибка удаления файла «{fileName}».",
     "Failed to favorite files." : "Не удалось добавить файлы в избранное.",
diff --git a/l10n/sc.js b/l10n/sc.js
index e91035891..fd0e10262 100644
--- a/l10n/sc.js
+++ b/l10n/sc.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "Tags" : "Etichetas",
     "Maps" : "Mapas",
     "Settings" : "Impostatziones",
+    "Unsaved changes" : "Mudas non sarvadas",
     "Edit" : "Modìfica",
     "Loading …" : "Carrigamentu …",
     "Cancel" : "Annulla",
@@ -34,9 +35,19 @@ OC.L10N.register(
     "Refresh" : "Agiorna",
     "Share folder" : "Cumpartzi cartella",
     "Reset" : "Torra a impostare",
+    "Continue" : "Sighi",
     "Undo" : "Annulla",
+    "Redo" : "Torra a fàghere",
+    "Zoom in" : "Ammània",
+    "Original" : "Originale",
+    "Custom" : "Personaliza",
+    "Value" : "Balore",
     "Image" : "Imàgine",
+    "Text" : "Testu",
+    "Size" : "Mannària",
     "Position" : "Positzione",
-    "Name is required." : "Su nùmene est rechertu: "
+    "Extension" : "Estensione",
+    "Name is required." : "Su nùmene est rechertu: ",
+    "Quality" : "Calidade"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/sc.json b/l10n/sc.json
index 58a17c6cf..40b0eb5c9 100644
--- a/l10n/sc.json
+++ b/l10n/sc.json
@@ -9,6 +9,7 @@
     "Tags" : "Etichetas",
     "Maps" : "Mapas",
     "Settings" : "Impostatziones",
+    "Unsaved changes" : "Mudas non sarvadas",
     "Edit" : "Modìfica",
     "Loading …" : "Carrigamentu …",
     "Cancel" : "Annulla",
@@ -32,9 +33,19 @@
     "Refresh" : "Agiorna",
     "Share folder" : "Cumpartzi cartella",
     "Reset" : "Torra a impostare",
+    "Continue" : "Sighi",
     "Undo" : "Annulla",
+    "Redo" : "Torra a fàghere",
+    "Zoom in" : "Ammània",
+    "Original" : "Originale",
+    "Custom" : "Personaliza",
+    "Value" : "Balore",
     "Image" : "Imàgine",
+    "Text" : "Testu",
+    "Size" : "Mannària",
     "Position" : "Positzione",
-    "Name is required." : "Su nùmene est rechertu: "
+    "Extension" : "Estensione",
+    "Name is required." : "Su nùmene est rechertu: ",
+    "Quality" : "Calidade"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/si.js b/l10n/si.js
index 8f6e9014a..0cf060573 100644
--- a/l10n/si.js
+++ b/l10n/si.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Time" : "වේලාව",
     "Name" : "නම",
     "Update" : "යාවත්කාල",
-    "Undo" : "පෙරසේ"
+    "Undo" : "පෙරසේ",
+    "Value" : "අගය",
+    "Size" : "ප්‍රමාණය"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/si.json b/l10n/si.json
index 1cbbfe461..4524a5b6e 100644
--- a/l10n/si.json
+++ b/l10n/si.json
@@ -18,6 +18,8 @@
     "Time" : "වේලාව",
     "Name" : "නම",
     "Update" : "යාවත්කාල",
-    "Undo" : "පෙරසේ"
+    "Undo" : "පෙරසේ",
+    "Value" : "අගය",
+    "Size" : "ප්‍රමාණය"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/sk.js b/l10n/sk.js
index 72e40d32d..6eeb6b7f8 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -14,6 +14,9 @@ OC.L10N.register(
     "Tags" : "Štítky",
     "Maps" : "Mapy",
     "Settings" : "Nastavenia",
+    "Error saving image" : "Chyba pri ukladaní obrázku",
+    "Unsaved changes" : "Neuložené zmeny",
+    "Drop changes" : "Zrušiť zmeny",
     "Edit" : "Upraviť",
     "Loading …" : "Načítavam …",
     "Cancel" : "Zrušiť",
@@ -64,6 +67,7 @@ OC.L10N.register(
     "Add collaborators" : "Pridať spolupracujúcich",
     "Save" : "Uložiť",
     "Create album" : "Vytvoriť album",
+    "Add selection to album {albumName}" : "Pridať vybrané do albumu {ablumName}",
     "Create a new album." : "Vytvoriť nový album.",
     "Save collaborators for this album." : "Uložiť spolupracovníkov pre tento album.",
     "Year" : "Rok",
@@ -92,27 +96,90 @@ OC.L10N.register(
     "Delete album" : "Zmazať album",
     "Merge with different person" : "Spojiť s inou osobou",
     "Share folder" : "Zdieľať priečinok",
+    "Save as" : "Uložiť ako",
     "Reset" : "Resetovať",
+    "All changes will be lost." : "Vaše zmeny budú stratené.",
     "Are you sure you want to continue?" : "Naozaj chcete pokračovať?",
+    "Continue" : "Pokračovať",
     "Undo" : "Vrátiť",
+    "Redo" : "Vrátiť",
     "Show original image" : "Zobraziť originálny obrázok",
+    "Zoom in" : "Priblížiť",
     "Zoom out" : "Oddialiť",
     "Toggle zoom menu" : "Prepnúť ponuku priblíženia",
+    "Adjust" : "Prispôsobiť",
+    "Fine-tune" : "Vylepšiť",
+    "Filters" : "Filtre",
+    "Watermark" : "Vodoznak",
+    "Draw" : "Kreslenie",
     "Resize" : "Zmeniť veľkosť",
+    "Invalid image." : "Chybný obrázok.",
+    "Error while uploading the image." : "Chyba pri nahrávaní obrázku",
+    "are not images" : "nie sú obrázky",
     "is not an image" : "nie je obrázok",
+    "to be uploaded" : "bude nahrané",
+    "Crop" : "Orezať",
+    "Original" : "Pôvodné",
+    "Custom" : "Vlastný",
+    "Square" : "Štvorec",
+    "Landscape" : "Na šírku",
+    "Portrait" : "Na výšku",
     "Ellipse" : "Elipsa",
     "Classic TV" : "Klasická TV",
+    "CinemaScope" : "Širokoúhlo",
+    "Arrow" : "Šipka",
+    "Blur" : "Rozmazať",
+    "Brightness" : "Jas",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Vrátiť prevrátenie zvislo",
+    "Flip X" : "Prevrátiť zvislo",
+    "Un-flip Y" : "Vrátiť prevrátenie vodorovne",
+    "Flip Y" : "Prevrátiť vodorovne",
+    "HSV" : "HSV",
     "Hue" : "Odtieň",
+    "Saturation" : "Sýtosť",
+    "Value" : "Hodnota",
     "Image" : "Obrázok",
+    "Importing …" : "Importuje sa ...",
+    "+ Add image" : "+ Pridať obrázok",
+    "Line" : "Čiara",
+    "Pen" : "Pero",
+    "Polygon" : "Mnohouholník",
+    "Sides" : "Strany",
     "Rectangle" : "Odĺžnik",
     "Corner Radius" : "Polomer zaoblenia",
+    "Width in pixels" : "Šírka v pixeloch",
+    "Height in pixels" : "Výška v pixeloch",
+    "Toggle ratio lock" : "Prepnúť zámok pomeru strán",
     "Reset to original image size" : "Vrátiť pôvodnú veľkost obrázku",
+    "Rotate" : "Otočiť",
+    "Text" : "Text",
+    "Text spacing" : "Riadkovanie",
+    "Text alignment" : "Zarovnanie textu",
+    "Font family" : "Typ písma",
+    "Size" : "Veľkosť",
+    "Letter spacing" : "Medzery medzi písmenami",
+    "Line height" : "Hrúbka čiary",
+    "Warmth" : "Teplota",
+    "+ Add watermark" : "+ Pridať vodoznak",
     "Choose watermark type" : "Vyberte typ vodoznaku",
+    "Upload watermark" : "Nahrať vodoznak",
+    "Add as text" : "Pridať ako text",
+    "Padding" : "Okraj",
+    "Shadow" : "Tieň",
     "Horizontal" : "Horizontálne",
+    "Vertical" : "Vertikálne",
+    "Opacity" : "Priehľadnosť",
     "Position" : "Pozícia",
+    "Stroke" : "Potiahnuť",
+    "Save image as" : "Uložiť obrázok ako",
+    "Extension" : "Prípona",
     "Name is required." : "Meno je povinné.",
+    "Quality" : "Kvalita",
     "Saved image size (width x height)" : "Veľkosť uloženého obrázka (šírka x výška)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Upozorňujeme, že vybratá oblasť orezania je menšia ako použitá zmena veľkosti, čo môže spôsobiť zníženie kvality",
     "Actual size (100%)" : "Aktuálna veľkosť (100%)",
+    "Fit size" : "Prispôsobiť veľlkosť",
     "Failed to create {albumName}." : "Zlyhalo vytváranie {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Chyba pri premenovávaní {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Všeobecné zlyhanie",
diff --git a/l10n/sk.json b/l10n/sk.json
index a3f8cacab..164e97c82 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -12,6 +12,9 @@
     "Tags" : "Štítky",
     "Maps" : "Mapy",
     "Settings" : "Nastavenia",
+    "Error saving image" : "Chyba pri ukladaní obrázku",
+    "Unsaved changes" : "Neuložené zmeny",
+    "Drop changes" : "Zrušiť zmeny",
     "Edit" : "Upraviť",
     "Loading …" : "Načítavam …",
     "Cancel" : "Zrušiť",
@@ -62,6 +65,7 @@
     "Add collaborators" : "Pridať spolupracujúcich",
     "Save" : "Uložiť",
     "Create album" : "Vytvoriť album",
+    "Add selection to album {albumName}" : "Pridať vybrané do albumu {ablumName}",
     "Create a new album." : "Vytvoriť nový album.",
     "Save collaborators for this album." : "Uložiť spolupracovníkov pre tento album.",
     "Year" : "Rok",
@@ -90,27 +94,90 @@
     "Delete album" : "Zmazať album",
     "Merge with different person" : "Spojiť s inou osobou",
     "Share folder" : "Zdieľať priečinok",
+    "Save as" : "Uložiť ako",
     "Reset" : "Resetovať",
+    "All changes will be lost." : "Vaše zmeny budú stratené.",
     "Are you sure you want to continue?" : "Naozaj chcete pokračovať?",
+    "Continue" : "Pokračovať",
     "Undo" : "Vrátiť",
+    "Redo" : "Vrátiť",
     "Show original image" : "Zobraziť originálny obrázok",
+    "Zoom in" : "Priblížiť",
     "Zoom out" : "Oddialiť",
     "Toggle zoom menu" : "Prepnúť ponuku priblíženia",
+    "Adjust" : "Prispôsobiť",
+    "Fine-tune" : "Vylepšiť",
+    "Filters" : "Filtre",
+    "Watermark" : "Vodoznak",
+    "Draw" : "Kreslenie",
     "Resize" : "Zmeniť veľkosť",
+    "Invalid image." : "Chybný obrázok.",
+    "Error while uploading the image." : "Chyba pri nahrávaní obrázku",
+    "are not images" : "nie sú obrázky",
     "is not an image" : "nie je obrázok",
+    "to be uploaded" : "bude nahrané",
+    "Crop" : "Orezať",
+    "Original" : "Pôvodné",
+    "Custom" : "Vlastný",
+    "Square" : "Štvorec",
+    "Landscape" : "Na šírku",
+    "Portrait" : "Na výšku",
     "Ellipse" : "Elipsa",
     "Classic TV" : "Klasická TV",
+    "CinemaScope" : "Širokoúhlo",
+    "Arrow" : "Šipka",
+    "Blur" : "Rozmazať",
+    "Brightness" : "Jas",
+    "Contrast" : "Kontrast",
+    "Un-flip X" : "Vrátiť prevrátenie zvislo",
+    "Flip X" : "Prevrátiť zvislo",
+    "Un-flip Y" : "Vrátiť prevrátenie vodorovne",
+    "Flip Y" : "Prevrátiť vodorovne",
+    "HSV" : "HSV",
     "Hue" : "Odtieň",
+    "Saturation" : "Sýtosť",
+    "Value" : "Hodnota",
     "Image" : "Obrázok",
+    "Importing …" : "Importuje sa ...",
+    "+ Add image" : "+ Pridať obrázok",
+    "Line" : "Čiara",
+    "Pen" : "Pero",
+    "Polygon" : "Mnohouholník",
+    "Sides" : "Strany",
     "Rectangle" : "Odĺžnik",
     "Corner Radius" : "Polomer zaoblenia",
+    "Width in pixels" : "Šírka v pixeloch",
+    "Height in pixels" : "Výška v pixeloch",
+    "Toggle ratio lock" : "Prepnúť zámok pomeru strán",
     "Reset to original image size" : "Vrátiť pôvodnú veľkost obrázku",
+    "Rotate" : "Otočiť",
+    "Text" : "Text",
+    "Text spacing" : "Riadkovanie",
+    "Text alignment" : "Zarovnanie textu",
+    "Font family" : "Typ písma",
+    "Size" : "Veľkosť",
+    "Letter spacing" : "Medzery medzi písmenami",
+    "Line height" : "Hrúbka čiary",
+    "Warmth" : "Teplota",
+    "+ Add watermark" : "+ Pridať vodoznak",
     "Choose watermark type" : "Vyberte typ vodoznaku",
+    "Upload watermark" : "Nahrať vodoznak",
+    "Add as text" : "Pridať ako text",
+    "Padding" : "Okraj",
+    "Shadow" : "Tieň",
     "Horizontal" : "Horizontálne",
+    "Vertical" : "Vertikálne",
+    "Opacity" : "Priehľadnosť",
     "Position" : "Pozícia",
+    "Stroke" : "Potiahnuť",
+    "Save image as" : "Uložiť obrázok ako",
+    "Extension" : "Prípona",
     "Name is required." : "Meno je povinné.",
+    "Quality" : "Kvalita",
     "Saved image size (width x height)" : "Veľkosť uloženého obrázka (šírka x výška)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Upozorňujeme, že vybratá oblasť orezania je menšia ako použitá zmena veľkosti, čo môže spôsobiť zníženie kvality",
     "Actual size (100%)" : "Aktuálna veľkosť (100%)",
+    "Fit size" : "Prispôsobiť veľlkosť",
     "Failed to create {albumName}." : "Zlyhalo vytváranie {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Chyba pri premenovávaní {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Všeobecné zlyhanie",
diff --git a/l10n/sl.js b/l10n/sl.js
index 3fa79e685..6ffe532db 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Tags" : "Oznake",
     "Maps" : "Zemljevidi",
     "Settings" : "Nastavitve",
+    "Unsaved changes" : "Neshranjene spremembe",
     "Edit" : "Uredi",
     "Loading …" : "Poteka nalaganje …",
     "Cancel" : "Prekliči",
@@ -40,9 +41,23 @@ OC.L10N.register(
     "Refresh" : "Osveži",
     "Share folder" : "Omogoči souporabo mape",
     "Reset" : "Ponastavi",
+    "Continue" : "Nadaljuj",
     "Undo" : "Razveljavi",
+    "Redo" : "Ponovno uveljavi",
+    "Zoom in" : "Približaj",
+    "Draw" : "Risba",
+    "Original" : "Izvorno",
+    "Custom" : "Po meri",
+    "Landscape" : "Pokrajina",
+    "Portrait" : "Portret",
+    "Value" : "Vrednost",
     "Image" : "Slika",
+    "Line" : "Črtni diagram",
+    "Text" : "Besedilo",
+    "Size" : "Višina",
     "Position" : "Položaj",
-    "Name is required." : "Ime mora biti vpisano."
+    "Extension" : "Pripona",
+    "Name is required." : "Ime mora biti vpisano.",
+    "Quality" : "Kakovost"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/l10n/sl.json b/l10n/sl.json
index 3a72b4505..c40368b81 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -10,6 +10,7 @@
     "Tags" : "Oznake",
     "Maps" : "Zemljevidi",
     "Settings" : "Nastavitve",
+    "Unsaved changes" : "Neshranjene spremembe",
     "Edit" : "Uredi",
     "Loading …" : "Poteka nalaganje …",
     "Cancel" : "Prekliči",
@@ -38,9 +39,23 @@
     "Refresh" : "Osveži",
     "Share folder" : "Omogoči souporabo mape",
     "Reset" : "Ponastavi",
+    "Continue" : "Nadaljuj",
     "Undo" : "Razveljavi",
+    "Redo" : "Ponovno uveljavi",
+    "Zoom in" : "Približaj",
+    "Draw" : "Risba",
+    "Original" : "Izvorno",
+    "Custom" : "Po meri",
+    "Landscape" : "Pokrajina",
+    "Portrait" : "Portret",
+    "Value" : "Vrednost",
     "Image" : "Slika",
+    "Line" : "Črtni diagram",
+    "Text" : "Besedilo",
+    "Size" : "Višina",
     "Position" : "Položaj",
-    "Name is required." : "Ime mora biti vpisano."
+    "Extension" : "Pripona",
+    "Name is required." : "Ime mora biti vpisano.",
+    "Quality" : "Kakovost"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/sq.js b/l10n/sq.js
index 2c0fe7366..afe547efd 100644
--- a/l10n/sq.js
+++ b/l10n/sq.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Tags" : "Etiketat",
     "Maps" : "Harta",
     "Settings" : "Rregullimet",
+    "Unsaved changes" : "Ndryshime të paruajtura",
     "Edit" : "Përpuno",
     "Cancel" : "Anullo",
     "Delete" : "Fshi",
@@ -26,7 +27,13 @@ OC.L10N.register(
     "Update" : "Përditëso",
     "Refresh" : "Rifresko",
     "Reset" : "Rivendos",
+    "Continue" : "Vazhdo",
     "Undo" : "Ktheje pas",
+    "Redo" : "Ribëj",
+    "Custom" : "E përshtatur",
+    "Value" : "Vlerë",
+    "Text" : "Tekst",
+    "Size" : "Madhësi",
     "Position" : "Pozicion",
     "Name is required." : "Emri është i domosdoshëm"
 },
diff --git a/l10n/sq.json b/l10n/sq.json
index d6660dcfe..f757680cc 100644
--- a/l10n/sq.json
+++ b/l10n/sq.json
@@ -6,6 +6,7 @@
     "Tags" : "Etiketat",
     "Maps" : "Harta",
     "Settings" : "Rregullimet",
+    "Unsaved changes" : "Ndryshime të paruajtura",
     "Edit" : "Përpuno",
     "Cancel" : "Anullo",
     "Delete" : "Fshi",
@@ -24,7 +25,13 @@
     "Update" : "Përditëso",
     "Refresh" : "Rifresko",
     "Reset" : "Rivendos",
+    "Continue" : "Vazhdo",
     "Undo" : "Ktheje pas",
+    "Redo" : "Ribëj",
+    "Custom" : "E përshtatur",
+    "Value" : "Vlerë",
+    "Text" : "Tekst",
+    "Size" : "Madhësi",
     "Position" : "Pozicion",
     "Name is required." : "Emri është i domosdoshëm"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/l10n/sr.js b/l10n/sr.js
index 7321d0d51..bc73efc4e 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Tags" : "Ознаке",
     "Maps" : "Мапе",
     "Settings" : "Поставке",
+    "Unsaved changes" : "Несачуване измене",
     "Edit" : "Измени",
     "Loading …" : "Учитавање…",
     "Cancel" : "Поништи",
@@ -33,8 +34,17 @@ OC.L10N.register(
     "Update" : "Ажурирај",
     "Refresh" : "Освежи",
     "Reset" : "Ресетуј",
+    "Continue" : "Настави",
     "Undo" : "Опозови",
+    "Redo" : "Понови",
+    "Zoom in" : "Увеличај",
+    "Original" : "Оригинал",
+    "Custom" : "Прилагођено",
+    "Value" : "Вредност",
     "Image" : "Слика",
-    "Position" : "Позиција"
+    "Text" : "Текст",
+    "Size" : "величина",
+    "Position" : "Позиција",
+    "Extension" : "Екстензија"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/sr.json b/l10n/sr.json
index d5f3b6db3..9b90497e1 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -8,6 +8,7 @@
     "Tags" : "Ознаке",
     "Maps" : "Мапе",
     "Settings" : "Поставке",
+    "Unsaved changes" : "Несачуване измене",
     "Edit" : "Измени",
     "Loading …" : "Учитавање…",
     "Cancel" : "Поништи",
@@ -31,8 +32,17 @@
     "Update" : "Ажурирај",
     "Refresh" : "Освежи",
     "Reset" : "Ресетуј",
+    "Continue" : "Настави",
     "Undo" : "Опозови",
+    "Redo" : "Понови",
+    "Zoom in" : "Увеличај",
+    "Original" : "Оригинал",
+    "Custom" : "Прилагођено",
+    "Value" : "Вредност",
     "Image" : "Слика",
-    "Position" : "Позиција"
+    "Text" : "Текст",
+    "Size" : "величина",
+    "Position" : "Позиција",
+    "Extension" : "Екстензија"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/sv.js b/l10n/sv.js
index 8fc764b8d..764ae4997 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Tags" : "Taggar",
     "Maps" : "Kartor",
     "Settings" : "Inställningar",
+    "Unsaved changes" : "Ej sparade ändringar",
     "Edit" : "Ändra",
     "Loading …" : "Läser in …",
     "Cancel" : "Avbryt",
@@ -53,10 +54,18 @@ OC.L10N.register(
     "Refresh" : "Uppdatera",
     "Share folder" : "Dela mapp",
     "Reset" : "Återställ",
+    "Continue" : "Fortsätt",
     "Undo" : "Ångra",
+    "Redo" : "Gör om",
+    "Original" : "Orginal",
+    "Custom" : "Anpassad",
+    "Value" : "Värde",
     "Image" : "Bild",
     "Line" : "Rad",
+    "Text" : "Text",
+    "Size" : "Storlek",
     "Position" : "Position",
+    "Extension" : "Tillägg",
     "Name is required." : "Namn är obligatoriskt.",
     "Failed to delete files." : "Misslyckades att radera filer.",
     "Failed to delete {fileName}." : "Misslyckades att radera {fileName}.",
diff --git a/l10n/sv.json b/l10n/sv.json
index 5ae2b704a..c7c752f91 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -12,6 +12,7 @@
     "Tags" : "Taggar",
     "Maps" : "Kartor",
     "Settings" : "Inställningar",
+    "Unsaved changes" : "Ej sparade ändringar",
     "Edit" : "Ändra",
     "Loading …" : "Läser in …",
     "Cancel" : "Avbryt",
@@ -51,10 +52,18 @@
     "Refresh" : "Uppdatera",
     "Share folder" : "Dela mapp",
     "Reset" : "Återställ",
+    "Continue" : "Fortsätt",
     "Undo" : "Ångra",
+    "Redo" : "Gör om",
+    "Original" : "Orginal",
+    "Custom" : "Anpassad",
+    "Value" : "Värde",
     "Image" : "Bild",
     "Line" : "Rad",
+    "Text" : "Text",
+    "Size" : "Storlek",
     "Position" : "Position",
+    "Extension" : "Tillägg",
     "Name is required." : "Namn är obligatoriskt.",
     "Failed to delete files." : "Misslyckades att radera filer.",
     "Failed to delete {fileName}." : "Misslyckades att radera {fileName}.",
diff --git a/l10n/ta.js b/l10n/ta.js
index b093bf40b..85696c67d 100644
--- a/l10n/ta.js
+++ b/l10n/ta.js
@@ -15,6 +15,9 @@ OC.L10N.register(
     "Month" : "மாதம்",
     "Name" : "பெயர்",
     "Update" : "இற்றைப்படுத்தல்",
-    "Refresh" : "மீள் ஏற்றுக"
+    "Refresh" : "மீள் ஏற்றுக",
+    "Continue" : "Continue",
+    "Value" : "Value",
+    "Size" : "அளவு"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ta.json b/l10n/ta.json
index e2b76623b..f89bd1017 100644
--- a/l10n/ta.json
+++ b/l10n/ta.json
@@ -13,6 +13,9 @@
     "Month" : "மாதம்",
     "Name" : "பெயர்",
     "Update" : "இற்றைப்படுத்தல்",
-    "Refresh" : "மீள் ஏற்றுக"
+    "Refresh" : "மீள் ஏற்றுக",
+    "Continue" : "Continue",
+    "Value" : "Value",
+    "Size" : "அளவு"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/th.js b/l10n/th.js
index 19a6bea44..15e730aba 100644
--- a/l10n/th.js
+++ b/l10n/th.js
@@ -26,7 +26,11 @@ OC.L10N.register(
     "Refresh" : "รีเฟรช",
     "Share folder" : "แชร์โฟลเดอร์",
     "Reset" : "ตั้งค่าใหม่",
+    "Continue" : "ดำเนินการต่อ",
     "Undo" : "เลิกทำ",
+    "Custom" : "กำหนดเอง",
+    "Text" : "ข้อความ",
+    "Size" : "ขนาด",
     "Position" : "ตำแหน่ง"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/th.json b/l10n/th.json
index 392466640..72b630831 100644
--- a/l10n/th.json
+++ b/l10n/th.json
@@ -24,7 +24,11 @@
     "Refresh" : "รีเฟรช",
     "Share folder" : "แชร์โฟลเดอร์",
     "Reset" : "ตั้งค่าใหม่",
+    "Continue" : "ดำเนินการต่อ",
     "Undo" : "เลิกทำ",
+    "Custom" : "กำหนดเอง",
+    "Text" : "ข้อความ",
+    "Size" : "ขนาด",
     "Position" : "ตำแหน่ง"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/tr.js b/l10n/tr.js
index 08b996b85..69eba9ca0 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -25,6 +25,9 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Zaman tünelinizin kök klasörünü seçin",
     "The selected folder does not seem to be valid. Try again." : "Seçilmiş klasör geçersiz gibi görünüyor. Yeniden deneyin.",
     "Found {total} photos in {path}" : "{path} yolunda {total} fotoğraf bulundu",
+    "Error saving image" : "Görsel kaydedilirken sorun çıktı",
+    "Unsaved changes" : "Kaydedilmemiş değişiklikler",
+    "Drop changes" : "Değişiklikleri yok say",
     "Edit" : "Düzenle",
     "Loading …" : "Yükleniyor…",
     "Cancel" : "İptal",
@@ -127,32 +130,90 @@ OC.L10N.register(
     "Share folder" : "Klasör paylaş",
     "Move left" : "Sola taşı",
     "Move right" : "Sağa taşı",
+    "Save as" : "Farklı kaydet",
     "Reset" : "Sıfırla",
+    "All changes will be lost." : "Tüm değişiklikler kaybolacak.",
     "Are you sure you want to continue?" : "İşlemi sürdürmek istediğinize emin misiniz?",
+    "Continue" : "Sürdür",
     "Undo" : "Geri al",
+    "Redo" : "Yinele",
     "Show original image" : "Özgün görseli görüntüle",
+    "Zoom in" : "Yakınlaştır",
     "Zoom out" : "Uzaklaştır",
     "Toggle zoom menu" : "Yakınlaştırma menüsünü aç/kapat",
+    "Adjust" : "Ayarla",
+    "Fine-tune" : "İnce ayar",
+    "Filters" : "Süzgeçler",
+    "Watermark" : "Filigran",
+    "Draw" : "Çizim",
     "Resize" : "Yeniden boyutlandır",
+    "Invalid image." : "Görsel geçersiz.",
+    "Error while uploading the image." : "Görsel yüklenirken sorun çıktı.",
+    "are not images" : "görsel değil",
     "is not an image" : "bir görsel değil",
+    "to be uploaded" : "yüklenecek",
+    "Crop" : "Kırp",
+    "Original" : "Özgün",
+    "Custom" : "Özel",
     "Square" : "Kare",
+    "Landscape" : "Yatay",
+    "Portrait" : "Dikey",
     "Ellipse" : "Elips",
     "Classic TV" : "Klasik TV",
+    "CinemaScope" : "Sinemaskop",
+    "Arrow" : "Ok",
+    "Blur" : "Bulanıklaştır",
+    "Brightness" : "Parlaklık",
+    "Contrast" : "Karşıtlık",
+    "Un-flip X" : "X ekseninde döndürmeyi geri al",
+    "Flip X" : "X ekseninde döndür",
+    "Un-flip Y" : "Y ekseninde döndürmeyi geri al",
+    "Flip Y" : "Y ekseninde döndür",
+    "HSV" : "HSV",
     "Hue" : "Renk tonu",
+    "Saturation" : "Doygunluk",
+    "Value" : "Değer",
     "Image" : "Görsel",
+    "Importing …" : "İçe aktarılıyor…",
+    "+ Add image" : "+ Görsel ekle",
     "Line" : "Çizgi",
+    "Pen" : "Kalem",
+    "Polygon" : "Çokgen",
+    "Sides" : "Yanlar",
     "Rectangle" : "Dikdörtgen",
     "Corner Radius" : "Köşe yarıçapı",
     "Width in pixels" : "Piksel cinsinden genişlik",
+    "Height in pixels" : "Piksel cinsinden yüksekilk",
+    "Toggle ratio lock" : "En boy oranı kilidini aç/kapat",
     "Reset to original image size" : "Özgün görsel boyutuna sıfırla",
+    "Rotate" : "Çevir",
+    "Text" : "Metin",
+    "Text spacing" : "Metin aralığı",
+    "Text alignment" : "Metin hizalaması",
+    "Font family" : "Yazı tipi ailesi",
+    "Size" : "Boyut",
+    "Letter spacing" : "Harf aralığı",
+    "Line height" : "Satır yüksekliği",
+    "Warmth" : "Sıcaklık",
     "+ Add watermark" : "+ Filigran ekle",
     "Choose watermark type" : "Filigran türünü seçin",
+    "Upload watermark" : "Filigran yükle",
+    "Add as text" : "Metin olarak ekle",
+    "Padding" : "Kenar payı",
     "Shadow" : "Gölge",
     "Horizontal" : "Yatay",
+    "Vertical" : "Dikey",
+    "Opacity" : "Matlık",
     "Position" : "Konum",
+    "Stroke" : "Kalınlık",
+    "Save image as" : "Görseli farklı kaydet",
+    "Extension" : "Uzantı",
     "Name is required." : "Adın yazılması zorunludur.",
+    "Quality" : "Kalite",
     "Saved image size (width x height)" : "Kaydedilmiş görsel boyutu (genişlik x yükseklik)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Seçilmiş kırpma alanı uygulanan yeniden boyutlandırma alanından küçük. Bu durum görsel kalitesinin düşmesine neden olabilir.",
     "Actual size (100%)" : "Gerçek boyut (%100)",
+    "Fit size" : "Boyutu sığdır",
     "Shared Folder" : "Paylaşılmış klasör",
     "Failed to create {albumName}." : "{albumName} albümü oluşturulamadı.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} albümünün adı {newAlbumName} olarak değiştirilemedi.",
diff --git a/l10n/tr.json b/l10n/tr.json
index 787cc4243..d874dad74 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -23,6 +23,9 @@
     "Choose the root of your timeline" : "Zaman tünelinizin kök klasörünü seçin",
     "The selected folder does not seem to be valid. Try again." : "Seçilmiş klasör geçersiz gibi görünüyor. Yeniden deneyin.",
     "Found {total} photos in {path}" : "{path} yolunda {total} fotoğraf bulundu",
+    "Error saving image" : "Görsel kaydedilirken sorun çıktı",
+    "Unsaved changes" : "Kaydedilmemiş değişiklikler",
+    "Drop changes" : "Değişiklikleri yok say",
     "Edit" : "Düzenle",
     "Loading …" : "Yükleniyor…",
     "Cancel" : "İptal",
@@ -125,32 +128,90 @@
     "Share folder" : "Klasör paylaş",
     "Move left" : "Sola taşı",
     "Move right" : "Sağa taşı",
+    "Save as" : "Farklı kaydet",
     "Reset" : "Sıfırla",
+    "All changes will be lost." : "Tüm değişiklikler kaybolacak.",
     "Are you sure you want to continue?" : "İşlemi sürdürmek istediğinize emin misiniz?",
+    "Continue" : "Sürdür",
     "Undo" : "Geri al",
+    "Redo" : "Yinele",
     "Show original image" : "Özgün görseli görüntüle",
+    "Zoom in" : "Yakınlaştır",
     "Zoom out" : "Uzaklaştır",
     "Toggle zoom menu" : "Yakınlaştırma menüsünü aç/kapat",
+    "Adjust" : "Ayarla",
+    "Fine-tune" : "İnce ayar",
+    "Filters" : "Süzgeçler",
+    "Watermark" : "Filigran",
+    "Draw" : "Çizim",
     "Resize" : "Yeniden boyutlandır",
+    "Invalid image." : "Görsel geçersiz.",
+    "Error while uploading the image." : "Görsel yüklenirken sorun çıktı.",
+    "are not images" : "görsel değil",
     "is not an image" : "bir görsel değil",
+    "to be uploaded" : "yüklenecek",
+    "Crop" : "Kırp",
+    "Original" : "Özgün",
+    "Custom" : "Özel",
     "Square" : "Kare",
+    "Landscape" : "Yatay",
+    "Portrait" : "Dikey",
     "Ellipse" : "Elips",
     "Classic TV" : "Klasik TV",
+    "CinemaScope" : "Sinemaskop",
+    "Arrow" : "Ok",
+    "Blur" : "Bulanıklaştır",
+    "Brightness" : "Parlaklık",
+    "Contrast" : "Karşıtlık",
+    "Un-flip X" : "X ekseninde döndürmeyi geri al",
+    "Flip X" : "X ekseninde döndür",
+    "Un-flip Y" : "Y ekseninde döndürmeyi geri al",
+    "Flip Y" : "Y ekseninde döndür",
+    "HSV" : "HSV",
     "Hue" : "Renk tonu",
+    "Saturation" : "Doygunluk",
+    "Value" : "Değer",
     "Image" : "Görsel",
+    "Importing …" : "İçe aktarılıyor…",
+    "+ Add image" : "+ Görsel ekle",
     "Line" : "Çizgi",
+    "Pen" : "Kalem",
+    "Polygon" : "Çokgen",
+    "Sides" : "Yanlar",
     "Rectangle" : "Dikdörtgen",
     "Corner Radius" : "Köşe yarıçapı",
     "Width in pixels" : "Piksel cinsinden genişlik",
+    "Height in pixels" : "Piksel cinsinden yüksekilk",
+    "Toggle ratio lock" : "En boy oranı kilidini aç/kapat",
     "Reset to original image size" : "Özgün görsel boyutuna sıfırla",
+    "Rotate" : "Çevir",
+    "Text" : "Metin",
+    "Text spacing" : "Metin aralığı",
+    "Text alignment" : "Metin hizalaması",
+    "Font family" : "Yazı tipi ailesi",
+    "Size" : "Boyut",
+    "Letter spacing" : "Harf aralığı",
+    "Line height" : "Satır yüksekliği",
+    "Warmth" : "Sıcaklık",
     "+ Add watermark" : "+ Filigran ekle",
     "Choose watermark type" : "Filigran türünü seçin",
+    "Upload watermark" : "Filigran yükle",
+    "Add as text" : "Metin olarak ekle",
+    "Padding" : "Kenar payı",
     "Shadow" : "Gölge",
     "Horizontal" : "Yatay",
+    "Vertical" : "Dikey",
+    "Opacity" : "Matlık",
     "Position" : "Konum",
+    "Stroke" : "Kalınlık",
+    "Save image as" : "Görseli farklı kaydet",
+    "Extension" : "Uzantı",
     "Name is required." : "Adın yazılması zorunludur.",
+    "Quality" : "Kalite",
     "Saved image size (width x height)" : "Kaydedilmiş görsel boyutu (genişlik x yükseklik)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Seçilmiş kırpma alanı uygulanan yeniden boyutlandırma alanından küçük. Bu durum görsel kalitesinin düşmesine neden olabilir.",
     "Actual size (100%)" : "Gerçek boyut (%100)",
+    "Fit size" : "Boyutu sığdır",
     "Shared Folder" : "Paylaşılmış klasör",
     "Failed to create {albumName}." : "{albumName} albümü oluşturulamadı.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} albümünün adı {newAlbumName} olarak değiştirilemedi.",
diff --git a/l10n/ug.js b/l10n/ug.js
index 8a2a9ea50..c8d866586 100644
--- a/l10n/ug.js
+++ b/l10n/ug.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Time" : "ۋاقىت",
     "Name" : "ئاتى",
     "Update" : "يېڭىلا",
-    "Refresh" : "يېڭىلا"
+    "Refresh" : "يېڭىلا",
+    "Size" : "چوڭلۇقى"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ug.json b/l10n/ug.json
index d962261d5..f419e75bf 100644
--- a/l10n/ug.json
+++ b/l10n/ug.json
@@ -13,6 +13,7 @@
     "Time" : "ۋاقىت",
     "Name" : "ئاتى",
     "Update" : "يېڭىلا",
-    "Refresh" : "يېڭىلا"
+    "Refresh" : "يېڭىلا",
+    "Size" : "چوڭلۇقى"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/uk.js b/l10n/uk.js
index c8c2b14f4..11dbddb5e 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -17,6 +17,9 @@ OC.L10N.register(
     "Settings" : "Налаштування",
     "A better photos experience awaits you" : "На вас чекає краща якість фотографій",
     "Choose the root folder of your timeline to begin" : "Виберіть кореневу папку вашої шкали часу для початку ",
+    "Error saving image" : "Помилка збереження зображення",
+    "Unsaved changes" : "Незбережені зміни",
+    "Drop changes" : "Відкинути зміни",
     "Edit" : "Редагувати",
     "Loading …" : "Завантаження …",
     "Cancel" : "Скасувати",
@@ -75,33 +78,90 @@ OC.L10N.register(
     "Delete album" : "Видалити альбом",
     "Merge with different person" : "Злитися з іншою людиною",
     "Share folder" : "Спільний доступ для каталогу",
+    "Save as" : "Зберегти як",
     "Reset" : "Скидання",
+    "All changes will be lost." : "Усі зміни буде втрачено.",
     "Are you sure you want to continue?" : "Ви впевнені, що бажаєте продовжити?",
+    "Continue" : "Продовжити",
     "Undo" : "Скасувати",
+    "Redo" : "Повторити",
     "Show original image" : "Показати вихідне зображення",
+    "Zoom in" : "Наблизити",
     "Zoom out" : "Зменшення",
     "Toggle zoom menu" : "Перемкнути меню масштабування",
+    "Adjust" : "Налаштувати",
+    "Fine-tune" : "Тонка настройка",
+    "Filters" : "Фільтри",
+    "Watermark" : "Водяний знак",
+    "Draw" : "Малювати",
     "Resize" : "Змінити розмір",
+    "Invalid image." : "Недійсне зображення.",
+    "Error while uploading the image." : "Помилка під час завантаження зображення.",
+    "are not images" : "не є зображеннями",
     "is not an image" : "не є зображенням",
+    "to be uploaded" : "для завантаження",
+    "Crop" : "Урожай",
+    "Original" : "Оригінал",
+    "Custom" : "Користувацьке",
     "Square" : "Майдан",
+    "Landscape" : "Пейзаж",
+    "Portrait" : "Портрет",
     "Ellipse" : "Еліпс",
     "Classic TV" : "Класичний TV",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Стрілка",
+    "Blur" : "Розмиття",
+    "Brightness" : "Яскравість",
+    "Contrast" : "Контраст",
+    "Un-flip X" : "Розгорнути по X",
+    "Flip X" : "Перевернути X",
     "Un-flip Y" : "Розгорнути по Y",
+    "Flip Y" : "Перевернути Y",
+    "HSV" : "HSV",
     "Hue" : "Відтінок",
+    "Saturation" : "Насиченість",
+    "Value" : "Значення",
     "Image" : "Зображення",
+    "Importing …" : "Імпорт…",
+    "+ Add image" : "+ Додати зображення",
     "Line" : "лінія",
+    "Pen" : "Перо",
+    "Polygon" : "Багатокутник",
+    "Sides" : "Сторони",
     "Rectangle" : "Прямокутник",
     "Corner Radius" : "Радіус кута",
     "Width in pixels" : "Ширина в пікселях",
+    "Height in pixels" : "Висота в пікселях",
+    "Toggle ratio lock" : "Перемкнути блокування співвідношення",
     "Reset to original image size" : "Відновити початковий розмір зображення",
+    "Rotate" : "Обертати",
+    "Text" : "Текст",
+    "Text spacing" : "Інтервал між текстом",
+    "Text alignment" : "Вирівнювання тексту",
+    "Font family" : "Сімейство шрифтів",
+    "Size" : "Розмір",
+    "Letter spacing" : "Інтервал між літерами",
+    "Line height" : "Висота лінії",
+    "Warmth" : "Тепло",
     "+ Add watermark" : "+ Додати водяний знак",
     "Choose watermark type" : "Виберіть тип водяного знака",
+    "Upload watermark" : "Завантажити водяний знак",
+    "Add as text" : "Додати як текст",
+    "Padding" : "Відступи",
     "Shadow" : "Тінь",
     "Horizontal" : "Горизонтальний",
+    "Vertical" : "Вертикальний",
+    "Opacity" : "Непрозорість",
     "Position" : "Позиція",
+    "Stroke" : "Інсульт",
+    "Save image as" : "Зберегти зображення як",
+    "Extension" : "Розширення",
     "Name is required." : "Ім'я є обов'язковим.",
+    "Quality" : "Якість",
     "Saved image size (width x height)" : "Розмір збереженого зображення (ширина x висота)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Зауважте, що вибрана область кадрування нижча за застосований розмір, що може спричинити погіршення якості",
     "Actual size (100%)" : "Фактичний розмір (100%)",
+    "Fit size" : "Підходить за розміром",
     "Failed to create {albumName}." : "Не вдалося створити {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Не вдалося перейменувати {currentAlbumName} на {newAlbumName}.",
     "Failed to delete files." : "Не вдалося видалити файли.",
diff --git a/l10n/uk.json b/l10n/uk.json
index c01e73bd4..100276e85 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -15,6 +15,9 @@
     "Settings" : "Налаштування",
     "A better photos experience awaits you" : "На вас чекає краща якість фотографій",
     "Choose the root folder of your timeline to begin" : "Виберіть кореневу папку вашої шкали часу для початку ",
+    "Error saving image" : "Помилка збереження зображення",
+    "Unsaved changes" : "Незбережені зміни",
+    "Drop changes" : "Відкинути зміни",
     "Edit" : "Редагувати",
     "Loading …" : "Завантаження …",
     "Cancel" : "Скасувати",
@@ -73,33 +76,90 @@
     "Delete album" : "Видалити альбом",
     "Merge with different person" : "Злитися з іншою людиною",
     "Share folder" : "Спільний доступ для каталогу",
+    "Save as" : "Зберегти як",
     "Reset" : "Скидання",
+    "All changes will be lost." : "Усі зміни буде втрачено.",
     "Are you sure you want to continue?" : "Ви впевнені, що бажаєте продовжити?",
+    "Continue" : "Продовжити",
     "Undo" : "Скасувати",
+    "Redo" : "Повторити",
     "Show original image" : "Показати вихідне зображення",
+    "Zoom in" : "Наблизити",
     "Zoom out" : "Зменшення",
     "Toggle zoom menu" : "Перемкнути меню масштабування",
+    "Adjust" : "Налаштувати",
+    "Fine-tune" : "Тонка настройка",
+    "Filters" : "Фільтри",
+    "Watermark" : "Водяний знак",
+    "Draw" : "Малювати",
     "Resize" : "Змінити розмір",
+    "Invalid image." : "Недійсне зображення.",
+    "Error while uploading the image." : "Помилка під час завантаження зображення.",
+    "are not images" : "не є зображеннями",
     "is not an image" : "не є зображенням",
+    "to be uploaded" : "для завантаження",
+    "Crop" : "Урожай",
+    "Original" : "Оригінал",
+    "Custom" : "Користувацьке",
     "Square" : "Майдан",
+    "Landscape" : "Пейзаж",
+    "Portrait" : "Портрет",
     "Ellipse" : "Еліпс",
     "Classic TV" : "Класичний TV",
+    "CinemaScope" : "CinemaScope",
+    "Arrow" : "Стрілка",
+    "Blur" : "Розмиття",
+    "Brightness" : "Яскравість",
+    "Contrast" : "Контраст",
+    "Un-flip X" : "Розгорнути по X",
+    "Flip X" : "Перевернути X",
     "Un-flip Y" : "Розгорнути по Y",
+    "Flip Y" : "Перевернути Y",
+    "HSV" : "HSV",
     "Hue" : "Відтінок",
+    "Saturation" : "Насиченість",
+    "Value" : "Значення",
     "Image" : "Зображення",
+    "Importing …" : "Імпорт…",
+    "+ Add image" : "+ Додати зображення",
     "Line" : "лінія",
+    "Pen" : "Перо",
+    "Polygon" : "Багатокутник",
+    "Sides" : "Сторони",
     "Rectangle" : "Прямокутник",
     "Corner Radius" : "Радіус кута",
     "Width in pixels" : "Ширина в пікселях",
+    "Height in pixels" : "Висота в пікселях",
+    "Toggle ratio lock" : "Перемкнути блокування співвідношення",
     "Reset to original image size" : "Відновити початковий розмір зображення",
+    "Rotate" : "Обертати",
+    "Text" : "Текст",
+    "Text spacing" : "Інтервал між текстом",
+    "Text alignment" : "Вирівнювання тексту",
+    "Font family" : "Сімейство шрифтів",
+    "Size" : "Розмір",
+    "Letter spacing" : "Інтервал між літерами",
+    "Line height" : "Висота лінії",
+    "Warmth" : "Тепло",
     "+ Add watermark" : "+ Додати водяний знак",
     "Choose watermark type" : "Виберіть тип водяного знака",
+    "Upload watermark" : "Завантажити водяний знак",
+    "Add as text" : "Додати як текст",
+    "Padding" : "Відступи",
     "Shadow" : "Тінь",
     "Horizontal" : "Горизонтальний",
+    "Vertical" : "Вертикальний",
+    "Opacity" : "Непрозорість",
     "Position" : "Позиція",
+    "Stroke" : "Інсульт",
+    "Save image as" : "Зберегти зображення як",
+    "Extension" : "Розширення",
     "Name is required." : "Ім'я є обов'язковим.",
+    "Quality" : "Якість",
     "Saved image size (width x height)" : "Розмір збереженого зображення (ширина x висота)",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Зауважте, що вибрана область кадрування нижча за застосований розмір, що може спричинити погіршення якості",
     "Actual size (100%)" : "Фактичний розмір (100%)",
+    "Fit size" : "Підходить за розміром",
     "Failed to create {albumName}." : "Не вдалося створити {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Не вдалося перейменувати {currentAlbumName} на {newAlbumName}.",
     "Failed to delete files." : "Не вдалося видалити файли.",
diff --git a/l10n/ur_PK.js b/l10n/ur_PK.js
index 093bde97d..43a3cd9e0 100644
--- a/l10n/ur_PK.js
+++ b/l10n/ur_PK.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "Save" : "حفظ",
     "Month" : "ماہ",
     "Name" : "اسم",
-    "Reset" : "ری سیٹ"
+    "Reset" : "ری سیٹ",
+    "Continue" : "جاری"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ur_PK.json b/l10n/ur_PK.json
index bc38e71d5..a195c24b7 100644
--- a/l10n/ur_PK.json
+++ b/l10n/ur_PK.json
@@ -9,6 +9,7 @@
     "Save" : "حفظ",
     "Month" : "ماہ",
     "Name" : "اسم",
-    "Reset" : "ری سیٹ"
+    "Reset" : "ری سیٹ",
+    "Continue" : "جاری"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/uz.js b/l10n/uz.js
index 271bbd719..746e6572c 100644
--- a/l10n/uz.js
+++ b/l10n/uz.js
@@ -13,6 +13,8 @@ OC.L10N.register(
     "Save" : "Save",
     "Name" : "Name",
     "Update" : "Update",
-    "Refresh" : "Refresh"
+    "Refresh" : "Refresh",
+    "Continue" : "Continue",
+    "Size" : "Size"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/uz.json b/l10n/uz.json
index edae30e12..37afbb162 100644
--- a/l10n/uz.json
+++ b/l10n/uz.json
@@ -11,6 +11,8 @@
     "Save" : "Save",
     "Name" : "Name",
     "Update" : "Update",
-    "Refresh" : "Refresh"
+    "Refresh" : "Refresh",
+    "Continue" : "Continue",
+    "Size" : "Size"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/vi.js b/l10n/vi.js
index 1b0002703..86da8b547 100644
--- a/l10n/vi.js
+++ b/l10n/vi.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Tags" : "Nhãn",
     "Maps" : "Bản đồ",
     "Settings" : "Cài đặt",
+    "Unsaved changes" : "Thay đổi chưa được lưu",
     "Edit" : "Chỉnh sửa",
     "Loading …" : "Đang tải …",
     "Cancel" : "Hủy",
@@ -28,8 +29,13 @@ OC.L10N.register(
     "Update" : "Cập nhật",
     "Refresh" : "Tải mới",
     "Reset" : "Đặt lại",
+    "Continue" : "Tiếp tục",
     "Undo" : "Hoàn tác",
+    "Redo" : "Làm lại",
+    "Custom" : "Tùy chỉnh",
     "Image" : "Hình ảnh",
+    "Text" : "Văn bản",
+    "Size" : "Kích cỡ",
     "Name is required." : "Tên là bắt buộc."
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/vi.json b/l10n/vi.json
index 608eba780..4fa4a2234 100644
--- a/l10n/vi.json
+++ b/l10n/vi.json
@@ -6,6 +6,7 @@
     "Tags" : "Nhãn",
     "Maps" : "Bản đồ",
     "Settings" : "Cài đặt",
+    "Unsaved changes" : "Thay đổi chưa được lưu",
     "Edit" : "Chỉnh sửa",
     "Loading …" : "Đang tải …",
     "Cancel" : "Hủy",
@@ -26,8 +27,13 @@
     "Update" : "Cập nhật",
     "Refresh" : "Tải mới",
     "Reset" : "Đặt lại",
+    "Continue" : "Tiếp tục",
     "Undo" : "Hoàn tác",
+    "Redo" : "Làm lại",
+    "Custom" : "Tùy chỉnh",
     "Image" : "Hình ảnh",
+    "Text" : "Văn bản",
+    "Size" : "Kích cỡ",
     "Name is required." : "Tên là bắt buộc."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index c7f994fb3..9a1cf35cb 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Tags" : "标签",
     "Maps" : "地图",
     "Settings" : "设置",
+    "Unsaved changes" : "未保存的更改",
     "Edit" : "编辑",
     "Loading …" : "正在加载 …",
     "Cancel" : "取消",
@@ -68,11 +69,21 @@ OC.L10N.register(
     "Merge with different person" : "与另一个人合并为同一人",
     "Share folder" : "共享文件夹",
     "Reset" : "重置",
+    "Continue" : "继续",
     "Undo" : "撤销操作",
+    "Redo" : "恢复上个操作",
+    "Zoom in" : "放大",
+    "Original" : "原图",
+    "Custom" : "自定义",
+    "Value" : "值",
     "Image" : "图片",
     "Line" : "线段",
+    "Text" : "文本 ",
+    "Size" : "尺寸",
     "Position" : "位置",
+    "Extension" : "扩展",
     "Name is required." : "名称是必填项。",
+    "Quality" : "质量",
     "Failed to create {albumName}." : "创建 {albumName} 失败",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重命名 {currentAlbumName} 为 {newAlbumName} 的操作失败",
     "Failed to delete {fileName}." : "删除 {fileName} 失败"
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index ec7875f2c..0b4713ef0 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -10,6 +10,7 @@
     "Tags" : "标签",
     "Maps" : "地图",
     "Settings" : "设置",
+    "Unsaved changes" : "未保存的更改",
     "Edit" : "编辑",
     "Loading …" : "正在加载 …",
     "Cancel" : "取消",
@@ -66,11 +67,21 @@
     "Merge with different person" : "与另一个人合并为同一人",
     "Share folder" : "共享文件夹",
     "Reset" : "重置",
+    "Continue" : "继续",
     "Undo" : "撤销操作",
+    "Redo" : "恢复上个操作",
+    "Zoom in" : "放大",
+    "Original" : "原图",
+    "Custom" : "自定义",
+    "Value" : "值",
     "Image" : "图片",
     "Line" : "线段",
+    "Text" : "文本 ",
+    "Size" : "尺寸",
     "Position" : "位置",
+    "Extension" : "扩展",
     "Name is required." : "名称是必填项。",
+    "Quality" : "质量",
     "Failed to create {albumName}." : "创建 {albumName} 失败",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重命名 {currentAlbumName} 为 {newAlbumName} 的操作失败",
     "Failed to delete {fileName}." : "删除 {fileName} 失败"
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index a5196c877..e27951fb3 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Tags" : "標籤",
     "Maps" : "地圖",
     "Settings" : "設定",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "更好的照片體驗正等著您",
     "Choose the root folder of your timeline to begin" : "選擇您時間軸的根資料夾以開始",
     "If you just installed Memories, run:" : "若您安裝了 Memories，請執行：",
@@ -25,6 +26,10 @@ OC.L10N.register(
     "Choose the root of your timeline" : "選擇您時間線的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Image saved successfully" : "圖像保存成功",
+    "Error saving image" : "儲存圖像時發生錯誤",
+    "Unsaved changes" : "未儲存變更",
+    "Drop changes" : "取消更改",
     "Edit" : "編輯",
     "Loading …" : "加載中 …",
     "Cancel" : "取消",
@@ -52,6 +57,8 @@ OC.L10N.register(
     "Failed to load some photos" : "未能加載一些照片",
     "Share" : "分享",
     "Sidebar" : "側邊欄",
+    "Video sharing not supported yet" : "尚不支援視像分享",
+    "Cannot share this type of data" : "無法分享此類型的資料",
     "Processing … {n}/{m}" : "處理中 ... {n}/{m}",
     "{n} photos added to album" : "已新增 {n} 張照片至相簿",
     "Search for collaborators" : "尋找協作者",
@@ -127,37 +134,90 @@ OC.L10N.register(
     "Share folder" : "分享資料夾",
     "Move left" : "向左移動",
     "Move right" : "向右移動",
+    "Save as" : "另存為",
     "Reset" : "重設",
+    "All changes will be lost." : "所有的更改將被掉棄。",
     "Are you sure you want to continue?" : "您確定要繼續嗎？",
+    "Continue" : "繼續",
     "Undo" : "撤消",
+    "Redo" : "重作",
     "Show original image" : "顯示原始圖像",
+    "Zoom in" : "放大",
     "Zoom out" : "縮小",
     "Toggle zoom menu" : "切換縮放選項單",
+    "Adjust" : "調整",
+    "Fine-tune" : "微調",
+    "Filters" : "過濾",
     "Watermark" : "水印",
+    "Draw" : "畫",
     "Resize" : "調整大小",
+    "Invalid image." : "圖像無效。",
+    "Error while uploading the image." : "上傳圖像時發生錯誤。",
+    "are not images" : "不是圖像",
     "is not an image" : "不是圖像",
+    "to be uploaded" : "待上傳",
+    "Crop" : "裁剪",
+    "Original" : "原始",
+    "Custom" : "自訂",
     "Square" : "方形",
+    "Landscape" : "風景模式",
+    "Portrait" : "縱向模式",
     "Ellipse" : "橢圓形",
     "Classic TV" : "經典電視",
+    "CinemaScope" : "電影放映機",
     "Arrow" : "箭嘴",
     "Blur" : "模糊",
+    "Brightness" : "亮度",
+    "Contrast" : "對比",
+    "Un-flip X" : "取消翻轉 X",
+    "Flip X" : "翻轉 X",
     "Un-flip Y" : "取消翻轉 X",
+    "Flip Y" : "翻轉 Y",
+    "HSV" : "HSV",
     "Hue" : "色調",
+    "Saturation" : "飽和度",
+    "Value" : "值",
     "Image" : "圖像",
+    "Importing …" : "導入中 ...",
+    "+ Add image" : "+ 添加圖像",
     "Line" : "線形",
+    "Pen" : "筆",
     "Polygon" : "多邊形",
+    "Sides" : "邊",
     "Rectangle" : "長方形",
     "Corner Radius" : "圓角半徑",
     "Width in pixels" : "寬度像素",
+    "Height in pixels" : "高度像素",
+    "Toggle ratio lock" : "切換比例鎖定",
     "Reset to original image size" : "重設為原始圖像大小",
+    "Rotate" : "旋轉",
+    "Text" : "文本 ",
+    "Text spacing" : "文字間距",
+    "Text alignment" : "文字對齊",
+    "Font family" : "字體系列",
+    "Size" : "大小",
+    "Letter spacing" : "字母間距",
+    "Line height" : "行高",
+    "Warmth" : "暖度",
     "+ Add watermark" : "+ 添加水印",
     "Choose watermark type" : "選擇水印類型",
+    "Upload watermark" : "上傳水印",
+    "Add as text" : "新增為文字",
+    "Padding" : "襯填",
     "Shadow" : "陰影",
     "Horizontal" : "水平",
+    "Vertical" : "垂直",
+    "Opacity" : "透明度",
     "Position" : "位置",
+    "Stroke" : "筆劃",
+    "Save image as" : "保存圖像為",
+    "Extension" : "副檔名",
     "Name is required." : "姓名為必填",
+    "Quality" : "質素",
     "Saved image size (width x height)" : "已保存的圖像大小（寬度 x 高度）",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "請注意，選定的裁剪區域低於套用的調整大小，這可能會導致品質下降",
     "Actual size (100%)" : "實際大小 (100%)",
+    "Fit size" : "調整大小",
     "Shared Folder" : "分享資料夾",
     "Failed to create {albumName}." : "創建 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index f84b469f8..fce060529 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -13,6 +13,7 @@
     "Tags" : "標籤",
     "Maps" : "地圖",
     "Settings" : "設定",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "更好的照片體驗正等著您",
     "Choose the root folder of your timeline to begin" : "選擇您時間軸的根資料夾以開始",
     "If you just installed Memories, run:" : "若您安裝了 Memories，請執行：",
@@ -23,6 +24,10 @@
     "Choose the root of your timeline" : "選擇您時間線的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Image saved successfully" : "圖像保存成功",
+    "Error saving image" : "儲存圖像時發生錯誤",
+    "Unsaved changes" : "未儲存變更",
+    "Drop changes" : "取消更改",
     "Edit" : "編輯",
     "Loading …" : "加載中 …",
     "Cancel" : "取消",
@@ -50,6 +55,8 @@
     "Failed to load some photos" : "未能加載一些照片",
     "Share" : "分享",
     "Sidebar" : "側邊欄",
+    "Video sharing not supported yet" : "尚不支援視像分享",
+    "Cannot share this type of data" : "無法分享此類型的資料",
     "Processing … {n}/{m}" : "處理中 ... {n}/{m}",
     "{n} photos added to album" : "已新增 {n} 張照片至相簿",
     "Search for collaborators" : "尋找協作者",
@@ -125,37 +132,90 @@
     "Share folder" : "分享資料夾",
     "Move left" : "向左移動",
     "Move right" : "向右移動",
+    "Save as" : "另存為",
     "Reset" : "重設",
+    "All changes will be lost." : "所有的更改將被掉棄。",
     "Are you sure you want to continue?" : "您確定要繼續嗎？",
+    "Continue" : "繼續",
     "Undo" : "撤消",
+    "Redo" : "重作",
     "Show original image" : "顯示原始圖像",
+    "Zoom in" : "放大",
     "Zoom out" : "縮小",
     "Toggle zoom menu" : "切換縮放選項單",
+    "Adjust" : "調整",
+    "Fine-tune" : "微調",
+    "Filters" : "過濾",
     "Watermark" : "水印",
+    "Draw" : "畫",
     "Resize" : "調整大小",
+    "Invalid image." : "圖像無效。",
+    "Error while uploading the image." : "上傳圖像時發生錯誤。",
+    "are not images" : "不是圖像",
     "is not an image" : "不是圖像",
+    "to be uploaded" : "待上傳",
+    "Crop" : "裁剪",
+    "Original" : "原始",
+    "Custom" : "自訂",
     "Square" : "方形",
+    "Landscape" : "風景模式",
+    "Portrait" : "縱向模式",
     "Ellipse" : "橢圓形",
     "Classic TV" : "經典電視",
+    "CinemaScope" : "電影放映機",
     "Arrow" : "箭嘴",
     "Blur" : "模糊",
+    "Brightness" : "亮度",
+    "Contrast" : "對比",
+    "Un-flip X" : "取消翻轉 X",
+    "Flip X" : "翻轉 X",
     "Un-flip Y" : "取消翻轉 X",
+    "Flip Y" : "翻轉 Y",
+    "HSV" : "HSV",
     "Hue" : "色調",
+    "Saturation" : "飽和度",
+    "Value" : "值",
     "Image" : "圖像",
+    "Importing …" : "導入中 ...",
+    "+ Add image" : "+ 添加圖像",
     "Line" : "線形",
+    "Pen" : "筆",
     "Polygon" : "多邊形",
+    "Sides" : "邊",
     "Rectangle" : "長方形",
     "Corner Radius" : "圓角半徑",
     "Width in pixels" : "寬度像素",
+    "Height in pixels" : "高度像素",
+    "Toggle ratio lock" : "切換比例鎖定",
     "Reset to original image size" : "重設為原始圖像大小",
+    "Rotate" : "旋轉",
+    "Text" : "文本 ",
+    "Text spacing" : "文字間距",
+    "Text alignment" : "文字對齊",
+    "Font family" : "字體系列",
+    "Size" : "大小",
+    "Letter spacing" : "字母間距",
+    "Line height" : "行高",
+    "Warmth" : "暖度",
     "+ Add watermark" : "+ 添加水印",
     "Choose watermark type" : "選擇水印類型",
+    "Upload watermark" : "上傳水印",
+    "Add as text" : "新增為文字",
+    "Padding" : "襯填",
     "Shadow" : "陰影",
     "Horizontal" : "水平",
+    "Vertical" : "垂直",
+    "Opacity" : "透明度",
     "Position" : "位置",
+    "Stroke" : "筆劃",
+    "Save image as" : "保存圖像為",
+    "Extension" : "副檔名",
     "Name is required." : "姓名為必填",
+    "Quality" : "質素",
     "Saved image size (width x height)" : "已保存的圖像大小（寬度 x 高度）",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "請注意，選定的裁剪區域低於套用的調整大小，這可能會導致品質下降",
     "Actual size (100%)" : "實際大小 (100%)",
+    "Fit size" : "調整大小",
     "Shared Folder" : "分享資料夾",
     "Failed to create {albumName}." : "創建 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 2a8d19587..2fd650696 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Tags" : "標籤",
     "Maps" : "地圖",
     "Settings" : "設定",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "更好的照片體驗正等著您",
     "Choose the root folder of your timeline to begin" : "選擇您時間軸的根資料夾以開始",
     "If you just installed Memories, run:" : "若您安裝了 Memories，請執行：",
@@ -25,6 +26,10 @@ OC.L10N.register(
     "Choose the root of your timeline" : "選擇您時間軸的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Image saved successfully" : "圖片儲存成功",
+    "Error saving image" : "儲存影像時發生錯誤",
+    "Unsaved changes" : "未儲存變更",
+    "Drop changes" : "放棄變更",
     "Edit" : "編輯",
     "Loading …" : "正在載入……",
     "Cancel" : "取消",
@@ -52,6 +57,8 @@ OC.L10N.register(
     "Failed to load some photos" : "載入部份照片時失敗",
     "Share" : "分享",
     "Sidebar" : "側邊欄",
+    "Video sharing not supported yet" : "尚不支援影片分享",
+    "Cannot share this type of data" : "無法分享此類型的資料",
     "Processing … {n}/{m}" : "正在處理…… {n}/{m}",
     "{n} photos added to album" : "已新增 {n} 張照片至相簿",
     "Search for collaborators" : "搜尋協作者",
@@ -127,38 +134,90 @@ OC.L10N.register(
     "Share folder" : "分享資料夾",
     "Move left" : "向左移動",
     "Move right" : "向右移動",
+    "Save as" : "另存新檔",
     "Reset" : "重設",
+    "All changes will be lost." : "所有變更都將會遺失。",
     "Are you sure you want to continue?" : "您確定您想要繼續嗎？",
+    "Continue" : "繼續",
     "Undo" : "復原",
+    "Redo" : "重作",
     "Show original image" : "顯示原始影像",
+    "Zoom in" : "放大",
     "Zoom out" : "縮小",
     "Toggle zoom menu" : "切換縮放選單",
+    "Adjust" : "調整",
+    "Fine-tune" : "微調",
+    "Filters" : "過濾",
     "Watermark" : "水印",
+    "Draw" : "繪圖",
     "Resize" : "調整大小",
+    "Invalid image." : "無效的圖片。",
+    "Error while uploading the image." : "上傳圖片時發生錯誤。",
+    "are not images" : "不是圖片",
     "is not an image" : "不是圖片",
+    "to be uploaded" : "待上傳",
+    "Crop" : "裁剪",
+    "Original" : "原始",
+    "Custom" : "自訂",
     "Square" : "方形",
+    "Landscape" : "風景",
+    "Portrait" : "人像",
     "Ellipse" : "橢圓",
     "Classic TV" : "經典電視",
+    "CinemaScope" : "電影放映機",
     "Arrow" : "箭頭",
     "Blur" : "模糊",
+    "Brightness" : "亮度",
+    "Contrast" : "對比",
+    "Un-flip X" : "取消翻轉 X",
+    "Flip X" : "翻轉 X",
     "Un-flip Y" : "取消翻轉 Y",
+    "Flip Y" : "翻轉 Y",
+    "HSV" : "HSV",
     "Hue" : "色相",
+    "Saturation" : "飽和度",
+    "Value" : "價值",
     "Image" : "圖片",
+    "Importing …" : "正在匯入……",
+    "+ Add image" : "+ 新增圖片",
     "Line" : "線段",
+    "Pen" : "筆",
     "Polygon" : "多邊形",
+    "Sides" : "邊",
     "Rectangle" : "矩形",
     "Corner Radius" : "圓角半徑",
     "Width in pixels" : "像素寬度",
+    "Height in pixels" : "像素高度",
+    "Toggle ratio lock" : "切換比例鎖定",
     "Reset to original image size" : "重設為原始圖片大小",
+    "Rotate" : "旋轉",
+    "Text" : "文字",
+    "Text spacing" : "文字間距",
+    "Text alignment" : "文字對齊",
+    "Font family" : "字型家族",
+    "Size" : "大小",
+    "Letter spacing" : "字母間距",
+    "Line height" : "行高",
+    "Warmth" : "溫暖",
     "+ Add watermark" : "+ 新增水印",
     "Choose watermark type" : "選擇水印類型",
+    "Upload watermark" : "上傳水印",
+    "Add as text" : "新增為留言",
     "Padding" : "填充",
     "Shadow" : "陰影",
     "Horizontal" : "水平",
+    "Vertical" : "垂直",
+    "Opacity" : "不透明度",
     "Position" : "位置",
+    "Stroke" : "筆劃",
+    "Save image as" : "儲存圖片為",
+    "Extension" : "副檔名",
     "Name is required." : "名稱為必填。",
+    "Quality" : "品質",
     "Saved image size (width x height)" : "儲存的圖片大小（寬度 x 高度）",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "請注意，選定的裁剪區域低於套用的調整大小，這可能會導致品質下降",
     "Actual size (100%)" : "實際大小 (100%)",
+    "Fit size" : "合適大小",
     "Shared Folder" : "已分享的資料夾",
     "Failed to create {albumName}." : "建立 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index aa24ec4f3..9d3195da3 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -13,6 +13,7 @@
     "Tags" : "標籤",
     "Maps" : "地圖",
     "Settings" : "設定",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "更好的照片體驗正等著您",
     "Choose the root folder of your timeline to begin" : "選擇您時間軸的根資料夾以開始",
     "If you just installed Memories, run:" : "若您安裝了 Memories，請執行：",
@@ -23,6 +24,10 @@
     "Choose the root of your timeline" : "選擇您時間軸的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Image saved successfully" : "圖片儲存成功",
+    "Error saving image" : "儲存影像時發生錯誤",
+    "Unsaved changes" : "未儲存變更",
+    "Drop changes" : "放棄變更",
     "Edit" : "編輯",
     "Loading …" : "正在載入……",
     "Cancel" : "取消",
@@ -50,6 +55,8 @@
     "Failed to load some photos" : "載入部份照片時失敗",
     "Share" : "分享",
     "Sidebar" : "側邊欄",
+    "Video sharing not supported yet" : "尚不支援影片分享",
+    "Cannot share this type of data" : "無法分享此類型的資料",
     "Processing … {n}/{m}" : "正在處理…… {n}/{m}",
     "{n} photos added to album" : "已新增 {n} 張照片至相簿",
     "Search for collaborators" : "搜尋協作者",
@@ -125,38 +132,90 @@
     "Share folder" : "分享資料夾",
     "Move left" : "向左移動",
     "Move right" : "向右移動",
+    "Save as" : "另存新檔",
     "Reset" : "重設",
+    "All changes will be lost." : "所有變更都將會遺失。",
     "Are you sure you want to continue?" : "您確定您想要繼續嗎？",
+    "Continue" : "繼續",
     "Undo" : "復原",
+    "Redo" : "重作",
     "Show original image" : "顯示原始影像",
+    "Zoom in" : "放大",
     "Zoom out" : "縮小",
     "Toggle zoom menu" : "切換縮放選單",
+    "Adjust" : "調整",
+    "Fine-tune" : "微調",
+    "Filters" : "過濾",
     "Watermark" : "水印",
+    "Draw" : "繪圖",
     "Resize" : "調整大小",
+    "Invalid image." : "無效的圖片。",
+    "Error while uploading the image." : "上傳圖片時發生錯誤。",
+    "are not images" : "不是圖片",
     "is not an image" : "不是圖片",
+    "to be uploaded" : "待上傳",
+    "Crop" : "裁剪",
+    "Original" : "原始",
+    "Custom" : "自訂",
     "Square" : "方形",
+    "Landscape" : "風景",
+    "Portrait" : "人像",
     "Ellipse" : "橢圓",
     "Classic TV" : "經典電視",
+    "CinemaScope" : "電影放映機",
     "Arrow" : "箭頭",
     "Blur" : "模糊",
+    "Brightness" : "亮度",
+    "Contrast" : "對比",
+    "Un-flip X" : "取消翻轉 X",
+    "Flip X" : "翻轉 X",
     "Un-flip Y" : "取消翻轉 Y",
+    "Flip Y" : "翻轉 Y",
+    "HSV" : "HSV",
     "Hue" : "色相",
+    "Saturation" : "飽和度",
+    "Value" : "價值",
     "Image" : "圖片",
+    "Importing …" : "正在匯入……",
+    "+ Add image" : "+ 新增圖片",
     "Line" : "線段",
+    "Pen" : "筆",
     "Polygon" : "多邊形",
+    "Sides" : "邊",
     "Rectangle" : "矩形",
     "Corner Radius" : "圓角半徑",
     "Width in pixels" : "像素寬度",
+    "Height in pixels" : "像素高度",
+    "Toggle ratio lock" : "切換比例鎖定",
     "Reset to original image size" : "重設為原始圖片大小",
+    "Rotate" : "旋轉",
+    "Text" : "文字",
+    "Text spacing" : "文字間距",
+    "Text alignment" : "文字對齊",
+    "Font family" : "字型家族",
+    "Size" : "大小",
+    "Letter spacing" : "字母間距",
+    "Line height" : "行高",
+    "Warmth" : "溫暖",
     "+ Add watermark" : "+ 新增水印",
     "Choose watermark type" : "選擇水印類型",
+    "Upload watermark" : "上傳水印",
+    "Add as text" : "新增為留言",
     "Padding" : "填充",
     "Shadow" : "陰影",
     "Horizontal" : "水平",
+    "Vertical" : "垂直",
+    "Opacity" : "不透明度",
     "Position" : "位置",
+    "Stroke" : "筆劃",
+    "Save image as" : "儲存圖片為",
+    "Extension" : "副檔名",
     "Name is required." : "名稱為必填。",
+    "Quality" : "品質",
     "Saved image size (width x height)" : "儲存的圖片大小（寬度 x 高度）",
+    "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "請注意，選定的裁剪區域低於套用的調整大小，這可能會導致品質下降",
     "Actual size (100%)" : "實際大小 (100%)",
+    "Fit size" : "合適大小",
     "Shared Folder" : "已分享的資料夾",
     "Failed to create {albumName}." : "建立 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",

From 8a16deeec4f226f154805b927c67c956ff6aec72 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 8 Nov 2022 20:08:30 -0800
Subject: [PATCH 023/163] hls: initial commit

---
 appinfo/routes.php                 |  2 +
 lib/Controller/PageController.php  |  5 ++
 lib/Controller/VideoController.php | 96 ++++++++++++++++++++++++++++++
 package-lock.json                  | 42 +++++++++++++
 package.json                       |  1 +
 src/components/PsVideo.ts          | 43 ++++++++++++-
 6 files changed, 187 insertions(+), 2 deletions(-)
 create mode 100644 lib/Controller/VideoController.php

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 0f9fb2139..3bee0f373 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -57,6 +57,8 @@ function w($base, $param) {
 
         ['name' => 'Archive#archive', 'url' => '/api/archive/{id}', 'verb' => 'PATCH'],
 
+        ['name' => 'Video#transcode', 'url' => '/api/video/transcode/{fileid}/{profile}', 'verb' => 'GET'],
+
         // Config API
         ['name' => 'Other#setUserConfig', 'url' => '/api/config/{key}', 'verb' => 'PUT'],
 
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 23d5a7211..2da07c25b 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -95,6 +95,11 @@ public function main()
         $policy->addAllowedWorkerSrcDomain("'self'");
         $policy->addAllowedScriptDomain("'self'");
 
+        // Video player
+        $policy->addAllowedWorkerSrcDomain('blob:');
+        $policy->addAllowedScriptDomain('blob:');
+        $policy->addAllowedMediaDomain('blob:');
+
         // Allow nominatim for metadata
         $policy->addAllowedConnectDomain('nominatim.openstreetmap.org');
         $policy->addAllowedFrameDomain('www.openstreetmap.org');
diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
new file mode 100644
index 000000000..4df66a406
--- /dev/null
+++ b/lib/Controller/VideoController.php
@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Varun Patil <radialapps@gmail.com>
+ * @author Varun Patil <radialapps@gmail.com>
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Memories\Controller;
+
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\DataDisplayResponse;
+
+class VideoController extends ApiBase
+{
+    /**
+     * @NoAdminRequired
+     *
+     * @NoCSRFRequired
+     *
+     * Transcode a video to HLS by proxy
+     *
+     * @param string fileid
+     * @param string video profile
+     *
+     * @return JSONResponse an empty JSONResponse with respective http status code
+     */
+    public function transcode(string $fileid, string $profile): Http\Response
+    {
+        $user = $this->userSession->getUser();
+        if (null === $user) {
+            return new JSONResponse([], Http::STATUS_PRECONDITION_FAILED);
+        }
+
+        // Make sure not running in read-only mode
+        if ($this->config->getSystemValue('memories.no_transcode', false)) {
+            return new JSONResponse(['message' => 'Transcoding disabled'], Http::STATUS_FORBIDDEN);
+        }
+
+        // Get file
+        $files = $this->rootFolder->getById($fileid);
+        if (count($files) === 0) {
+            return new JSONResponse(['message' => 'File not found'], Http::STATUS_NOT_FOUND);
+        }
+        $file = $files[0];
+
+        // Local files only for now
+        if (!$file->getStorage()->isLocal()) {
+            return new JSONResponse(['message' => 'External storage not supported'], Http::STATUS_FORBIDDEN);
+        }
+
+        // Get file path
+        $path = $file->getStorage()->getLocalFile($file->getInternalPath());
+        if (!$path || !file_exists($path)) {
+            return new JSONResponse(['message' => 'File not found'], Http::STATUS_NOT_FOUND);
+        }
+
+        // Make upstream request
+        $ch = curl_init("http://localhost:9999/vod/$path/$profile");
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        $data = curl_exec($ch);
+        $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+        $returnCode = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+
+        // Check data was received
+        if ($returnCode >= 400 || false === $data) {
+            return new JSONResponse(['message' => 'Transcode failed'], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+
+        // Create and send response
+        $response = new DataDisplayResponse($data, Http::STATUS_OK, [
+            'Content-Type' => $contentType,
+        ]);
+        $response->cacheFor(3600 * 24, false, false);
+
+        return $response;
+    }
+}
diff --git a/package-lock.json b/package-lock.json
index b87a37208..1207a3c88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@nextcloud/paths": "^2.1.0",
         "@nextcloud/sharing": "^0.1.0",
         "@nextcloud/vue": "7.0.0",
+        "@silvermine/videojs-quality-selector": "^1.2.5",
         "camelcase": "^7.0.0",
         "filerobot-image-editor": "^4.3.7",
         "justified-layout": "^4.1.0",
@@ -2162,6 +2163,18 @@
         "styled-components": "^5.1.0"
       }
     },
+    "node_modules/@silvermine/videojs-quality-selector": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@silvermine/videojs-quality-selector/-/videojs-quality-selector-1.2.5.tgz",
+      "integrity": "sha512-cielchUzL8r2EX01S7PfR54tTbxDZR53xIDJoUi9Wg6pM2X+ftdJD6XiIDVOjPlBoG94iuG9LJwUtjX5IhrWZQ==",
+      "dependencies": {
+        "class.extend": "0.9.1",
+        "underscore": "1.13.1"
+      },
+      "peerDependencies": {
+        "video.js": ">=6.0.0"
+      }
+    },
     "node_modules/@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -3539,6 +3552,11 @@
       "resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
       "integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="
     },
+    "node_modules/class.extend": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/class.extend/-/class.extend-0.9.1.tgz",
+      "integrity": "sha512-Tzj+2kAkZs+iGiUOUoKvtj4c/SjeVdKZXg/NbLTGKu0kp66h69dyMHQwOSzuyIghXAUswuY24TZc0HdaJCXx2A=="
+    },
     "node_modules/clone-deep": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -9072,6 +9090,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/underscore": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -11900,6 +11923,15 @@
         "use-callback-ref": "^1.2.4"
       }
     },
+    "@silvermine/videojs-quality-selector": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@silvermine/videojs-quality-selector/-/videojs-quality-selector-1.2.5.tgz",
+      "integrity": "sha512-cielchUzL8r2EX01S7PfR54tTbxDZR53xIDJoUi9Wg6pM2X+ftdJD6XiIDVOjPlBoG94iuG9LJwUtjX5IhrWZQ==",
+      "requires": {
+        "class.extend": "0.9.1",
+        "underscore": "1.13.1"
+      }
+    },
     "@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -13056,6 +13088,11 @@
       "resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
       "integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="
     },
+    "class.extend": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/class.extend/-/class.extend-0.9.1.tgz",
+      "integrity": "sha512-Tzj+2kAkZs+iGiUOUoKvtj4c/SjeVdKZXg/NbLTGKu0kp66h69dyMHQwOSzuyIghXAUswuY24TZc0HdaJCXx2A=="
+    },
     "clone-deep": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -17325,6 +17362,11 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "underscore": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
diff --git a/package.json b/package.json
index 88253bd5c..e065d4067 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "@nextcloud/paths": "^2.1.0",
     "@nextcloud/sharing": "^0.1.0",
     "@nextcloud/vue": "7.0.0",
+    "@silvermine/videojs-quality-selector": "^1.2.5",
     "camelcase": "^7.0.0",
     "filerobot-image-editor": "^4.3.7",
     "justified-layout": "^4.1.0",
diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 982decea5..f1831dab6 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -1,6 +1,11 @@
 import PhotoSwipe from "photoswipe";
+import { generateUrl } from "@nextcloud/router";
+
 import videojs from "video.js";
 import "video.js/dist/video-js.min.css";
+import qualitySelector from "@silvermine/videojs-quality-selector";
+import "@silvermine/videojs-quality-selector/dist/css/quality-selector.css";
+qualitySelector(videojs);
 
 /**
  * Check if slide has video content
@@ -71,19 +76,53 @@ class VideoContentSetup {
           e.preventDefault();
         } else {
           const content = <any>e.slide.content;
+          const fileid = content.data.photo.fileid;
+
+          // Create hls sources if enabled
+          let hlsSources = [];
+          const baseUrl = generateUrl(
+            `/apps/memories/api/video/transcode/${fileid}`
+          );
+          for (const q of ["360p", "480p", "720p", "1080p"]) {
+            hlsSources.push({
+              src: `${baseUrl}/${q}.m3u8`,
+              label: q,
+              type: "application/x-mpegURL",
+              selected: q === "480p" ? true : undefined,
+            });
+          }
+
           content.videojs = videojs(content.videoElement, {
             fluid: true,
             autoplay: true,
             controls: true,
-            sources: [{ src: e.slide.data.src }],
+            sources: [
+              ...hlsSources,
+              {
+                src: e.slide.data.src,
+                label: "Original",
+              },
+            ],
             preload: "metadata",
             inactivityTimeout: 0,
             html5: {
               vhs: {
-                withCredentials: true,
+                overrideNative: !videojs.browser.IS_SAFARI,
+                withCredentials: false,
               },
             },
+            controlBar: {
+              children: [
+                "playToggle",
+                "progressControl",
+                "volumePanel",
+                "qualitySelector",
+                "fullscreenToggle",
+              ],
+            },
           });
+
+          globalThis.videojs = content.videojs;
         }
       }
     });

From 72806281bf46a7f1e80b6e3ba2ef1a471b68dbed Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 8 Nov 2022 20:39:27 -0800
Subject: [PATCH 024/163] Switch to index quality

---
 package-lock.json         | 332 +++++++++++++++++++++++++++++---------
 package.json              |   3 +-
 src/components/PsVideo.ts |  40 ++---
 3 files changed, 276 insertions(+), 99 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1207a3c88..ae8cce8f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,6 @@
         "@nextcloud/paths": "^2.1.0",
         "@nextcloud/sharing": "^0.1.0",
         "@nextcloud/vue": "7.0.0",
-        "@silvermine/videojs-quality-selector": "^1.2.5",
         "camelcase": "^7.0.0",
         "filerobot-image-editor": "^4.3.7",
         "justified-layout": "^4.1.0",
@@ -22,6 +21,8 @@
         "photoswipe": "^5.3.3",
         "reflect-metadata": "^0.1.13",
         "video.js": "^7.20.3",
+        "videojs-contrib-quality-levels": "^2.2.0",
+        "videojs-hls-quality-selector": "^1.1.4",
         "vue": "^2.7.10",
         "vue-class-component": "^7.2.6",
         "vue-material-design-icons": "^5.1.2",
@@ -2163,18 +2164,6 @@
         "styled-components": "^5.1.0"
       }
     },
-    "node_modules/@silvermine/videojs-quality-selector": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/@silvermine/videojs-quality-selector/-/videojs-quality-selector-1.2.5.tgz",
-      "integrity": "sha512-cielchUzL8r2EX01S7PfR54tTbxDZR53xIDJoUi9Wg6pM2X+ftdJD6XiIDVOjPlBoG94iuG9LJwUtjX5IhrWZQ==",
-      "dependencies": {
-        "class.extend": "0.9.1",
-        "underscore": "1.13.1"
-      },
-      "peerDependencies": {
-        "video.js": ">=6.0.0"
-      }
-    },
     "node_modules/@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -2888,6 +2877,11 @@
         "node": ">=4"
       }
     },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -3552,11 +3546,6 @@
       "resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
       "integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="
     },
-    "node_modules/class.extend": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/class.extend/-/class.extend-0.9.1.tgz",
-      "integrity": "sha512-Tzj+2kAkZs+iGiUOUoKvtj4c/SjeVdKZXg/NbLTGKu0kp66h69dyMHQwOSzuyIghXAUswuY24TZc0HdaJCXx2A=="
-    },
     "node_modules/clone-deep": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -3684,8 +3673,7 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
@@ -4903,11 +4891,53 @@
       "dev": true,
       "peer": true
     },
+    "node_modules/fs-promise": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-0.5.0.tgz",
+      "integrity": "sha512-Y+4F4ujhEcayCJt6JmzcOun9MYGQwz+bVUiuBmTkJImhBHKpBvmVPZR9wtfiF7k3ffwAOAuurygQe+cPLSFQhw==",
+      "deprecated": "Use mz or fs-extra^3.0 with Promise Support",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "fs-extra": "^0.26.5",
+        "mz": "^2.3.1",
+        "thenify-all": "^1.6.0"
+      }
+    },
+    "node_modules/fs-promise/node_modules/fs-extra": {
+      "version": "0.26.7",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
+      "integrity": "sha512-waKu+1KumRhYv8D8gMRCKJGAMI9pRnPuEb1mvgYD0f7wBscg+h6bW4FDTmEZhB9VKxvoTtxW+Y7bnIlB7zja6Q==",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "node_modules/fs-promise/node_modules/jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/fs-promise/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "node_modules/function-bind": {
       "version": "1.1.1",
@@ -5004,7 +5034,6 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -5044,7 +5073,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -5054,7 +5082,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -5082,8 +5109,7 @@
     "node_modules/graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
     "node_modules/hammerjs": {
       "version": "2.0.8",
@@ -5490,7 +5516,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -5499,8 +5524,7 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/internal-slot": {
       "version": "1.0.3",
@@ -6165,6 +6189,18 @@
       "resolved": "https://registry.npmjs.org/justified-layout/-/justified-layout-4.1.0.tgz",
       "integrity": "sha512-M5FimNMXgiOYerVRGsXZ2YK9YNCaTtwtYp7Hb2308U1Q9TXXHx5G0p08mcVR5O53qf8bWY4NJcPBxE6zuayXSg=="
     },
+    "node_modules/karma-safaritechpreview-launcher": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz",
+      "integrity": "sha512-2QMxAGXPQ37H3KoR9SCdh0OoktQZ5MyrxkvBiZ+VVOQfYVrcyOQXGrPea0/DKvf8qoQvrvP2FHcP/BxsuxuyHw==",
+      "dependencies": {
+        "fs-promise": "^0.5.0",
+        "marcosc-async": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/keycode": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
@@ -6180,6 +6216,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "node_modules/klona": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
@@ -6366,6 +6410,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/marcosc-async": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/marcosc-async/-/marcosc-async-3.0.5.tgz",
+      "integrity": "sha512-CCDofAatyNlbCCE1aIERplqT8r4S3LLc72pg3Bg/RilWPFqdXYO/FiDfzZ9ijf7K1P0j5mUZYCQ6eWXNuAxNBg==",
+      "engines": ">=4"
+    },
     "node_modules/material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
@@ -6625,6 +6675,16 @@
         "npm": ">=5"
       }
     },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "node_modules/nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
@@ -6749,7 +6809,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6841,7 +6900,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -6992,7 +7050,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8824,6 +8881,25 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -9090,11 +9166,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
-    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -9369,11 +9440,34 @@
         "videojs-vtt.js": "^0.15.4"
       }
     },
+    "node_modules/videojs-contrib-quality-levels": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.2.0.tgz",
+      "integrity": "sha512-r4LFNhjyeBmlGk4Ul43xl+f7sNJ9vFyM6p4NcZNbPlvs1IvykEXCqxvsvaR6KTBjHoHGJnr26grXWcJiLFP+cA==",
+      "dependencies": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
+      },
+      "peerDependencies": {
+        "video.js": "^6 || ^7"
+      }
+    },
     "node_modules/videojs-font": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
       "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
     },
+    "node_modules/videojs-hls-quality-selector": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/videojs-hls-quality-selector/-/videojs-hls-quality-selector-1.1.4.tgz",
+      "integrity": "sha512-wWAjlLQui02gp//t9KHGd3XnbYO7wdOptskh3ZYCrbl/5Lbkveqb9yBVjH4e0zIQBPvGdWPMcOeDukf8iuYeBw==",
+      "dependencies": {
+        "global": "^4.3.2",
+        "karma-safaritechpreview-launcher": "0.0.6",
+        "video.js": "^7.5.5",
+        "videojs-contrib-quality-levels": "^2.0.9"
+      }
+    },
     "node_modules/videojs-vtt.js": {
       "version": "0.15.4",
       "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
@@ -10377,8 +10471,7 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
       "version": "8.10.0",
@@ -11923,15 +12016,6 @@
         "use-callback-ref": "^1.2.4"
       }
     },
-    "@silvermine/videojs-quality-selector": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/@silvermine/videojs-quality-selector/-/videojs-quality-selector-1.2.5.tgz",
-      "integrity": "sha512-cielchUzL8r2EX01S7PfR54tTbxDZR53xIDJoUi9Wg6pM2X+ftdJD6XiIDVOjPlBoG94iuG9LJwUtjX5IhrWZQ==",
-      "requires": {
-        "class.extend": "0.9.1",
-        "underscore": "1.13.1"
-      }
-    },
     "@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -12566,6 +12650,11 @@
         "color-convert": "^1.9.0"
       }
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
     "anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -13088,11 +13177,6 @@
       "resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
       "integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="
     },
-    "class.extend": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/class.extend/-/class.extend-0.9.1.tgz",
-      "integrity": "sha512-Tzj+2kAkZs+iGiUOUoKvtj4c/SjeVdKZXg/NbLTGKu0kp66h69dyMHQwOSzuyIghXAUswuY24TZc0HdaJCXx2A=="
-    },
     "clone-deep": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -13207,8 +13291,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "connect-history-api-fallback": {
       "version": "2.0.0",
@@ -14182,11 +14265,51 @@
       "dev": true,
       "peer": true
     },
+    "fs-promise": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-0.5.0.tgz",
+      "integrity": "sha512-Y+4F4ujhEcayCJt6JmzcOun9MYGQwz+bVUiuBmTkJImhBHKpBvmVPZR9wtfiF7k3ffwAOAuurygQe+cPLSFQhw==",
+      "requires": {
+        "any-promise": "^1.0.0",
+        "fs-extra": "^0.26.5",
+        "mz": "^2.3.1",
+        "thenify-all": "^1.6.0"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "0.26.7",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
+          "integrity": "sha512-waKu+1KumRhYv8D8gMRCKJGAMI9pRnPuEb1mvgYD0f7wBscg+h6bW4FDTmEZhB9VKxvoTtxW+Y7bnIlB7zja6Q==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "jsonfile": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+          "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "function-bind": {
       "version": "1.1.1",
@@ -14256,7 +14379,6 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -14270,7 +14392,6 @@
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "dev": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -14280,7 +14401,6 @@
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
           "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -14321,8 +14441,7 @@
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
     "hammerjs": {
       "version": "2.0.8",
@@ -14648,7 +14767,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -14657,8 +14775,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "internal-slot": {
       "version": "1.0.3",
@@ -15127,6 +15244,15 @@
       "resolved": "https://registry.npmjs.org/justified-layout/-/justified-layout-4.1.0.tgz",
       "integrity": "sha512-M5FimNMXgiOYerVRGsXZ2YK9YNCaTtwtYp7Hb2308U1Q9TXXHx5G0p08mcVR5O53qf8bWY4NJcPBxE6zuayXSg=="
     },
+    "karma-safaritechpreview-launcher": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz",
+      "integrity": "sha512-2QMxAGXPQ37H3KoR9SCdh0OoktQZ5MyrxkvBiZ+VVOQfYVrcyOQXGrPea0/DKvf8qoQvrvP2FHcP/BxsuxuyHw==",
+      "requires": {
+        "fs-promise": "^0.5.0",
+        "marcosc-async": "^3.0.4"
+      }
+    },
     "keycode": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
@@ -15139,6 +15265,14 @@
       "dev": true,
       "peer": true
     },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==",
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "klona": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
@@ -15285,6 +15419,11 @@
         "semver": "^6.0.0"
       }
     },
+    "marcosc-async": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/marcosc-async/-/marcosc-async-3.0.5.tgz",
+      "integrity": "sha512-CCDofAatyNlbCCE1aIERplqT8r4S3LLc72pg3Bg/RilWPFqdXYO/FiDfzZ9ijf7K1P0j5mUZYCQ6eWXNuAxNBg=="
+    },
     "material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
@@ -15494,6 +15633,16 @@
         "global": "^4.4.0"
       }
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
@@ -15593,8 +15742,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "peer": true
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
     "object-inspect": {
       "version": "1.12.2",
@@ -15659,7 +15807,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -15776,8 +15923,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
     },
     "path-key": {
       "version": "3.1.1",
@@ -17165,6 +17311,22 @@
         }
       }
     },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
     "thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -17362,11 +17524,6 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
-    "underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
-    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -17566,11 +17723,31 @@
         "videojs-vtt.js": "^0.15.4"
       }
     },
+    "videojs-contrib-quality-levels": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.2.0.tgz",
+      "integrity": "sha512-r4LFNhjyeBmlGk4Ul43xl+f7sNJ9vFyM6p4NcZNbPlvs1IvykEXCqxvsvaR6KTBjHoHGJnr26grXWcJiLFP+cA==",
+      "requires": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
+      }
+    },
     "videojs-font": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
       "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
     },
+    "videojs-hls-quality-selector": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/videojs-hls-quality-selector/-/videojs-hls-quality-selector-1.1.4.tgz",
+      "integrity": "sha512-wWAjlLQui02gp//t9KHGd3XnbYO7wdOptskh3ZYCrbl/5Lbkveqb9yBVjH4e0zIQBPvGdWPMcOeDukf8iuYeBw==",
+      "requires": {
+        "global": "^4.3.2",
+        "karma-safaritechpreview-launcher": "0.0.6",
+        "video.js": "^7.5.5",
+        "videojs-contrib-quality-levels": "^2.0.9"
+      }
+    },
     "videojs-vtt.js": {
       "version": "0.15.4",
       "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
@@ -18385,8 +18562,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "ws": {
       "version": "8.10.0",
diff --git a/package.json b/package.json
index e065d4067..aae83758c 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
     "@nextcloud/paths": "^2.1.0",
     "@nextcloud/sharing": "^0.1.0",
     "@nextcloud/vue": "7.0.0",
-    "@silvermine/videojs-quality-selector": "^1.2.5",
     "camelcase": "^7.0.0",
     "filerobot-image-editor": "^4.3.7",
     "justified-layout": "^4.1.0",
@@ -42,6 +41,8 @@
     "photoswipe": "^5.3.3",
     "reflect-metadata": "^0.1.13",
     "video.js": "^7.20.3",
+    "videojs-contrib-quality-levels": "^2.2.0",
+    "videojs-hls-quality-selector": "^1.1.4",
     "vue": "^2.7.10",
     "vue-class-component": "^7.2.6",
     "vue-material-design-icons": "^5.1.2",
diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index f1831dab6..aacaf8776 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -3,9 +3,8 @@ import { generateUrl } from "@nextcloud/router";
 
 import videojs from "video.js";
 import "video.js/dist/video-js.min.css";
-import qualitySelector from "@silvermine/videojs-quality-selector";
-import "@silvermine/videojs-quality-selector/dist/css/quality-selector.css";
-qualitySelector(videojs);
+import "videojs-contrib-quality-levels";
+import "videojs-hls-quality-selector";
 
 /**
  * Check if slide has video content
@@ -83,14 +82,10 @@ class VideoContentSetup {
           const baseUrl = generateUrl(
             `/apps/memories/api/video/transcode/${fileid}`
           );
-          for (const q of ["360p", "480p", "720p", "1080p"]) {
-            hlsSources.push({
-              src: `${baseUrl}/${q}.m3u8`,
-              label: q,
-              type: "application/x-mpegURL",
-              selected: q === "480p" ? true : undefined,
-            });
-          }
+          hlsSources.push({
+            src: `${baseUrl}/index.m3u8`,
+            type: "application/x-mpegURL",
+          });
 
           content.videojs = videojs(content.videoElement, {
             fluid: true,
@@ -111,17 +106,22 @@ class VideoContentSetup {
                 withCredentials: false,
               },
             },
-            controlBar: {
-              children: [
-                "playToggle",
-                "progressControl",
-                "volumePanel",
-                "qualitySelector",
-                "fullscreenToggle",
-              ],
-            },
           });
 
+          content.videojs.qualityLevels();
+          content.videojs.hlsQualitySelector({
+            displayCurrentQuality: true,
+          });
+
+          setTimeout(() => {
+            content.videojs
+              .contentEl()
+              .querySelectorAll("button")
+              .forEach((b: HTMLButtonElement) => {
+                b.classList.add("button-vue");
+              });
+          }, 500);
+
           globalThis.videojs = content.videojs;
         }
       }

From 99ec1a50cc0f173363f66ec1a06a15aea7c3771f Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 8 Nov 2022 21:41:39 -0800
Subject: [PATCH 025/163] video: dispose on destroy

---
 src/components/PsVideo.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index aacaf8776..3f89406d2 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -150,6 +150,11 @@ class VideoContentSetup {
         content._videoPosterImg.onload = content._videoPosterImg.onerror = null;
         content._videoPosterImg = null;
       }
+
+      if (content.videojs) {
+        content.videojs.dispose();
+        content.videojs = null;
+      }
     }
   }
 

From 3d35741ed033a19bff2f96069a77bc3f3a01ad8a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 8 Nov 2022 21:52:08 -0800
Subject: [PATCH 026/163] video: add HLS fallback

---
 src/components/PsVideo.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 3f89406d2..d28b32a76 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -95,7 +95,6 @@ class VideoContentSetup {
               ...hlsSources,
               {
                 src: e.slide.data.src,
-                label: "Original",
               },
             ],
             preload: "metadata",
@@ -108,6 +107,18 @@ class VideoContentSetup {
             },
           });
 
+          content.videojs.on("error", function () {
+            if (this.error().code === 4) {
+              if (this.src().includes("m3u8")) {
+                // HLS could not be streamed
+                console.error("Video.js: HLS stream could not be opened.");
+                this.src({
+                  src: e.slide.data.src,
+                });
+              }
+            }
+          });
+
           content.videojs.qualityLevels();
           content.videojs.hlsQualitySelector({
             displayCurrentQuality: true,

From dc89f0e95b31e39c32812ac38b926f003ff69390 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 8 Nov 2022 23:02:32 -0800
Subject: [PATCH 027/163] video: find file in user folder

---
 lib/Controller/VideoController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 4df66a406..48c2b389e 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -54,7 +54,7 @@ public function transcode(string $fileid, string $profile): Http\Response
         }
 
         // Get file
-        $files = $this->rootFolder->getById($fileid);
+        $files = $this->rootFolder->getUserFolder($user->getUID())->getById($fileid);
         if (count($files) === 0) {
             return new JSONResponse(['message' => 'File not found'], Http::STATUS_NOT_FOUND);
         }

From 3229ee32f0108683d76a1ab55207340f82f8ba3a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 8 Nov 2022 23:48:30 -0800
Subject: [PATCH 028/163] video: minor tweaks

---
 lib/Controller/VideoController.php |  1 +
 src/components/PsVideo.ts          | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 48c2b389e..d677b68fb 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -74,6 +74,7 @@ public function transcode(string $fileid, string $profile): Http\Response
         // Make upstream request
         $ch = curl_init("http://localhost:9999/vod/$path/$profile");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
         curl_setopt($ch, CURLOPT_HEADER, 0);
         $data = curl_exec($ch);
         $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index d28b32a76..12ede6aaa 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -87,6 +87,7 @@ class VideoContentSetup {
             type: "application/x-mpegURL",
           });
 
+          const overrideNative = !videojs.browser.IS_SAFARI;
           content.videojs = videojs(content.videoElement, {
             fluid: true,
             autoplay: true,
@@ -98,12 +99,15 @@ class VideoContentSetup {
               },
             ],
             preload: "metadata",
-            inactivityTimeout: 0,
+            playbackRates: [0.5, 1, 1.5, 2],
+            responsive: true,
             html5: {
               vhs: {
-                overrideNative: !videojs.browser.IS_SAFARI,
+                overrideNative: overrideNative,
                 withCredentials: false,
               },
+              nativeAudioTracks: !overrideNative,
+              nativeVideoTracks: !overrideNative,
             },
           });
 
@@ -115,6 +119,8 @@ class VideoContentSetup {
                 this.src({
                   src: e.slide.data.src,
                 });
+                this.options().html5.nativeAudioTracks = true;
+                this.options().html5.nativeVideoTracks = true;
               }
             }
           });

From c41854e1412dc91d5668bab108c78817196245d8 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 00:52:44 -0800
Subject: [PATCH 029/163] Lint

---
 lib/Controller/VideoController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index d677b68fb..72f90fdc6 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -24,8 +24,8 @@
 namespace OCA\Memories\Controller;
 
 use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\DataDisplayResponse;
+use OCP\AppFramework\Http\JSONResponse;
 
 class VideoController extends ApiBase
 {
@@ -55,7 +55,7 @@ public function transcode(string $fileid, string $profile): Http\Response
 
         // Get file
         $files = $this->rootFolder->getUserFolder($user->getUID())->getById($fileid);
-        if (count($files) === 0) {
+        if (0 === \count($files)) {
             return new JSONResponse(['message' => 'File not found'], Http::STATUS_NOT_FOUND);
         }
         $file = $files[0];
@@ -72,13 +72,13 @@ public function transcode(string $fileid, string $profile): Http\Response
         }
 
         // Make upstream request
-        $ch = curl_init("http://localhost:9999/vod/$path/$profile");
+        $ch = curl_init("http://localhost:9999/vod/{$path}/{$profile}");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
         curl_setopt($ch, CURLOPT_HEADER, 0);
         $data = curl_exec($ch);
         $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
-        $returnCode = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $returnCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
         curl_close($ch);
 
         // Check data was received

From 007a8c3f4f14a22de7d1c3cc09fbb7a41d000af9 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 01:23:12 -0800
Subject: [PATCH 030/163] More batteries

---
 README.md                  |   2 +-
 appinfo/info.xml           |   1 +
 lib/Command/Index.php      |  15 +---
 lib/Command/VideoSetup.php | 148 +++++++++++++++++++++++++++++++++++++
 lib/Exif.php               |  21 +-----
 lib/Util.php               |  33 +++++++++
 scripts/get-exiftool.sh    |   7 ++
 7 files changed, 194 insertions(+), 33 deletions(-)
 create mode 100644 lib/Command/VideoSetup.php

diff --git a/README.md b/README.md
index 3faa36115..7deafd316 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 [![Gitter](https://img.shields.io/gitter/room/pulsejet/memories)](https://gitter.im/pulsejet/memories)
 [![GitHub issues](https://img.shields.io/github/issues/pulsejet/memories)](https://github.com/pulsejet/memories/issues)
 
-Memories is a batteries-included photo management solution for Nextcloud with advanced features including:
+Memories is a _batteries-included_ photo management solution for Nextcloud with advanced features including:
 
 - **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.
 - **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 53c48e0ff..d6e2f50c4 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -46,6 +46,7 @@ Memories is a batteries-included photo management solution for Nextcloud with ad
     </dependencies>
     <commands>
         <command>OCA\Memories\Command\Index</command>
+        <command>OCA\Memories\Command\VideoSetup</command>
     </commands>
     <navigations>
         <navigation>
diff --git a/lib/Command/Index.php b/lib/Command/Index.php
index cce9439ae..4613a970b 100644
--- a/lib/Command/Index.php
+++ b/lib/Command/Index.php
@@ -25,7 +25,6 @@
 
 use OC\DB\Connection;
 use OC\DB\SchemaWrapper;
-use OCA\Files_External\Service\GlobalStoragesService;
 use OCA\Memories\AppInfo\Application;
 use OCA\Memories\Db\TimelineWrite;
 use OCP\Encryption\IManager;
@@ -38,8 +37,6 @@
 use OCP\IPreview;
 use OCP\IUser;
 use OCP\IUserManager;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -47,9 +44,6 @@
 
 class Index extends Command
 {
-    /** @var ?GlobalStoragesService */
-    protected $globalService;
-
     /** @var int[][] */
     protected array $sizes;
 
@@ -78,8 +72,7 @@ public function __construct(
         IConfig $config,
         IManager $encryptionManager,
         IDBConnection $connection,
-        Connection $connectionForSchema,
-        ContainerInterface $container
+        Connection $connectionForSchema
     ) {
         parent::__construct();
 
@@ -91,12 +84,6 @@ public function __construct(
         $this->connection = $connection;
         $this->connectionForSchema = $connectionForSchema;
         $this->timelineWrite = new TimelineWrite($connection, $preview);
-
-        try {
-            $this->globalService = $container->get(GlobalStoragesService::class);
-        } catch (ContainerExceptionInterface $e) {
-            $this->globalService = null;
-        }
     }
 
     protected function configure(): void
diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
new file mode 100644
index 000000000..a4c5630f7
--- /dev/null
+++ b/lib/Command/VideoSetup.php
@@ -0,0 +1,148 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022, Varun Patil <radialapps@gmail.com>
+ * @author Varun Patil <radialapps@gmail.com>
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Memories\Command;
+
+use OCP\IConfig;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class VideoSetup extends Command
+{
+    protected IConfig $config;
+    protected OutputInterface $output;
+
+    public function __construct(
+        IConfig $config
+    ) {
+        parent::__construct();
+        $this->config = $config;
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName('memories:video-setup')
+            ->setDescription('Setup video streaming')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        // Get ffmpeg version
+        $output->writeln('Checking for ffmpeg binary');
+        $ffmpeg = shell_exec('ffmpeg -version');
+        if (false === strpos($ffmpeg, 'ffmpeg version')) {
+            $ffmpeg = null;
+            $output->writeln('<error>ffmpeg is not installed</error>');
+        } else {
+            $output->writeln('ffmpeg is installed');
+        }
+
+        // Get ffprobe version
+        $output->writeln('Checking for ffprobe binary');
+        $ffprobe = shell_exec('ffprobe -version');
+        if (false === strpos($ffprobe, 'ffprobe version')) {
+            $ffprobe = null;
+            $output->writeln('<error>ffprobe is not installed</error>');
+        } else {
+            $output->writeln('ffprobe is installed');
+        }
+
+        if (null === $ffmpeg || null === $ffprobe) {
+            $output->writeln('ffmpeg and ffprobe are required for video transcoding');
+            return $this->suggestDisable($output);
+        }
+
+        // Check go-transcode binary
+        $output->writeln('Checking for go-transcode binary');
+
+        // Detect architecture
+        $arch = \OCA\Memories\Util::getArch();
+        $libc = \OCA\Memories\Util::getLibc();
+
+        if (!$arch || !$libc) {
+            $output->writeln('<error>Compatible go-transcode binary not found</error>');
+            $this->suggestGoTranscode($output);
+            return $this->suggestDisable($output);
+        }
+
+        $goTranscodePath = realpath(__DIR__."/../../exiftool-bin/go-transcode-{$arch}-{$libc}");
+        $output->writeln("Trying go-transcode from $goTranscodePath");
+
+        $goTranscode = shell_exec($goTranscodePath . ' --help');
+        if (!$goTranscode || false === strpos($goTranscode, 'Available Commands')) {
+            $output->writeln('<error>go-transcode could not be run</error>');
+            $this->suggestGoTranscode($output);
+            return $this->suggestDisable($output);
+        }
+
+        // Go transcode is working. Yay!
+        $output->writeln('go-transcode is installed!');
+        $output->writeln('');
+        $output->writeln('You can use transcoding and HLS streaming');
+        $output->writeln('This is recommended for better performance, but not for very slow systems');
+        $output->writeln('For more details see: https://github.com/pulsejet/memories/wiki/Configuration');
+        $output->writeln('');
+        $output->writeln('Do you want to enable transcoding and HLS? [Y/n]');
+
+        $handle = fopen('php://stdin', 'r');
+        $line = fgets($handle);
+        if ('n' === trim($line)) {
+            $this->config->setSystemValue('memories.no_transcode', true);
+            $output->writeln('<error>Transcoding and HLS are now disabled</error>');
+            return 0;
+        }
+
+        $this->config->setSystemValue('memories.transcoder', $goTranscodePath);
+        $this->config->setSystemValue('memories.no_transcode', false);
+        $output->writeln('Transcoding and HLS are now enabled!');
+
+        return 0;
+    }
+
+    protected function suggestGoTranscode(OutputInterface $output): void
+    {
+        $output->writeln('You may build go-transcode from source');
+        $output->writeln('It can be downloaded from https://github.com/pulsejet/go-transcode');
+        $output->writeln('Once built, point the path to the binary in the config for `memories.transcoder`');
+    }
+
+    protected function suggestDisable(OutputInterface $output) {
+        $output->writeln('Without transcoding, video playback may be slow and limited');
+        $output->writeln('Do you want to disable transcoding and HLS streaming? [y/N]');
+        $handle = fopen('php://stdin', 'r');
+        $line = fgets($handle);
+        if ('y' !== trim($line)) {
+            $output->writeln('Aborting');
+
+            return 1;
+        }
+
+        $this->config->setSystemValue('memories.no_transcode', true);
+        $output->writeln('<error>Transcoding and HLS are now disabled</error>');
+
+        return 0;
+    }
+}
diff --git a/lib/Exif.php b/lib/Exif.php
index fd16becd2..756a7ac20 100644
--- a/lib/Exif.php
+++ b/lib/Exif.php
@@ -269,28 +269,13 @@ private static function getExiftool()
         }
 
         // Detect architecture
-        $arch = null;
-        $uname = php_uname('m');
-        if (false !== stripos($uname, 'aarch64') || false !== stripos($uname, 'arm64')) {
-            $arch = 'aarch64';
-        } elseif (false !== stripos($uname, 'x86_64') || false !== stripos($uname, 'amd64')) {
-            $arch = 'amd64';
-        }
-
-        // Detect glibc or musl
-        $libc = null;
-        if ($ldd = shell_exec('ldd --version 2>&1')) {
-            if (false !== stripos($ldd, 'musl')) {
-                $libc = 'musl';
-            } elseif (false !== stripos($ldd, 'glibc')) {
-                $libc = 'glibc';
-            }
-        }
+        $arch = $noLocal ? null : \OCA\Memories\Util::getArch();
+        $libc = $noLocal ? null : \OCA\Memories\Util::getLibc();
 
         // Get static binary if available
         if ($arch && $libc && !$noLocal) {
             // get target file path
-            $path = __DIR__."/../exiftool-bin/exiftool-{$arch}-{$libc}";
+            $path = realpath(__DIR__."/../exiftool-bin/exiftool-{$arch}-{$libc}");
 
             // check if file exists
             if (file_exists($path)) {
diff --git a/lib/Util.php b/lib/Util.php
index b7d078fd7..d20b52ab2 100644
--- a/lib/Util.php
+++ b/lib/Util.php
@@ -14,6 +14,39 @@ class Util
 
     public static $ARCHIVE_FOLDER = '.archive';
 
+    /**
+     * Get host CPU architecture (amd64 or aarch64).
+     */
+    public static function getArch()
+    {
+        $uname = php_uname('m');
+        if (false !== stripos($uname, 'aarch64') || false !== stripos($uname, 'arm64')) {
+            return 'aarch64';
+        }
+        if (false !== stripos($uname, 'x86_64') || false !== stripos($uname, 'amd64')) {
+            return 'amd64';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the libc type for host (glibc or musl).
+     */
+    public static function getLibc()
+    {
+        if ($ldd = shell_exec('ldd --version 2>&1')) {
+            if (false !== stripos($ldd, 'musl')) {
+                return 'musl';
+            }
+            if (false !== stripos($ldd, 'glibc')) {
+                return 'glibc';
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Get the path to the user's configured photos directory.
      */
diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 925b73646..0ddac80f8 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,4 +17,11 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
+gotranscode="v0.0.1"
+wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-amd64-musl"
+wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-amd64-glibc"
+wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-aarch64-musl"
+wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-aarch64-glibc"
+chmod 755 go-transcode-*
+
 cd ..

From bae6662e37c96b5d922e818c195adba44f547cce Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 02:26:51 -0800
Subject: [PATCH 031/163] Start transcoding server

---
 lib/Command/VideoSetup.php         | 19 ++++++++--
 lib/Controller/VideoController.php | 50 ++++++++++++++++++++-----
 scripts/bundle.sh                  |  2 +-
 transcoder.yaml                    | 59 ++++++++++++++++++++++++++++++
 4 files changed, 116 insertions(+), 14 deletions(-)
 create mode 100644 transcoder.yaml

diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index a4c5630f7..abdb0eb3a 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -50,8 +50,14 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
+        // Check nohup binary
+        $nohup = shell_exec('nohup --version');
+        if (!$nohup || strpos($nohup, 'nohup') === false) {
+            $output->writeln('<error>nohup binary not found. Please install nohup.</error>');
+            return $this->suggestDisable($output);
+        }
+
         // Get ffmpeg version
-        $output->writeln('Checking for ffmpeg binary');
         $ffmpeg = shell_exec('ffmpeg -version');
         if (false === strpos($ffmpeg, 'ffmpeg version')) {
             $ffmpeg = null;
@@ -61,7 +67,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         // Get ffprobe version
-        $output->writeln('Checking for ffprobe binary');
         $ffprobe = shell_exec('ffprobe -version');
         if (false === strpos($ffprobe, 'ffprobe version')) {
             $ffprobe = null;
@@ -102,8 +107,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $output->writeln('go-transcode is installed!');
         $output->writeln('');
         $output->writeln('You can use transcoding and HLS streaming');
-        $output->writeln('This is recommended for better performance, but not for very slow systems');
-        $output->writeln('For more details see: https://github.com/pulsejet/memories/wiki/Configuration');
+        $output->writeln('This is recommended for better performance, but has implications if');
+        $output->writeln('you are using external storage or run Nextcloud on a slow system.');
+        $output->writeln('');
+        $output->writeln('Read the following documentation carefully before continuing:');
+        $output->writeln('https://github.com/pulsejet/memories/wiki/Configuration');
         $output->writeln('');
         $output->writeln('Do you want to enable transcoding and HLS? [Y/n]');
 
@@ -115,7 +123,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 0;
         }
 
+        $tConfig = realpath(__DIR__."/../../transcoder.yaml");
+
         $this->config->setSystemValue('memories.transcoder', $goTranscodePath);
+        $this->config->setSystemValue('memories.transcoder_config', $tConfig);
         $this->config->setSystemValue('memories.no_transcode', false);
         $output->writeln('Transcoding and HLS are now enabled!');
 
diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 72f90fdc6..463860a52 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -49,7 +49,7 @@ public function transcode(string $fileid, string $profile): Http\Response
         }
 
         // Make sure not running in read-only mode
-        if ($this->config->getSystemValue('memories.no_transcode', false)) {
+        if ($this->config->getSystemValue('memories.no_transcode', 'UNSET') !== false) {
             return new JSONResponse(['message' => 'Transcoding disabled'], Http::STATUS_FORBIDDEN);
         }
 
@@ -71,15 +71,35 @@ public function transcode(string $fileid, string $profile): Http\Response
             return new JSONResponse(['message' => 'File not found'], Http::STATUS_NOT_FOUND);
         }
 
+        // Check if file starts with temp dir
+        $tmpDir = sys_get_temp_dir();
+        if (0 === strpos($path, $tmpDir)) {
+            return new JSONResponse(['message' => 'File is in temp dir!'], Http::STATUS_NOT_FOUND);
+        }
+
         // Make upstream request
-        $ch = curl_init("http://localhost:9999/vod/{$path}/{$profile}");
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-        curl_setopt($ch, CURLOPT_HEADER, 0);
-        $data = curl_exec($ch);
-        $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
-        $returnCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+        [$data, $contentType, $returnCode] = $this->getUpstream($path, $profile);
+
+        // If status code was 0, it's likely the server is down
+        // Make one attempt to start if we can't find the process
+        if (0 === $returnCode) {
+            $transcoder = $this->config->getSystemValue('memories.transcoder', false);
+            $tConfig = $this->config->getSystemValue('memories.transcoder_config', false);
+            if (!$transcoder || !$tConfig) {
+                return new JSONResponse(['message' => 'Transcoder not configured'], Http::STATUS_INTERNAL_SERVER_ERROR);
+            }
+
+            // Check if already running
+            exec('ps a | grep go-transcode | grep -v grep', $procs);
+            if (0 === \count($procs)) {
+                shell_exec("mkdir -p $tmpDir/transcoder"); // php func has some weird problems
+                shell_exec("nohup $transcoder serve --config $tConfig > $tmpDir/transcoder/run.log 2>&1 & > /dev/null");
+            }
+
+            // wait for 2s and try again
+            sleep(2);
+            [$data, $contentType, $returnCode] = $this->getUpstream($path, $profile);
+        }
 
         // Check data was received
         if ($returnCode >= 400 || false === $data) {
@@ -94,4 +114,16 @@ public function transcode(string $fileid, string $profile): Http\Response
 
         return $response;
     }
+
+    private function getUpstream($path, $profile) {
+        $ch = curl_init("http://localhost:47788/vod/{$path}/{$profile}");
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        $data = curl_exec($ch);
+        $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+        $returnCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+        return [$data, $contentType, $returnCode];
+    }
 }
diff --git a/scripts/bundle.sh b/scripts/bundle.sh
index 39e33859f..03c634fbd 100755
--- a/scripts/bundle.sh
+++ b/scripts/bundle.sh
@@ -4,7 +4,7 @@ od=`pwd`
 
 rm -rf /tmp/memories
 mkdir -p /tmp/memories
-cp -R appinfo l10n img js lib templates COPYING README.md exiftest* composer* /tmp/memories
+cp -R appinfo l10n img js lib templates COPYING README.md transcoder.yaml exiftest* composer* /tmp/memories
 
 cd /tmp
 rm -f memories/appinfo/screencap* memories/js/*.map
diff --git a/transcoder.yaml b/transcoder.yaml
new file mode 100644
index 000000000..063b40e7f
--- /dev/null
+++ b/transcoder.yaml
@@ -0,0 +1,59 @@
+# allow debug outputs
+debug: false
+
+# mount debug pprof endpoint at /debug/pprof/
+pprof: false
+
+# bind server to IP:PORT (use :47788 for all connections)
+# DO NOT expose this port to the world
+bind: localhost:47788
+
+# X-Forwarded-For headers will be used to determine the client IP
+proxy: true
+
+# For static files
+vod:
+  # Root directory for media
+  media-dir: /
+
+  # Temporary transcode output directory, if empty, default tmp folder will be used
+  transcode-dir: /tmp/transcoder/data
+
+  # Available video profiles
+  # Do not change these
+  video-profiles:
+    360p:
+      width: 640 # px
+      height: 360 # px
+      bitrate: 800 # kbps
+    480p:
+      width: 640
+      height: 480
+      bitrate: 1200
+    720p:
+      width: 1280
+      height: 720
+      bitrate: 2800
+    1080p:
+      width: 1920
+      height: 1080
+      bitrate: 5000
+
+  # Use video keyframes as existing reference for chunks split
+  # Using this might cause long probing times in order to get
+  # all keyframes - therefore they should be cached
+  video-keyframes: false
+
+  # Single audio profile used
+  audio-profile:
+    bitrate: 192 # kbps
+
+  # If cache is enabled
+  cache: true
+  # If dir is empty, cache will be stored in the same directory as media source
+  # If not empty, cache files will be saved to specified directory
+  cache-dir: /tmp/transcoder/cache
+
+  # OPTIONAL: Use custom ffmpeg & ffprobe binary paths
+  ffmpeg-binary: ffmpeg
+  ffprobe-binary: ffprobe

From 567d20a165d59900d6cfc9db4aad2cfbfe202cfb Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 02:42:42 -0800
Subject: [PATCH 032/163] Add transcode checks

---
 lib/Command/VideoSetup.php          | 16 ++++++++-----
 lib/Controller/PageController.php   |  3 +++
 lib/Controller/PublicController.php | 12 ++++++++++
 lib/Controller/VideoController.php  | 10 +++++----
 src/components/PsVideo.ts           | 35 ++++++++++++++++++++++++-----
 5 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index abdb0eb3a..719d414a5 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -52,8 +52,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         // Check nohup binary
         $nohup = shell_exec('nohup --version');
-        if (!$nohup || strpos($nohup, 'nohup') === false) {
+        if (!$nohup || false === strpos($nohup, 'nohup')) {
             $output->writeln('<error>nohup binary not found. Please install nohup.</error>');
+
             return $this->suggestDisable($output);
         }
 
@@ -77,6 +78,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         if (null === $ffmpeg || null === $ffprobe) {
             $output->writeln('ffmpeg and ffprobe are required for video transcoding');
+
             return $this->suggestDisable($output);
         }
 
@@ -90,16 +92,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if (!$arch || !$libc) {
             $output->writeln('<error>Compatible go-transcode binary not found</error>');
             $this->suggestGoTranscode($output);
+
             return $this->suggestDisable($output);
         }
 
         $goTranscodePath = realpath(__DIR__."/../../exiftool-bin/go-transcode-{$arch}-{$libc}");
-        $output->writeln("Trying go-transcode from $goTranscodePath");
+        $output->writeln("Trying go-transcode from {$goTranscodePath}");
 
-        $goTranscode = shell_exec($goTranscodePath . ' --help');
+        $goTranscode = shell_exec($goTranscodePath.' --help');
         if (!$goTranscode || false === strpos($goTranscode, 'Available Commands')) {
             $output->writeln('<error>go-transcode could not be run</error>');
             $this->suggestGoTranscode($output);
+
             return $this->suggestDisable($output);
         }
 
@@ -120,10 +124,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if ('n' === trim($line)) {
             $this->config->setSystemValue('memories.no_transcode', true);
             $output->writeln('<error>Transcoding and HLS are now disabled</error>');
+
             return 0;
         }
 
-        $tConfig = realpath(__DIR__."/../../transcoder.yaml");
+        $tConfig = realpath(__DIR__.'/../../transcoder.yaml');
 
         $this->config->setSystemValue('memories.transcoder', $goTranscodePath);
         $this->config->setSystemValue('memories.transcoder_config', $tConfig);
@@ -140,7 +145,8 @@ protected function suggestGoTranscode(OutputInterface $output): void
         $output->writeln('Once built, point the path to the binary in the config for `memories.transcoder`');
     }
 
-    protected function suggestDisable(OutputInterface $output) {
+    protected function suggestDisable(OutputInterface $output)
+    {
         $output->writeln('Without transcoding, video playback may be slow and limited');
         $output->writeln('Do you want to disable transcoding and HLS streaming? [y/N]');
         $handle = fopen('php://stdin', 'r');
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 2da07c25b..8097d7218 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -91,6 +91,9 @@ public function main()
         // App version
         $this->initialState->provideInitialState('version', $this->appManager->getAppInfo('memories')['version']);
 
+        // Video configuration
+        $this->initialState->provideInitialState('notranscode', $this->config->getSystemValue('memories.no_transcode', 'UNSET'));
+
         $policy = new ContentSecurityPolicy();
         $policy->addAllowedWorkerSrcDomain("'self'");
         $policy->addAllowedScriptDomain("'self'");
diff --git a/lib/Controller/PublicController.php b/lib/Controller/PublicController.php
index 1e6eaa9f1..e546742a5 100644
--- a/lib/Controller/PublicController.php
+++ b/lib/Controller/PublicController.php
@@ -105,10 +105,22 @@ public function showShare(): TemplateResponse
         // App version
         $this->initialState->provideInitialState('version', $this->appManager->getAppInfo('memories')['version']);
 
+        // Video configuration
+        $this->initialState->provideInitialState('notranscode', $this->config->getSystemValue('memories.no_transcode', 'UNSET'));
+
         $policy = new ContentSecurityPolicy();
         $policy->addAllowedWorkerSrcDomain("'self'");
         $policy->addAllowedScriptDomain("'self'");
 
+        // Video player
+        $policy->addAllowedWorkerSrcDomain('blob:');
+        $policy->addAllowedScriptDomain('blob:');
+        $policy->addAllowedMediaDomain('blob:');
+
+        // Allow nominatim for metadata
+        $policy->addAllowedConnectDomain('nominatim.openstreetmap.org');
+        $policy->addAllowedFrameDomain('www.openstreetmap.org');
+
         $response = new TemplateResponse($this->appName, 'main');
         $response->setContentSecurityPolicy($policy);
 
diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 463860a52..28f7b7d08 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -49,7 +49,7 @@ public function transcode(string $fileid, string $profile): Http\Response
         }
 
         // Make sure not running in read-only mode
-        if ($this->config->getSystemValue('memories.no_transcode', 'UNSET') !== false) {
+        if (false !== $this->config->getSystemValue('memories.no_transcode', 'UNSET')) {
             return new JSONResponse(['message' => 'Transcoding disabled'], Http::STATUS_FORBIDDEN);
         }
 
@@ -92,8 +92,8 @@ public function transcode(string $fileid, string $profile): Http\Response
             // Check if already running
             exec('ps a | grep go-transcode | grep -v grep', $procs);
             if (0 === \count($procs)) {
-                shell_exec("mkdir -p $tmpDir/transcoder"); // php func has some weird problems
-                shell_exec("nohup $transcoder serve --config $tConfig > $tmpDir/transcoder/run.log 2>&1 & > /dev/null");
+                shell_exec("mkdir -p {$tmpDir}/transcoder"); // php func has some weird problems
+                shell_exec("nohup {$transcoder} serve --config {$tConfig} > {$tmpDir}/transcoder/run.log 2>&1 & > /dev/null");
             }
 
             // wait for 2s and try again
@@ -115,7 +115,8 @@ public function transcode(string $fileid, string $profile): Http\Response
         return $response;
     }
 
-    private function getUpstream($path, $profile) {
+    private function getUpstream($path, $profile)
+    {
         $ch = curl_init("http://localhost:47788/vod/{$path}/{$profile}");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
@@ -124,6 +125,7 @@ private function getUpstream($path, $profile) {
         $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
         $returnCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
         curl_close($ch);
+
         return [$data, $contentType, $returnCode];
     }
 }
diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 12ede6aaa..cef0bee7c 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -1,11 +1,18 @@
 import PhotoSwipe from "photoswipe";
 import { generateUrl } from "@nextcloud/router";
+import { loadState } from "@nextcloud/initial-state";
 
 import videojs from "video.js";
 import "video.js/dist/video-js.min.css";
 import "videojs-contrib-quality-levels";
 import "videojs-hls-quality-selector";
 
+const config_noTranscode = loadState(
+  "memories",
+  "notranscode",
+  <string>"UNSET"
+) as boolean | string;
+
 /**
  * Check if slide has video content
  *
@@ -71,10 +78,11 @@ class VideoContentSetup {
     // do not append video on nearby slides
     pswp.on("appendHeavy", (e) => {
       if (isVideoContent(e.slide)) {
+        const content = <any>e.slide.content;
+
         if (!e.slide.isActive) {
           e.preventDefault();
-        } else {
-          const content = <any>e.slide.content;
+        } else if (content.videoElement) {
           const fileid = content.data.photo.fileid;
 
           // Create hls sources if enabled
@@ -82,10 +90,13 @@ class VideoContentSetup {
           const baseUrl = generateUrl(
             `/apps/memories/api/video/transcode/${fileid}`
           );
-          hlsSources.push({
-            src: `${baseUrl}/index.m3u8`,
-            type: "application/x-mpegURL",
-          });
+
+          if (!config_noTranscode) {
+            hlsSources.push({
+              src: `${baseUrl}/index.m3u8`,
+              type: "application/x-mpegURL",
+            });
+          }
 
           const overrideNative = !videojs.browser.IS_SAFARI;
           content.videojs = videojs(content.videoElement, {
@@ -246,6 +257,18 @@ class VideoContentSetup {
       return;
     }
 
+    if (config_noTranscode === "UNSET") {
+      content.element = document.createElement("div");
+      content.element.innerHTML =
+        "Video not configured. Run occ memories:video-setup";
+      content.element.style.color = "red";
+      content.element.style.display = "flex";
+      content.element.style.alignItems = "center";
+      content.element.style.justifyContent = "center";
+      content.onLoaded();
+      return;
+    }
+
     content.state = "loading";
     content.type = "video"; // TODO: move this to pswp core?
 

From d0d63b6894c045db53a691a5adf99051dc234fe4 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 03:07:05 -0800
Subject: [PATCH 033/163] Update docs

---
 CHANGELOG.md     | 3 +++
 README.md        | 3 ++-
 appinfo/info.xml | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24701ea15..f87277347 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ This file is manually updated. Please file an issue if something is missing.
 ## v4.7.0, v3.7.0
 
 - **Note**: you must run `occ memories:index -f` to take advantage of new features.
+- **Massively improved video performance**
+  - Memories now comes with a dedicated transcoding server with HLS support.
+  - Read the documentation [here](https://github.com/pulsejet/memories/wiki/Configuration#video-transcoding) carefully for more details.
 - **Feature**: show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
 
 ## v4.6.1, v3.6.1 (2022-11-07)
diff --git a/README.md b/README.md
index 7deafd316..4d5574c85 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,8 @@ Memories is a _batteries-included_ photo management solution for Nextcloud with
 - **📱 Mobile Support**: Works on devices of any shape and size through the web app.
 - **✏️ Edit Metadata**: Edit dates on photos quickly and easily.
 - **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.
-- **⚡️ Performance**: Memories is extremely fast.
+- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.
+- **⚡️ Performance**: In general, Memories is extremely fast.
 
 ## 🌐 Online Demo
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index d6e2f50c4..835049a56 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -7,7 +7,7 @@
 <description><![CDATA[
 # Memories
 
-Memories is a batteries-included photo management solution for Nextcloud with advanced features including:
+Memories is a *batteries-included* photo management solution for Nextcloud with advanced features including:
 
 - **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.
 - **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.
@@ -17,7 +17,8 @@ Memories is a batteries-included photo management solution for Nextcloud with ad
 - **📱 Mobile Support**: Works on devices of any shape and size through the web app.
 - **✏️ Edit Metadata**: Edit dates on photos quickly and easily.
 - **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.
-- **⚡️ Performance**: Memories is extremely fast.
+- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.
+- **⚡️ Performance**: In general, Memories is extremely fast.
 
 ## 🌐 Online Demo
 

From 8bd903b1e4b99ea520fc6578d1308a713745d4ac Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 03:09:08 -0800
Subject: [PATCH 034/163] release: v4.7.0-alpha

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 835049a56..4f15f99e2 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.6.2</version>
+    <version>4.7.0-alpha</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From c10ad711f79a9dab1b42ab7492a2bfbbe145ab1b Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 03:21:50 -0800
Subject: [PATCH 035/163] chmod on go-transcode

---
 lib/Command/VideoSetup.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index 719d414a5..e7daefd7c 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -98,6 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $goTranscodePath = realpath(__DIR__."/../../exiftool-bin/go-transcode-{$arch}-{$libc}");
         $output->writeln("Trying go-transcode from {$goTranscodePath}");
+        chmod($goTranscodePath, 0755);
 
         $goTranscode = shell_exec($goTranscodePath.' --help');
         if (!$goTranscode || false === strpos($goTranscode, 'Available Commands')) {

From 9d5a431c0702a3ed2db599a892faeb4ea5766d96 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 06:21:17 -0800
Subject: [PATCH 036/163] Add QSV env var

---
 lib/Command/VideoSetup.php         | 24 ++++++++++++++++++------
 lib/Controller/VideoController.php |  9 ++++++++-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index e7daefd7c..752858c98 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -120,9 +120,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $output->writeln('');
         $output->writeln('Do you want to enable transcoding and HLS? [Y/n]');
 
-        $handle = fopen('php://stdin', 'r');
-        $line = fgets($handle);
-        if ('n' === trim($line)) {
+        if ('n' === trim(fgets(fopen('php://stdin', 'r')))) {
             $this->config->setSystemValue('memories.no_transcode', true);
             $output->writeln('<error>Transcoding and HLS are now disabled</error>');
 
@@ -136,6 +134,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $this->config->setSystemValue('memories.no_transcode', false);
         $output->writeln('Transcoding and HLS are now enabled!');
 
+        // Check for VAAPI
+        $output->writeln("\nChecking for QSV (/dev/dri/renderD128)");
+        if (file_exists('/dev/dri/renderD128')) {
+            $output->writeln('QSV is available. Do you want to enable it? [Y/n]');
+
+            if ('n' === trim(fgets(fopen('php://stdin', 'r')))) {
+                $this->config->setSystemValue('memories.qsv', false);
+                $output->writeln('QSV is now disabled');
+            } else {
+                $this->config->setSystemValue('memories.qsv', true);
+            }
+        } else {
+            $output->writeln('QSV is not available');
+            $this->config->setSystemValue('memories.qsv', false);
+        }
+
         return 0;
     }
 
@@ -150,9 +164,7 @@ protected function suggestDisable(OutputInterface $output)
     {
         $output->writeln('Without transcoding, video playback may be slow and limited');
         $output->writeln('Do you want to disable transcoding and HLS streaming? [y/N]');
-        $handle = fopen('php://stdin', 'r');
-        $line = fgets($handle);
-        if ('y' !== trim($line)) {
+        if ('y' !== trim(fgets(fopen('php://stdin', 'r')))) {
             $output->writeln('Aborting');
 
             return 1;
diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 28f7b7d08..f1332cefc 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -89,11 +89,18 @@ public function transcode(string $fileid, string $profile): Http\Response
                 return new JSONResponse(['message' => 'Transcoder not configured'], Http::STATUS_INTERNAL_SERVER_ERROR);
             }
 
+            // Check for environment variables
+            $vaapi = $this->config->getSystemValue('memories.qsv', false);
+            $env = '';
+            if ($vaapi) {
+                $env .= 'VAAPI=1 ';
+            }
+
             // Check if already running
             exec('ps a | grep go-transcode | grep -v grep', $procs);
             if (0 === \count($procs)) {
                 shell_exec("mkdir -p {$tmpDir}/transcoder"); // php func has some weird problems
-                shell_exec("nohup {$transcoder} serve --config {$tConfig} > {$tmpDir}/transcoder/run.log 2>&1 & > /dev/null");
+                shell_exec("{$env} nohup {$transcoder} serve --config {$tConfig} > {$tmpDir}/transcoder/run.log 2>&1 & > /dev/null");
             }
 
             // wait for 2s and try again

From b4b461dd7658f3b825dc716330296f60c3d17de2 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 06:25:22 -0800
Subject: [PATCH 037/163] Update transcoder

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 0ddac80f8..3b0466ebc 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-gotranscode="v0.0.1"
+gotranscode="v0.0.2"
 wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-amd64-musl"
 wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-amd64-glibc"
 wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-aarch64-musl"

From 2f5a14c431fef75eb210906d4b9a4a8be64cab78 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 06:25:35 -0800
Subject: [PATCH 038/163] release: v4.7.0-alpha.1

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 4f15f99e2..a589cea32 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-alpha</version>
+    <version>4.7.0-alpha.1</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From 26a936ba13f7f636541da41a63b108329d924281 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 12:12:43 -0800
Subject: [PATCH 039/163] Fix vertical video

---
 src/components/PsVideo.ts | 66 +++++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index cef0bee7c..984a639ad 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -1,6 +1,7 @@
 import PhotoSwipe from "photoswipe";
 import { generateUrl } from "@nextcloud/router";
 import { loadState } from "@nextcloud/initial-state";
+import axios from "@nextcloud/axios";
 
 import videojs from "video.js";
 import "video.js/dist/video-js.min.css";
@@ -86,29 +87,28 @@ class VideoContentSetup {
           const fileid = content.data.photo.fileid;
 
           // Create hls sources if enabled
-          let hlsSources = [];
+          let sources: any[] = [];
           const baseUrl = generateUrl(
             `/apps/memories/api/video/transcode/${fileid}`
           );
 
           if (!config_noTranscode) {
-            hlsSources.push({
+            sources.push({
               src: `${baseUrl}/index.m3u8`,
               type: "application/x-mpegURL",
             });
           }
 
+          sources.push({
+            src: e.slide.data.src,
+          });
+
           const overrideNative = !videojs.browser.IS_SAFARI;
           content.videojs = videojs(content.videoElement, {
-            fluid: true,
+            fill: true,
             autoplay: true,
             controls: true,
-            sources: [
-              ...hlsSources,
-              {
-                src: e.slide.data.src,
-              },
-            ],
+            sources: sources,
             preload: "metadata",
             playbackRates: [0.5, 1, 1.5, 2],
             responsive: true,
@@ -122,16 +122,15 @@ class VideoContentSetup {
             },
           });
 
-          content.videojs.on("error", function () {
-            if (this.error().code === 4) {
-              if (this.src().includes("m3u8")) {
+          content.videojs.on("error", () => {
+            if (content.videojs.error().code === 4) {
+              if (content.videojs.src().includes("m3u8")) {
                 // HLS could not be streamed
                 console.error("Video.js: HLS stream could not be opened.");
-                this.src({
+                content.videojs.src({
                   src: e.slide.data.src,
                 });
-                this.options().html5.nativeAudioTracks = true;
-                this.options().html5.nativeVideoTracks = true;
+                this.updateRotation(content, 0);
               }
             }
           });
@@ -150,7 +149,17 @@ class VideoContentSetup {
               });
           }, 500);
 
-          globalThis.videojs = content.videojs;
+          // Get correct orientation
+          axios
+            .get<any>(
+              generateUrl("/apps/memories/api/info/{id}", {
+                id: content.data.photo.fileid,
+              })
+            )
+            .then((response) => {
+              content.data.exif = response.data?.exif;
+              this.updateRotation(content);
+            });
         }
       }
     });
@@ -172,6 +181,29 @@ class VideoContentSetup {
     });
   }
 
+  updateRotation(content, val?: number) {
+    const rotation = val ?? Number(content.data.exif?.Rotation);
+    const shouldRotate = content.videojs?.src().includes("m3u8");
+    console.log("Video.js: Rotation", rotation, shouldRotate);
+    if (rotation && shouldRotate) {
+      let transform = `rotate(${rotation}deg)`;
+
+      if (rotation === 90 || rotation === 270) {
+        content.videoElement.style.width = content.element.style.height;
+        content.videoElement.style.height = content.element.style.width;
+
+        transform = `translateY(-${content.element.style.width}) ${transform}`;
+        content.videoElement.style.transformOrigin = "bottom left";
+      }
+
+      content.videoElement.style.transform = transform;
+    } else {
+      content.videoElement.style.transform = "none";
+      content.videoElement.style.width = "100%";
+      content.videoElement.style.height = "100%";
+    }
+  }
+
   onContentDestroy({ content }) {
     if (isVideoContent(content)) {
       if (content._videoPosterImg) {
@@ -206,6 +238,8 @@ class VideoContentSetup {
         placeholderElStyle.width = width + "px";
         placeholderElStyle.height = height + "px";
       }
+
+      this.updateRotation(content);
     }
   }
 

From 593248b0024a07b0c9eccd852970423d33911944 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 12:17:18 -0800
Subject: [PATCH 040/163] Update transcoder version

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 3b0466ebc..44217fc2b 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-gotranscode="v0.0.2"
+gotranscode="v0.0.3"
 wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-amd64-musl"
 wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-amd64-glibc"
 wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-aarch64-musl"

From c85e8870b788b9d05d6c7a36377ae47a96a855ca Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 12:59:55 -0800
Subject: [PATCH 041/163] videoc: escape path

---
 lib/Controller/VideoController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index f1332cefc..b06c97aee 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -124,6 +124,7 @@ public function transcode(string $fileid, string $profile): Http\Response
 
     private function getUpstream($path, $profile)
     {
+        $path = rawurlencode($path);
         $ch = curl_init("http://localhost:47788/vod/{$path}/{$profile}");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

From faa08662291c74e515439d50503fefa20f0e7c39 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 13:05:05 -0800
Subject: [PATCH 042/163] video: curl use IP

---
 lib/Controller/VideoController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index b06c97aee..07ada0438 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -125,7 +125,7 @@ public function transcode(string $fileid, string $profile): Http\Response
     private function getUpstream($path, $profile)
     {
         $path = rawurlencode($path);
-        $ch = curl_init("http://localhost:47788/vod/{$path}/{$profile}");
+        $ch = curl_init("http://127.0.0.1:47788/vod/{$path}/{$profile}");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
         curl_setopt($ch, CURLOPT_HEADER, 0);

From 699901c24336e9dfd554ecfec8400616e48b2674 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 18:21:56 -0800
Subject: [PATCH 043/163] Contain images without dims (#176)

---
 src/components/Viewer.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 5e14d37be..c3baa61f6 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -470,7 +470,8 @@ export default class Viewer extends Mixins(GlobalMixin) {
     // Get the thumbnail image
     this.photoswipe.addFilter("thumbEl", (thumbEl, data, index) => {
       const photo = this.list[index - this.globalAnchor];
-      if (!photo || photo.flag & this.c.FLAG_IS_VIDEO) return thumbEl;
+      if (!photo || !photo.w || !photo.h || photo.flag & this.c.FLAG_IS_VIDEO)
+        return thumbEl;
       return this.thumbElem(photo) || thumbEl;
     });
 
@@ -840,6 +841,10 @@ export default class Viewer extends Mixins(GlobalMixin) {
     width: 100%;
   }
 
+  img.pswp__img {
+    object-fit: contain;
+  }
+
   .pswp__button {
     color: white;
 

From c6766833b59a6bf00dd6f564f23837cd339c13ce Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 18:31:10 -0800
Subject: [PATCH 044/163] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f87277347..dc07282b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This file is manually updated. Please file an issue if something is missing.
   - Memories now comes with a dedicated transcoding server with HLS support.
   - Read the documentation [here](https://github.com/pulsejet/memories/wiki/Configuration#video-transcoding) carefully for more details.
 - **Feature**: show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
+- Fix stretched images in viewer ([#176](https://github.com/pulsejet/memories/issues/176))
 
 ## v4.6.1, v3.6.1 (2022-11-07)
 

From 124badd3d0df16b9832b83aaec701a59154df220 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Thu, 10 Nov 2022 03:20:56 +0000
Subject: [PATCH 045/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/bg.js      | 11 +++++++++++
 l10n/bg.json    | 11 +++++++++++
 l10n/cs.js      |  1 -
 l10n/cs.json    |  1 -
 l10n/de_DE.js   |  1 -
 l10n/de_DE.json |  1 -
 l10n/es.js      |  1 -
 l10n/es.json    |  1 -
 l10n/hu.js      |  1 +
 l10n/hu.json    |  1 +
 l10n/lv.js      | 13 +++++++++++++
 l10n/lv.json    | 13 +++++++++++++
 l10n/tr.js      |  1 -
 l10n/tr.json    |  1 -
 l10n/uk.js      |  1 -
 l10n/uk.json    |  1 -
 l10n/zh_HK.js   |  1 -
 l10n/zh_HK.json |  1 -
 l10n/zh_TW.js   |  1 -
 l10n/zh_TW.json |  1 -
 20 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/l10n/bg.js b/l10n/bg.js
index 9ea908b29..1c5af1385 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Tags" : "Етикети",
     "Maps" : "Карти",
     "Settings" : "Настройки",
+    "EXIF" : "EXIF стандарт",
     "A better photos experience awaits you" : "Очаква ви по-добро изживяване при управлението на снимки",
     "Choose the root folder of your timeline to begin" : "Изберете основната папка на вашата времева линия /хронология/, за да започнете",
     "If you just installed Memories, run:" : "Ако току-що сте инсталирали приложението Спомени, стартирайте:",
@@ -24,6 +25,7 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Изберете основата /началото/ на вашата времева линия ",
     "The selected folder does not seem to be valid. Try again." : "Избраната папка изглежда не е валидна. Опитайте отново.",
     "Found {total} photos in {path}" : "Намерени са {total} снимки в {path}",
+    "Image saved successfully" : "Успешно запазено изображение",
     "Error saving image" : "Грешка при запазване на изображение",
     "Unsaved changes" : "Незаписани промени",
     "Drop changes" : "Игнориране на промените",
@@ -54,6 +56,8 @@ OC.L10N.register(
     "Failed to load some photos" : "Неуспешно зареждане на някои снимки",
     "Share" : "Споделяне",
     "Sidebar" : "Странична лента",
+    "Video sharing not supported yet" : "Видео споделянето все още не се поддържа",
+    "Cannot share this type of data" : "Този тип данни не може да се споделят",
     "Processing … {n}/{m}" : "Обработва се ... {n}/{m}",
     "{n} photos added to album" : "{n} снимки са добавени в албума",
     "Search for collaborators" : "Търсене на сътрудници",
@@ -117,6 +121,10 @@ OC.L10N.register(
     "Failed to move {name}." : "Неуспешно преместване на {name}.",
     "Move selected photos to person" : "Преместване на избрани снимки към лице",
     "Are you sure you want to move the selected photos from {name} to {newName}?" : "Сигурни ли сте, че искате да преместите избраните снимки от {name} в {newName}?",
+    "Share Folder" : "Споделяне на папка",
+    "You cannot share the root folder" : "Не можете да споделите основната папка",
+    "Use the sidebar to share this folder." : "Използвайне на страничната лента, за споделяне на тази папка.",
+    "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Ако създадете публично споделяне на връзка, щракнете върху Опресняване и съответна връзка към приложението Спомени ще бъде показана по-долу.",
     "Refresh" : "Опресняване",
     "Share album" : "Споделяне на албум",
     "Delete album" : "Изтриване на албум",
@@ -209,13 +217,16 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Обърнете внимание, че избраната област за изрязване е по-ниска от приложеното преоразмеряване, което може да доведе до влошаване на качеството",
     "Actual size (100%)" : "Действителен размер (100%)",
     "Fit size" : "Подходящ размер",
+    "Shared Folder" : "Споделена папка",
     "Failed to create {albumName}." : "Неуспешно създаване на {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименуване от {currentAlbumName} на {newAlbumName}.",
     "General Failure" : "Грешка от общ характер",
     "Error: {msg}" : "Грешка: {msg}",
     "Failed to delete files." : "Неуспешно изтриване на файлове.",
     "Failed to delete {fileName}." : "Неуспешно изтриване на {fileName}.",
+    "Failed to download some files." : "Неуспешно изтегляне на някои файлове.",
     "Failed to favorite files." : "Неуспешно добавяне на файлове в любими.",
+    "Failed to favorite some files." : "Неуспешно добавяне на някой файлове в любими.",
     "Failed to favorite {fileName}." : "Неуспешно добавяне на {fileName} в любими."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/bg.json b/l10n/bg.json
index 1b2cea120..022cb4efe 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -12,6 +12,7 @@
     "Tags" : "Етикети",
     "Maps" : "Карти",
     "Settings" : "Настройки",
+    "EXIF" : "EXIF стандарт",
     "A better photos experience awaits you" : "Очаква ви по-добро изживяване при управлението на снимки",
     "Choose the root folder of your timeline to begin" : "Изберете основната папка на вашата времева линия /хронология/, за да започнете",
     "If you just installed Memories, run:" : "Ако току-що сте инсталирали приложението Спомени, стартирайте:",
@@ -22,6 +23,7 @@
     "Choose the root of your timeline" : "Изберете основата /началото/ на вашата времева линия ",
     "The selected folder does not seem to be valid. Try again." : "Избраната папка изглежда не е валидна. Опитайте отново.",
     "Found {total} photos in {path}" : "Намерени са {total} снимки в {path}",
+    "Image saved successfully" : "Успешно запазено изображение",
     "Error saving image" : "Грешка при запазване на изображение",
     "Unsaved changes" : "Незаписани промени",
     "Drop changes" : "Игнориране на промените",
@@ -52,6 +54,8 @@
     "Failed to load some photos" : "Неуспешно зареждане на някои снимки",
     "Share" : "Споделяне",
     "Sidebar" : "Странична лента",
+    "Video sharing not supported yet" : "Видео споделянето все още не се поддържа",
+    "Cannot share this type of data" : "Този тип данни не може да се споделят",
     "Processing … {n}/{m}" : "Обработва се ... {n}/{m}",
     "{n} photos added to album" : "{n} снимки са добавени в албума",
     "Search for collaborators" : "Търсене на сътрудници",
@@ -115,6 +119,10 @@
     "Failed to move {name}." : "Неуспешно преместване на {name}.",
     "Move selected photos to person" : "Преместване на избрани снимки към лице",
     "Are you sure you want to move the selected photos from {name} to {newName}?" : "Сигурни ли сте, че искате да преместите избраните снимки от {name} в {newName}?",
+    "Share Folder" : "Споделяне на папка",
+    "You cannot share the root folder" : "Не можете да споделите основната папка",
+    "Use the sidebar to share this folder." : "Използвайне на страничната лента, за споделяне на тази папка.",
+    "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Ако създадете публично споделяне на връзка, щракнете върху Опресняване и съответна връзка към приложението Спомени ще бъде показана по-долу.",
     "Refresh" : "Опресняване",
     "Share album" : "Споделяне на албум",
     "Delete album" : "Изтриване на албум",
@@ -207,13 +215,16 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Обърнете внимание, че избраната област за изрязване е по-ниска от приложеното преоразмеряване, което може да доведе до влошаване на качеството",
     "Actual size (100%)" : "Действителен размер (100%)",
     "Fit size" : "Подходящ размер",
+    "Shared Folder" : "Споделена папка",
     "Failed to create {albumName}." : "Неуспешно създаване на {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименуване от {currentAlbumName} на {newAlbumName}.",
     "General Failure" : "Грешка от общ характер",
     "Error: {msg}" : "Грешка: {msg}",
     "Failed to delete files." : "Неуспешно изтриване на файлове.",
     "Failed to delete {fileName}." : "Неуспешно изтриване на {fileName}.",
+    "Failed to download some files." : "Неуспешно изтегляне на някои файлове.",
     "Failed to favorite files." : "Неуспешно добавяне на файлове в любими.",
+    "Failed to favorite some files." : "Неуспешно добавяне на някой файлове в любими.",
     "Failed to favorite {fileName}." : "Неуспешно добавяне на {fileName} в любими."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/cs.js b/l10n/cs.js
index 87fe08aa7..9e5222e4b 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Memories" : "Vzpomínky",
     "Yet another photo management app" : "Další z aplikací pro správu fotek",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Vzpomínky\n\n# Vzpomínky je aplikace pro správu fotek v rámci Nextcloud, nabízející pokročilé funkce jako jsou:\n\n- **📸 Časová osa**: Řadí fotky a videa podle data pořízení, získaného z Exif metadat.\n- **⏪ Převíjení**: Během okamžiku přeskočte na kdykoli v minulosti oživte své vzpomínky.\n- **🤖 Opatřování štítky pomocí strojového učení**: Seskupujte fotky podle lidí a objektů na nich (založeno na aplikaci [Rozpoznat](https://github.com/nextcloud/recognize).\n- **🖼️ Alba**: Vytvářejte alba a seskupujte tak fotky a videa. Pak je sdílejte s ostatními.\n- **🫱🏻‍🫲🏻 Externí sdílení**: Sdílejte fotky a videa s lidmi mimo vámi využívanou instanci Nextcloud.\n- **📱 Podpora mobilních platforem**: Funguje na zařízeních různých podob a velikostí prostřednictvím webové aplikace.\n- **✏️ Úprava metadat**: Pohotově a snadno upravujte data fotek.\n- **📦 Archiv**: Fotky, kterými nechcete znepřehledňovat časovou osu ukládejte do oddělené složky.\n- **⚡️ Výkon**: Aplikace vzpomínky je velmi rychlá.\n\n## 🌐 Ukázka na Internetu\n\n- Pro získání představy jak vzpomínky vypadají a jak se ovládají, podívejte se na [veřejnou ukázku](https://memories-demo.radialapps.com/apps/memories/).\n- Tato ukázka je pouze pro čtení a může být pomalá (je provozováno na virt. stroji v rámci bezplatné úrovně na službě [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Fotky pocházejí ze služby [Unsplash](https://unsplash.com/) (autorství jednotlivých snímků viz každá ze složek).\n\n## 🚀 Instalace\n\n1. Nainstalujte aplikaci z Nextcloud katalogu aplikací.\n1. Proveďte doporučené [kroky nastavení](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Spusťte příkaz `php ./occ memories:index` a vytvořte tak rejstříky metadat pro stávající fotky.\n1. Otevřete aplikaci 📷 Vzpomínky v Nextcloud a nastavte která složka obsahuje vaše fotky.",
     "Timeline" : "Časová osa",
     "Folders" : "Složky",
     "Favorites" : "Oblíbené",
diff --git a/l10n/cs.json b/l10n/cs.json
index 2f8a3320c..e3bb39ed5 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Memories" : "Vzpomínky",
     "Yet another photo management app" : "Další z aplikací pro správu fotek",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Vzpomínky\n\n# Vzpomínky je aplikace pro správu fotek v rámci Nextcloud, nabízející pokročilé funkce jako jsou:\n\n- **📸 Časová osa**: Řadí fotky a videa podle data pořízení, získaného z Exif metadat.\n- **⏪ Převíjení**: Během okamžiku přeskočte na kdykoli v minulosti oživte své vzpomínky.\n- **🤖 Opatřování štítky pomocí strojového učení**: Seskupujte fotky podle lidí a objektů na nich (založeno na aplikaci [Rozpoznat](https://github.com/nextcloud/recognize).\n- **🖼️ Alba**: Vytvářejte alba a seskupujte tak fotky a videa. Pak je sdílejte s ostatními.\n- **🫱🏻‍🫲🏻 Externí sdílení**: Sdílejte fotky a videa s lidmi mimo vámi využívanou instanci Nextcloud.\n- **📱 Podpora mobilních platforem**: Funguje na zařízeních různých podob a velikostí prostřednictvím webové aplikace.\n- **✏️ Úprava metadat**: Pohotově a snadno upravujte data fotek.\n- **📦 Archiv**: Fotky, kterými nechcete znepřehledňovat časovou osu ukládejte do oddělené složky.\n- **⚡️ Výkon**: Aplikace vzpomínky je velmi rychlá.\n\n## 🌐 Ukázka na Internetu\n\n- Pro získání představy jak vzpomínky vypadají a jak se ovládají, podívejte se na [veřejnou ukázku](https://memories-demo.radialapps.com/apps/memories/).\n- Tato ukázka je pouze pro čtení a může být pomalá (je provozováno na virt. stroji v rámci bezplatné úrovně na službě [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Fotky pocházejí ze služby [Unsplash](https://unsplash.com/) (autorství jednotlivých snímků viz každá ze složek).\n\n## 🚀 Instalace\n\n1. Nainstalujte aplikaci z Nextcloud katalogu aplikací.\n1. Proveďte doporučené [kroky nastavení](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Spusťte příkaz `php ./occ memories:index` a vytvořte tak rejstříky metadat pro stávající fotky.\n1. Otevřete aplikaci 📷 Vzpomínky v Nextcloud a nastavte která složka obsahuje vaše fotky.",
     "Timeline" : "Časová osa",
     "Folders" : "Složky",
     "Favorites" : "Oblíbené",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index dcfaa033f..a926fdea6 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Memories" : "Erinnerungen",
     "Yet another photo management app" : "Eine weitere Foto-Management-App",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Erinnerungen\n\nErinnerungen (Memories) ist eine Fotoverwaltungs-App für Nextcloud mit erweiterten Funktionen, darunter:\n\n- **📸 Zeitleiste**: Fotos und Videos nach Aufnahmedatum sortieren, ausgelesen aus Exif-Daten.\n- **⏪ Zurückspulen**: Springen Sie sofort zu einem beliebigen Zeitpunkt in der Vergangenheit und erleben Sie Ihre Erinnerungen erneut.\n- **🤖 KI-Markierung**: Gruppieren Sie Fotos nach Personen und Objekten mithilfe von KI, unterstützt von [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Alben**: Erstellen Sie Alben, um Fotos und Videos zu gruppieren. Dann teilen Sie diese Alben mit anderen.\n- **🫱🏻‍🫲🏻 Externes Teilen**: Teilen Sie Fotos und Videos mit Personen außerhalb Ihrer Nextcloud-Instanz.\n- **📱 Mobiler Support**: Funktioniert auf Geräten jeder Form und Größe über die Web-App.\n- **✏️ Metadaten bearbeiten**: Bearbeiten Sie Daten auf Fotos schnell und einfach.\n- **📦 Archiv**: Speichern Sie Fotos, die Sie nicht in Ihrer Chronik sehen möchten, in einem separaten Ordner.\n- **⚡️ Leistung**: Memories ist extrem schnell.\n\n## 🌐 Online-Demo\n\n- Um eine Vorstellung davon zu bekommen, wie Erinnerungen aussehen und sich anfühlen, sehen Sie sich die [öffentliche Demo] (https://memories-demo.radialapps.com/apps/memories/) an.\n- Die Demo ist schreibgeschützt und kann langsam sein (kostenlose Kontingent-VM von [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Fotonachweise gehen zu [Unsplash](https://unsplash.com/) (Einzelnachweise finden Sie in jedem Ordner).\n\n## 🚀 Installation\n\n1. Installieren Sie die App aus dem Nextcloud App Store.\n1. Führen Sie die empfohlenen [Konfigurationsschritte] durch (https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Führen Sie `php ./occ memory:index` aus, um Metadaten-Indizes für vorhandene Fotos zu generieren.\n1. Öffnen Sie die App 📷 Erinnerungen in Nextcloud und legen Sie das Verzeichnis mit Ihren Fotos fest.",
     "Timeline" : "Zeitleiste",
     "Folders" : "Ordner",
     "Favorites" : "Favoriten",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 0bdf5d210..6ba694c66 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Memories" : "Erinnerungen",
     "Yet another photo management app" : "Eine weitere Foto-Management-App",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Erinnerungen\n\nErinnerungen (Memories) ist eine Fotoverwaltungs-App für Nextcloud mit erweiterten Funktionen, darunter:\n\n- **📸 Zeitleiste**: Fotos und Videos nach Aufnahmedatum sortieren, ausgelesen aus Exif-Daten.\n- **⏪ Zurückspulen**: Springen Sie sofort zu einem beliebigen Zeitpunkt in der Vergangenheit und erleben Sie Ihre Erinnerungen erneut.\n- **🤖 KI-Markierung**: Gruppieren Sie Fotos nach Personen und Objekten mithilfe von KI, unterstützt von [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Alben**: Erstellen Sie Alben, um Fotos und Videos zu gruppieren. Dann teilen Sie diese Alben mit anderen.\n- **🫱🏻‍🫲🏻 Externes Teilen**: Teilen Sie Fotos und Videos mit Personen außerhalb Ihrer Nextcloud-Instanz.\n- **📱 Mobiler Support**: Funktioniert auf Geräten jeder Form und Größe über die Web-App.\n- **✏️ Metadaten bearbeiten**: Bearbeiten Sie Daten auf Fotos schnell und einfach.\n- **📦 Archiv**: Speichern Sie Fotos, die Sie nicht in Ihrer Chronik sehen möchten, in einem separaten Ordner.\n- **⚡️ Leistung**: Memories ist extrem schnell.\n\n## 🌐 Online-Demo\n\n- Um eine Vorstellung davon zu bekommen, wie Erinnerungen aussehen und sich anfühlen, sehen Sie sich die [öffentliche Demo] (https://memories-demo.radialapps.com/apps/memories/) an.\n- Die Demo ist schreibgeschützt und kann langsam sein (kostenlose Kontingent-VM von [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Fotonachweise gehen zu [Unsplash](https://unsplash.com/) (Einzelnachweise finden Sie in jedem Ordner).\n\n## 🚀 Installation\n\n1. Installieren Sie die App aus dem Nextcloud App Store.\n1. Führen Sie die empfohlenen [Konfigurationsschritte] durch (https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Führen Sie `php ./occ memory:index` aus, um Metadaten-Indizes für vorhandene Fotos zu generieren.\n1. Öffnen Sie die App 📷 Erinnerungen in Nextcloud und legen Sie das Verzeichnis mit Ihren Fotos fest.",
     "Timeline" : "Zeitleiste",
     "Folders" : "Ordner",
     "Favorites" : "Favoriten",
diff --git a/l10n/es.js b/l10n/es.js
index 9259f07ad..a16ce4986 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Memories" : "Memories",
     "Yet another photo management app" : "Otra aplicación de gestión de fotos mas",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Memories\n\nMemories es una aplicación de gestión de fotos para Nextcloud con algunas características avanzadas, incluyendo:\n\n- **📸 Línea de tiempo**: Organice fotos y videos por fecha, analizadas desde los datos Exif.\n- **⏪ Rebobinar**: Navegue a cualquier momento del pasado instantáneamente y reviva sus memorias.\n- **🤖 Etiquetado IA**: Agrupe fotos por persona y objetos utilizando IA, aprovechando las capacidades de la aplicación [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Álbumes**: Cree álbumes para agrupar fotos y videos en conjunto. Podrá entonces compartir estos álbumes con otros.\n **🫱🏻‍🫲🏻 Compartir externamente**:  Comparta fotos y videos con personas fuera de su instancia Nextcloud.\n-- **📱 Soporte a Móviles**: Funciona con dispositivos de cualquier tamaño y forma a través de la aplicación web.\n- **✏️ Editar Metadatos**: Edite las fechas Exif en las fotos de forma rápida y sencilla.\n- **📦 Archivar**: Almacene las fotos que no quiere ver en su línea de tiempo en una carpeta separada.\n- **⚡️ Rápida**: Memories es extremadamente rápida.\n\n## 🌐 Demostración en línea\n\n- Para tener una idea de como se siente y se vé Memories, compruebe la [demostración pública](https://memories-demo.radialapps.com/apps/memories/). \n- Tenga en cuenta que la demostración es de sólo lectura y podría ser lenta (se ejecuta en una VM en la nube de la capa gratuita de [Oracle Cloud](https://www.oracle.com/cloud/free/)). \n- Los créditos de las fotos son para [Unsplash](https://unsplash.com/) (para créditos individuales, refiérase a cada carpeta).\n\n## 🚀 Instalación\n\n1. Instale la aplicación desde la tienda de Nextcloud.\n2. Ejecute los [pasos recomendados de configuración](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n3. Ejecute `php ./occ memories:index` para generar los índices de metadatos para las fotos existentes.\n4. Abra la aplicación 📷 Memories en Nextcloud y especifique la carpeta que contiene sus fotos.",
     "Timeline" : "Línea de tiempo",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
diff --git a/l10n/es.json b/l10n/es.json
index a9a970e77..a37d11e27 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Memories" : "Memories",
     "Yet another photo management app" : "Otra aplicación de gestión de fotos mas",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Memories\n\nMemories es una aplicación de gestión de fotos para Nextcloud con algunas características avanzadas, incluyendo:\n\n- **📸 Línea de tiempo**: Organice fotos y videos por fecha, analizadas desde los datos Exif.\n- **⏪ Rebobinar**: Navegue a cualquier momento del pasado instantáneamente y reviva sus memorias.\n- **🤖 Etiquetado IA**: Agrupe fotos por persona y objetos utilizando IA, aprovechando las capacidades de la aplicación [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Álbumes**: Cree álbumes para agrupar fotos y videos en conjunto. Podrá entonces compartir estos álbumes con otros.\n **🫱🏻‍🫲🏻 Compartir externamente**:  Comparta fotos y videos con personas fuera de su instancia Nextcloud.\n-- **📱 Soporte a Móviles**: Funciona con dispositivos de cualquier tamaño y forma a través de la aplicación web.\n- **✏️ Editar Metadatos**: Edite las fechas Exif en las fotos de forma rápida y sencilla.\n- **📦 Archivar**: Almacene las fotos que no quiere ver en su línea de tiempo en una carpeta separada.\n- **⚡️ Rápida**: Memories es extremadamente rápida.\n\n## 🌐 Demostración en línea\n\n- Para tener una idea de como se siente y se vé Memories, compruebe la [demostración pública](https://memories-demo.radialapps.com/apps/memories/). \n- Tenga en cuenta que la demostración es de sólo lectura y podría ser lenta (se ejecuta en una VM en la nube de la capa gratuita de [Oracle Cloud](https://www.oracle.com/cloud/free/)). \n- Los créditos de las fotos son para [Unsplash](https://unsplash.com/) (para créditos individuales, refiérase a cada carpeta).\n\n## 🚀 Instalación\n\n1. Instale la aplicación desde la tienda de Nextcloud.\n2. Ejecute los [pasos recomendados de configuración](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n3. Ejecute `php ./occ memories:index` para generar los índices de metadatos para las fotos existentes.\n4. Abra la aplicación 📷 Memories en Nextcloud y especifique la carpeta que contiene sus fotos.",
     "Timeline" : "Línea de tiempo",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
diff --git a/l10n/hu.js b/l10n/hu.js
index b16cd11f1..988b2598f 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Tags" : "Címkék",
     "Maps" : "Térképek",
     "Settings" : "Beállítások",
+    "EXIF" : "EXIF",
     "Unsaved changes" : "Mentetlen változtatások",
     "Drop changes" : "Változtatások elvetése",
     "Edit" : "Szerkesztés",
diff --git a/l10n/hu.json b/l10n/hu.json
index 236e1e7cc..32b96c47b 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -12,6 +12,7 @@
     "Tags" : "Címkék",
     "Maps" : "Térképek",
     "Settings" : "Beállítások",
+    "EXIF" : "EXIF",
     "Unsaved changes" : "Mentetlen változtatások",
     "Drop changes" : "Változtatások elvetése",
     "Edit" : "Szerkesztés",
diff --git a/l10n/lv.js b/l10n/lv.js
index c6d053982..21317b634 100644
--- a/l10n/lv.js
+++ b/l10n/lv.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Folders" : "Mapes",
     "Favorites" : "Favorīti",
     "Videos" : "Video",
+    "Albums" : "Albumi",
     "Archive" : "Arhīvi",
     "Tags" : "Birkas",
     "Maps" : "Karte",
@@ -17,6 +18,12 @@ OC.L10N.register(
     "View in folder" : "Skatīt mapē",
     "Share" : "Koplietot",
     "Sidebar" : "Sānjosla",
+    "Copy the public link" : "Kopējiet publisko saiti",
+    "Delete the public link" : "Dzēst publisko saiti",
+    "Public link copied!" : "Publiskā saite nokopēta!",
+    "Copy public link" : "Kopējiet publisko saiti",
+    "Share via public link" : "Kopīgojiet, izmantojot publisko saiti",
+    "Public link" : "Publiskā saite",
     "Back" : "Atpakaļ",
     "Save" : "Saglabāt",
     "Create album" : "Izveidot albumu",
@@ -33,11 +40,17 @@ OC.L10N.register(
     "Continue" : "Turpināt",
     "Undo" : "Atsaukt",
     "Redo" : "Atcelt atsaukšanu",
+    "Original" : "Oriģināls",
     "Custom" : "Pielāgots",
     "Value" : "Vērtība",
     "Image" : "Attēli",
     "Text" : "Teksts",
     "Size" : "Izmērs",
+    "Save image as" : "Saglabāt attēlu kā",
+    "Quality" : "Kvalitāte",
+    "Saved image size (width x height)" : "Saglabātā attēla izmērs (platums x augstums)",
+    "Actual size (100%)" : "Faktiskais izmērs (100%)",
+    "Fit size" : "Atbilst izmēram",
     "Shared Folder" : "Koplietotā mape"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/l10n/lv.json b/l10n/lv.json
index ef5d53ceb..5ded0c628 100644
--- a/l10n/lv.json
+++ b/l10n/lv.json
@@ -2,6 +2,7 @@
     "Folders" : "Mapes",
     "Favorites" : "Favorīti",
     "Videos" : "Video",
+    "Albums" : "Albumi",
     "Archive" : "Arhīvi",
     "Tags" : "Birkas",
     "Maps" : "Karte",
@@ -15,6 +16,12 @@
     "View in folder" : "Skatīt mapē",
     "Share" : "Koplietot",
     "Sidebar" : "Sānjosla",
+    "Copy the public link" : "Kopējiet publisko saiti",
+    "Delete the public link" : "Dzēst publisko saiti",
+    "Public link copied!" : "Publiskā saite nokopēta!",
+    "Copy public link" : "Kopējiet publisko saiti",
+    "Share via public link" : "Kopīgojiet, izmantojot publisko saiti",
+    "Public link" : "Publiskā saite",
     "Back" : "Atpakaļ",
     "Save" : "Saglabāt",
     "Create album" : "Izveidot albumu",
@@ -31,11 +38,17 @@
     "Continue" : "Turpināt",
     "Undo" : "Atsaukt",
     "Redo" : "Atcelt atsaukšanu",
+    "Original" : "Oriģināls",
     "Custom" : "Pielāgots",
     "Value" : "Vērtība",
     "Image" : "Attēli",
     "Text" : "Teksts",
     "Size" : "Izmērs",
+    "Save image as" : "Saglabāt attēlu kā",
+    "Quality" : "Kvalitāte",
+    "Saved image size (width x height)" : "Saglabātā attēla izmērs (platums x augstums)",
+    "Actual size (100%)" : "Faktiskais izmērs (100%)",
+    "Fit size" : "Atbilst izmēram",
     "Shared Folder" : "Koplietotā mape"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/tr.js b/l10n/tr.js
index 69eba9ca0..edf7be50c 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Memories" : "Anılar",
     "Yet another photo management app" : "Başka bir fotoğraf yönetimi uygulaması daha",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Anılar\n\nAnılar Nextcloud için aşağıdaki gibi gelişmiş özellikleri bulunan bir fotoğraf yönetimi uygulamasıdır:\n\n- **📸 Zaman tüneli**: Fotoğrafları ve görüntüleri çekildikleri tarihe göre sıralayabilir, Exif verilerine göre ayrıştırabilirsiniz.\n- **⏪ Geri sarma**: Geçmişte herhangi bir zamana atlayabilir ve anılarınızı yeniden yaşayabilirsiniz.\n- **🤖 Yapay zeka ile etiketleme**: [recognize](https://github.com/nextcloud/recognize) tarafından desteklenen yapay zeka ile fotoğrafları insanlara ve nesnelere göre gruplayabilirsiniz.\n- **🖼️ Albümler**: Fotoğrafları ve görüntülerü birlikte gruplandırmak için albümler oluşturabilirsiniz. Daha sonra bu albümleri başkalarıyla paylaşabilirsiniz.\n- **🫱🏻‍🫲🏻 Dış paylaşım**: Fotoğrafları ve görüntüleri Nextcloud bulut sunucunuzun dışındaki kişilerle paylaşabilirsiniz.\n- **📱 Mobil desteği**: Web uygulaması üzerinden farklı şekil ve boyuttaki aygıtlarda kullanabilirsiniz.\n- **✏️ Üst verileri düzenleme**: Fotoğraflardaki tarihleri ​​hızlı ve kolay bir şekilde düzenleyebilirsiniz.\n- **📦 Arşiv**: Zaman tünelinizde görmek istemediğiniz fotoğrafları ayrı bir klasörde saklayabilirsiniz.\n- **⚡️ Başarım**: Anılar uygulaması son derece hızlıdır.\n\n## 🌐 Çevrimiçi Deneme\n\n- Anılar uygulamasının nasıl göründüğü ve nasıl hissettirdiği hakkında bir fikir edinmek için [genel deneme](https://memories-demo.radialapps.com/apps/memories/) sitesine göz atın.\n- Deneme sitesi salt okunurdur ve yavaş olabilir ([Oracle Cloud üzerinde](https://www.oracle.com/cloud/free/) ücretsiz VM paketini kullanır).\n- Fotoğraf hakkında emeği geçenler için [Unsplash](https://unsplash.com/) adresine bakabilirsiniz (bireysel eeği geçenler için her klasöre bakın).\n\n## 🚀 Kurulum\n\n1. Uygulamayı Nextcloud uygulama mağazasından yükleyin.\n1. Önerilen [yapılandırma adımlarını](https://github.com/pulsejet/memories/wiki/Extra-Configuration) gerçekleştirin.\n1. var olan fotoğrafların üst veri dizinlerini oluşturmak için `php ./occ memory:index` komutunu yürütün.\n1. Nextcloud üzerinde 📷 Anılar uygulamasını açın ve fotoğraflarınızın bulunduğu klasörü ayarlayın.",
     "Timeline" : "Zaman tüneli",
     "Folders" : "Klasörler",
     "Favorites" : "Sık kullanılanlar",
diff --git a/l10n/tr.json b/l10n/tr.json
index d874dad74..cb49553cf 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Memories" : "Anılar",
     "Yet another photo management app" : "Başka bir fotoğraf yönetimi uygulaması daha",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Anılar\n\nAnılar Nextcloud için aşağıdaki gibi gelişmiş özellikleri bulunan bir fotoğraf yönetimi uygulamasıdır:\n\n- **📸 Zaman tüneli**: Fotoğrafları ve görüntüleri çekildikleri tarihe göre sıralayabilir, Exif verilerine göre ayrıştırabilirsiniz.\n- **⏪ Geri sarma**: Geçmişte herhangi bir zamana atlayabilir ve anılarınızı yeniden yaşayabilirsiniz.\n- **🤖 Yapay zeka ile etiketleme**: [recognize](https://github.com/nextcloud/recognize) tarafından desteklenen yapay zeka ile fotoğrafları insanlara ve nesnelere göre gruplayabilirsiniz.\n- **🖼️ Albümler**: Fotoğrafları ve görüntülerü birlikte gruplandırmak için albümler oluşturabilirsiniz. Daha sonra bu albümleri başkalarıyla paylaşabilirsiniz.\n- **🫱🏻‍🫲🏻 Dış paylaşım**: Fotoğrafları ve görüntüleri Nextcloud bulut sunucunuzun dışındaki kişilerle paylaşabilirsiniz.\n- **📱 Mobil desteği**: Web uygulaması üzerinden farklı şekil ve boyuttaki aygıtlarda kullanabilirsiniz.\n- **✏️ Üst verileri düzenleme**: Fotoğraflardaki tarihleri ​​hızlı ve kolay bir şekilde düzenleyebilirsiniz.\n- **📦 Arşiv**: Zaman tünelinizde görmek istemediğiniz fotoğrafları ayrı bir klasörde saklayabilirsiniz.\n- **⚡️ Başarım**: Anılar uygulaması son derece hızlıdır.\n\n## 🌐 Çevrimiçi Deneme\n\n- Anılar uygulamasının nasıl göründüğü ve nasıl hissettirdiği hakkında bir fikir edinmek için [genel deneme](https://memories-demo.radialapps.com/apps/memories/) sitesine göz atın.\n- Deneme sitesi salt okunurdur ve yavaş olabilir ([Oracle Cloud üzerinde](https://www.oracle.com/cloud/free/) ücretsiz VM paketini kullanır).\n- Fotoğraf hakkında emeği geçenler için [Unsplash](https://unsplash.com/) adresine bakabilirsiniz (bireysel eeği geçenler için her klasöre bakın).\n\n## 🚀 Kurulum\n\n1. Uygulamayı Nextcloud uygulama mağazasından yükleyin.\n1. Önerilen [yapılandırma adımlarını](https://github.com/pulsejet/memories/wiki/Extra-Configuration) gerçekleştirin.\n1. var olan fotoğrafların üst veri dizinlerini oluşturmak için `php ./occ memory:index` komutunu yürütün.\n1. Nextcloud üzerinde 📷 Anılar uygulamasını açın ve fotoğraflarınızın bulunduğu klasörü ayarlayın.",
     "Timeline" : "Zaman tüneli",
     "Folders" : "Klasörler",
     "Favorites" : "Sık kullanılanlar",
diff --git a/l10n/uk.js b/l10n/uk.js
index 11dbddb5e..77474d089 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Memories" : "Спогади",
     "Yet another photo management app" : "Іще один застосунок для роботи зі світлинами",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Memories\n\nMemories - це додаток для управління фотографіями для Nextcloud з розширеними можливостями:\n\n - **📸 Timeline**: Сортування фотографій та відео за датою зйомки на основі даних Exif.\n-  **⏪ Перемотування назад**: Миттєво переходьте в будь-який час минулого та переживайте свої спогади.\n- **🤖Тегування AI**: Групування фотографій за людьми та об'єктами з використанням AI на основі функції [розпізнавання](https://github.com/nextcloud/recognize).\n- **🖼️ Альбоми**: Створюйте альбоми, щоб групувати фотографії та відео разом. Потім діліться цими альбомами з іншими.\n - **🫱🏻‍🫲🏻Зовнішній обмін**: Діліться фотографіями та відео з людьми за межами вашого екземпляра Nextcloud.\n- **📱 Мобільна підтримка**: Працює на пристроях будь-якої форми та розміру через веб-додаток.\n- **✏️ Редагування метаданих**: Редагуйте дати на фотографіях швидко та легко.\n- **📦 Архівувати**: Зберігайте фотографії, які ви не хочете бачити на часовій шкалі, в окремій папці.\n- **⚡️ Продуктивність**: Memories надзвичайно швидка.\n\n## 🌐 Онлайн демонстрація\n\n- Щоб отримати уявлення про те, як виглядає і відчувається пам'ять, перегляньте [загальнодоступну демонстраційну версію] (https://memories-demo.radialapps.com/apps/memories/).\n- Демонстрація доступна лише для читання і може працювати повільно (безкоштовна віртуальна машина з [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Титри фотографій можна знайти в [Unsplash] (https://unsplash.com/) (щодо окремих титрів див. кожну папку).\n\n## 🚀 Встановлення\n\n1. Встановіть додаток з магазину додатків Nextcloud.\n2. Виконайте рекомендовані [кроки налаштування] (https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n3. Запустіть `php ./occ memories:index` для створення індексів метаданих для наявних фотографій.\n4. Відкрийте додаток 📷 Memories у Nextcloud та встановіть каталог, що містить ваші фотографії.",
     "Timeline" : "Дії",
     "Folders" : "Каталоги",
     "Favorites" : "Із зірочкою",
diff --git a/l10n/uk.json b/l10n/uk.json
index 100276e85..62ddfd8a7 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Memories" : "Спогади",
     "Yet another photo management app" : "Іще один застосунок для роботи зі світлинами",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Memories\n\nMemories - це додаток для управління фотографіями для Nextcloud з розширеними можливостями:\n\n - **📸 Timeline**: Сортування фотографій та відео за датою зйомки на основі даних Exif.\n-  **⏪ Перемотування назад**: Миттєво переходьте в будь-який час минулого та переживайте свої спогади.\n- **🤖Тегування AI**: Групування фотографій за людьми та об'єктами з використанням AI на основі функції [розпізнавання](https://github.com/nextcloud/recognize).\n- **🖼️ Альбоми**: Створюйте альбоми, щоб групувати фотографії та відео разом. Потім діліться цими альбомами з іншими.\n - **🫱🏻‍🫲🏻Зовнішній обмін**: Діліться фотографіями та відео з людьми за межами вашого екземпляра Nextcloud.\n- **📱 Мобільна підтримка**: Працює на пристроях будь-якої форми та розміру через веб-додаток.\n- **✏️ Редагування метаданих**: Редагуйте дати на фотографіях швидко та легко.\n- **📦 Архівувати**: Зберігайте фотографії, які ви не хочете бачити на часовій шкалі, в окремій папці.\n- **⚡️ Продуктивність**: Memories надзвичайно швидка.\n\n## 🌐 Онлайн демонстрація\n\n- Щоб отримати уявлення про те, як виглядає і відчувається пам'ять, перегляньте [загальнодоступну демонстраційну версію] (https://memories-demo.radialapps.com/apps/memories/).\n- Демонстрація доступна лише для читання і може працювати повільно (безкоштовна віртуальна машина з [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Титри фотографій можна знайти в [Unsplash] (https://unsplash.com/) (щодо окремих титрів див. кожну папку).\n\n## 🚀 Встановлення\n\n1. Встановіть додаток з магазину додатків Nextcloud.\n2. Виконайте рекомендовані [кроки налаштування] (https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n3. Запустіть `php ./occ memories:index` для створення індексів метаданих для наявних фотографій.\n4. Відкрийте додаток 📷 Memories у Nextcloud та встановіть каталог, що містить ваші фотографії.",
     "Timeline" : "Дії",
     "Folders" : "Каталоги",
     "Favorites" : "Із зірочкою",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index e27951fb3..959372c5a 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Memories" : "回憶",
     "Yet another photo management app" : "又一個照片管理應用程式",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# 回憶\n\n回憶是一個有進階功能的相片管理 Nextcloud 應用程式，包含了以下功能：\n\n- **📸 時間軸**：從 Exif 資料中按拍攝日期對照片與影片進行排序。\n- **⏪ 倒帶**：立刻跳回過去的任何時間，重溫您的回憶。\n- **🤖 AI 標記**：使用 [recognize](https://github.com/nextcloud/recognize) 應用程式提供的 AI 功能按人物與物體對照片進行分組。\n- **🖼️ 相簿**：建立相簿以將照片與影片分組。然後將這些相簿與其他人分享。\n- **🫱🏻‍🫲🏻 外部分享**：與您 Nextcloud 站台以外的人們分享照片與影片。\n- **📱 行動裝置支援**：透過網路應用程式在任何形狀與大小的裝置上運作。\n- **✏️ 編輯詮釋資料**：快速輕鬆地編輯照片上的 Exif 日期。\n- **📦 封存**：將您不想在時間軸中看到的照片儲存在單獨的資料夾中。\n- **⚡️ 效能**：本應用程式超快。\n\n## 🌐 線上展示\n\n- 想看看本應用程式的外觀與感覺，請見[公開展示](https://memories-demo.radialapps.com/apps/memories/).\n- 展示站是唯讀的，可能會有點慢（來自 [Oracle Cloud](https://www.oracle.com/cloud/free/) 的免費層級虛擬機器）。\n- 照片則歸功於 [Unsplash](https://unsplash.com/)（若要檢視單獨的署名，請參見每個資料夾中的資訊）。\n\n\n## 🚀 安裝\n1. 從 Nextcloud 應用程式商店安裝應用程式\n1. 執行建議的[設定步驟](https://github.com/pulsejet/memories/wiki/Extra-Configuration)。\n1. 執行 `php ./occ memories:index` 以產生既有照片的詮釋資料索引。\n1. 在 Nextcloud 開啟 📷 回憶應用程式並設定包含您照片的目錄。",
     "Timeline" : "時間線",
     "Folders" : "資料夾",
     "Favorites" : "最愛",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index fce060529..b6111dc25 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Memories" : "回憶",
     "Yet another photo management app" : "又一個照片管理應用程式",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# 回憶\n\n回憶是一個有進階功能的相片管理 Nextcloud 應用程式，包含了以下功能：\n\n- **📸 時間軸**：從 Exif 資料中按拍攝日期對照片與影片進行排序。\n- **⏪ 倒帶**：立刻跳回過去的任何時間，重溫您的回憶。\n- **🤖 AI 標記**：使用 [recognize](https://github.com/nextcloud/recognize) 應用程式提供的 AI 功能按人物與物體對照片進行分組。\n- **🖼️ 相簿**：建立相簿以將照片與影片分組。然後將這些相簿與其他人分享。\n- **🫱🏻‍🫲🏻 外部分享**：與您 Nextcloud 站台以外的人們分享照片與影片。\n- **📱 行動裝置支援**：透過網路應用程式在任何形狀與大小的裝置上運作。\n- **✏️ 編輯詮釋資料**：快速輕鬆地編輯照片上的 Exif 日期。\n- **📦 封存**：將您不想在時間軸中看到的照片儲存在單獨的資料夾中。\n- **⚡️ 效能**：本應用程式超快。\n\n## 🌐 線上展示\n\n- 想看看本應用程式的外觀與感覺，請見[公開展示](https://memories-demo.radialapps.com/apps/memories/).\n- 展示站是唯讀的，可能會有點慢（來自 [Oracle Cloud](https://www.oracle.com/cloud/free/) 的免費層級虛擬機器）。\n- 照片則歸功於 [Unsplash](https://unsplash.com/)（若要檢視單獨的署名，請參見每個資料夾中的資訊）。\n\n\n## 🚀 安裝\n1. 從 Nextcloud 應用程式商店安裝應用程式\n1. 執行建議的[設定步驟](https://github.com/pulsejet/memories/wiki/Extra-Configuration)。\n1. 執行 `php ./occ memories:index` 以產生既有照片的詮釋資料索引。\n1. 在 Nextcloud 開啟 📷 回憶應用程式並設定包含您照片的目錄。",
     "Timeline" : "時間線",
     "Folders" : "資料夾",
     "Favorites" : "最愛",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 2fd650696..86a74a52a 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Memories" : "回憶",
     "Yet another photo management app" : "又一個照片管理應用程式",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# 回憶\n\n回憶是一個有進階功能的相片管理 Nextcloud 應用程式，包含了以下功能：\n\n- **📸 時間軸**：從 Exif 資料中按拍攝日期對照片與影片進行排序。\n- **⏪ 倒帶**：立刻跳回過去的任何時間，重溫您的回憶。\n- **🤖 AI 標記**：使用 [recognize](https://github.com/nextcloud/recognize) 應用程式提供的 AI 功能按人物與物體對照片進行分組。\n- **🖼️ 相簿**：建立相簿以將照片與影片分組。然後將這些相簿與其他人分享。\n- **🫱🏻‍🫲🏻 外部分享**：與您 Nextcloud 站台以外的人們分享照片與影片。\n- **📱 行動裝置支援**：透過網路應用程式在任何形狀與大小的裝置上運作。\n- **✏️ 編輯詮釋資料**：快速輕鬆地編輯照片上的 Exif 日期。\n- **📦 封存**：將您不想在時間軸中看到的照片儲存在單獨的資料夾中。\n- **⚡️ 效能**：本應用程式超快。\n\n## 🌐 線上展示\n\n- 想看看本應用程式的外觀與感覺，請見[公開展示](https://memories-demo.radialapps.com/apps/memories/).\n- 展示站是唯讀的，可能會有點慢（來自 [Oracle Cloud](https://www.oracle.com/cloud/free/) 的免費層級虛擬機器）。\n- 照片則歸功於 [Unsplash](https://unsplash.com/)（若要檢視單獨的署名，請參見每個資料夾中的資訊）。\n\n\n## 🚀 安裝\n1. 從 Nextcloud 應用程式商店安裝應用程式\n1. 執行建議的[設定步驟](https://github.com/pulsejet/memories/wiki/Extra-Configuration)。\n1. 執行 `php ./occ memories:index` 以產生既有照片的詮釋資料索引。\n1. 在 Nextcloud 開啟 📷 回憶應用程式並設定包含您照片的目錄。",
     "Timeline" : "時間軸",
     "Folders" : "資料夾",
     "Favorites" : "最愛",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 9d3195da3..af1047a6b 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Memories" : "回憶",
     "Yet another photo management app" : "又一個照片管理應用程式",
-    "# Memories\n\nMemories is a photo management app for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **⚡️ Performance**: Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# 回憶\n\n回憶是一個有進階功能的相片管理 Nextcloud 應用程式，包含了以下功能：\n\n- **📸 時間軸**：從 Exif 資料中按拍攝日期對照片與影片進行排序。\n- **⏪ 倒帶**：立刻跳回過去的任何時間，重溫您的回憶。\n- **🤖 AI 標記**：使用 [recognize](https://github.com/nextcloud/recognize) 應用程式提供的 AI 功能按人物與物體對照片進行分組。\n- **🖼️ 相簿**：建立相簿以將照片與影片分組。然後將這些相簿與其他人分享。\n- **🫱🏻‍🫲🏻 外部分享**：與您 Nextcloud 站台以外的人們分享照片與影片。\n- **📱 行動裝置支援**：透過網路應用程式在任何形狀與大小的裝置上運作。\n- **✏️ 編輯詮釋資料**：快速輕鬆地編輯照片上的 Exif 日期。\n- **📦 封存**：將您不想在時間軸中看到的照片儲存在單獨的資料夾中。\n- **⚡️ 效能**：本應用程式超快。\n\n## 🌐 線上展示\n\n- 想看看本應用程式的外觀與感覺，請見[公開展示](https://memories-demo.radialapps.com/apps/memories/).\n- 展示站是唯讀的，可能會有點慢（來自 [Oracle Cloud](https://www.oracle.com/cloud/free/) 的免費層級虛擬機器）。\n- 照片則歸功於 [Unsplash](https://unsplash.com/)（若要檢視單獨的署名，請參見每個資料夾中的資訊）。\n\n\n## 🚀 安裝\n1. 從 Nextcloud 應用程式商店安裝應用程式\n1. 執行建議的[設定步驟](https://github.com/pulsejet/memories/wiki/Extra-Configuration)。\n1. 執行 `php ./occ memories:index` 以產生既有照片的詮釋資料索引。\n1. 在 Nextcloud 開啟 📷 回憶應用程式並設定包含您照片的目錄。",
     "Timeline" : "時間軸",
     "Folders" : "資料夾",
     "Favorites" : "最愛",

From 06d226432fc4cfefd6d87477b330bbeee304a665 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 19:48:03 -0800
Subject: [PATCH 046/163] timeline: show video duration

---
 lib/Db/TimelineQueryDays.php                  |  4 +-
 lib/Db/TimelineWrite.php                      |  8 +++
 .../Version400700Date20221110030909.php       | 67 +++++++++++++++++++
 src/components/PsVideo.ts                     |  1 -
 src/components/frame/Photo.vue                | 41 ++++++++++--
 src/services/Utils.ts                         | 20 ++++++
 src/types.ts                                  |  2 +
 7 files changed, 134 insertions(+), 9 deletions(-)
 create mode 100644 lib/Migration/Version400700Date20221110030909.php

diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index 8e5c2bb96..2899c2d95 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -102,7 +102,7 @@ public function getDay(
         // We don't actually use m.datetaken here, but postgres
         // needs that all fields in ORDER BY are also in SELECT
         // when using DISTINCT on selected fields
-        $query->select($fileid, 'm.isvideo', 'm.datetaken', 'm.dayid', 'm.w', 'm.h')
+        $query->select($fileid, 'm.isvideo', 'm.video_duration', 'm.datetaken', 'm.dayid', 'm.w', 'm.h')
             ->from('memories', 'm')
         ;
 
@@ -198,11 +198,13 @@ private function processDay(&$day, $uid, $folder)
             // Convert field types
             $row['fileid'] = (int) $row['fileid'];
             $row['isvideo'] = (int) $row['isvideo'];
+            $row['video_duration'] = (int) $row['video_duration'];
             $row['dayid'] = (int) $row['dayid'];
             $row['w'] = (int) $row['w'];
             $row['h'] = (int) $row['h'];
             if (!$row['isvideo']) {
                 unset($row['isvideo']);
+                unset($row['video_duration']);
             }
             if ($row['categoryid']) {
                 $row['isfavorite'] = 1;
diff --git a/lib/Db/TimelineWrite.php b/lib/Db/TimelineWrite.php
index bcd9145c7..19da9a3a6 100644
--- a/lib/Db/TimelineWrite.php
+++ b/lib/Db/TimelineWrite.php
@@ -97,6 +97,12 @@ public function processFile(
         $dateTaken = gmdate('Y-m-d H:i:s', $dateTaken);
         [$w, $h] = Exif::getDimensions($exif);
 
+        // Video parameters
+        $videoDuration = 0;
+        if ($isvideo) {
+            $videoDuration = round($exif['Duration'] ?? $exif['TrackDuration'] ?? 0);
+        }
+
         // Store raw metadata in the database
         // We need to remove blacklisted fields to prevent leaking info
         unset($exif['SourceFile'], $exif['FileName'], $exif['ExifToolVersion'], $exif['Directory'], $exif['FileSize'], $exif['FileModifyDate'], $exif['FileAccessDate'], $exif['FileInodeChangeDate'], $exif['FilePermissions']);
@@ -124,6 +130,7 @@ public function processFile(
                 ->set('datetaken', $query->createNamedParameter($dateTaken, IQueryBuilder::PARAM_STR))
                 ->set('mtime', $query->createNamedParameter($mtime, IQueryBuilder::PARAM_INT))
                 ->set('isvideo', $query->createNamedParameter($isvideo, IQueryBuilder::PARAM_INT))
+                ->set('video_duration', $query->createNamedParameter($videoDuration, IQueryBuilder::PARAM_INT))
                 ->set('w', $query->createNamedParameter($w, IQueryBuilder::PARAM_INT))
                 ->set('h', $query->createNamedParameter($h, IQueryBuilder::PARAM_INT))
                 ->set('exif', $query->createNamedParameter($exifJson, IQueryBuilder::PARAM_STR))
@@ -141,6 +148,7 @@ public function processFile(
                         'datetaken' => $query->createNamedParameter($dateTaken, IQueryBuilder::PARAM_STR),
                         'mtime' => $query->createNamedParameter($mtime, IQueryBuilder::PARAM_INT),
                         'isvideo' => $query->createNamedParameter($isvideo, IQueryBuilder::PARAM_INT),
+                        'video_duration' => $query->createNamedParameter($videoDuration, IQueryBuilder::PARAM_INT),
                         'w' => $query->createNamedParameter($w, IQueryBuilder::PARAM_INT),
                         'h' => $query->createNamedParameter($h, IQueryBuilder::PARAM_INT),
                         'exif' => $query->createNamedParameter($exifJson, IQueryBuilder::PARAM_STR),
diff --git a/lib/Migration/Version400700Date20221110030909.php b/lib/Migration/Version400700Date20221110030909.php
new file mode 100644
index 000000000..4420c82b0
--- /dev/null
+++ b/lib/Migration/Version400700Date20221110030909.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Your name <your@email.com>
+ * @author Your name <your@email.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Memories\Migration;
+
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Auto-generated migration step: Please modify to your needs!
+ */
+class Version400700Date20221110030909 extends SimpleMigrationStep
+{
+    /**
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void
+    {
+    }
+
+    /**
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options): ?ISchemaWrapper
+    {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $table = $schema->getTable('memories');
+
+        $table->addColumn('video_duration', Types::INTEGER, [
+            'notnull' => true,
+            'default' => 0,
+        ]);
+
+        return $schema;
+    }
+
+    /**
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void
+    {
+    }
+}
diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 984a639ad..d88d58c0f 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -184,7 +184,6 @@ class VideoContentSetup {
   updateRotation(content, val?: number) {
     const rotation = val ?? Number(content.data.exif?.Rotation);
     const shouldRotate = content.videojs?.src().includes("m3u8");
-    console.log("Video.js: Rotation", rotation, shouldRotate);
     if (rotation && shouldRotate) {
       let transform = `rotate(${rotation}deg)`;
 
diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
index 6cd756e78..e819317be 100644
--- a/src/components/frame/Photo.vue
+++ b/src/components/frame/Photo.vue
@@ -16,7 +16,13 @@
       @click="toggleSelect"
     />
 
-    <Video :size="22" v-if="data.flag & c.FLAG_IS_VIDEO" />
+    <div class="video" v-if="data.flag & c.FLAG_IS_VIDEO">
+      <span v-if="data.video_duration" class="time">
+        {{ videoDuration }}
+      </span>
+      <Video :size="22" />
+    </div>
+
     <Star :size="22" v-if="data.flag & c.FLAG_IS_FAVORITE" />
 
     <div
@@ -43,14 +49,17 @@
 </template>
 
 <script lang="ts">
-import CheckCircle from "vue-material-design-icons/CheckCircle.vue";
-import Star from "vue-material-design-icons/Star.vue";
-import Video from "vue-material-design-icons/PlayCircleOutline.vue";
 import { Component, Emit, Mixins, Prop, Watch } from "vue-property-decorator";
-import errorsvg from "../../assets/error.svg";
 import GlobalMixin from "../../mixins/GlobalMixin";
+
 import { getPreviewUrl } from "../../services/FileUtils";
 import { IDay, IPhoto } from "../../types";
+import * as utils from "../../services/Utils";
+
+import errorsvg from "../../assets/error.svg";
+import CheckCircle from "vue-material-design-icons/CheckCircle.vue";
+import Star from "vue-material-design-icons/Star.vue";
+import Video from "vue-material-design-icons/PlayCircleOutline.vue";
 
 @Component({
   components: {
@@ -91,6 +100,13 @@ export default class Photo extends Mixins(GlobalMixin) {
     this.refresh();
   }
 
+  get videoDuration() {
+    if (this.data.video_duration) {
+      return utils.getDurationStr(this.data.video_duration);
+    }
+    return null;
+  }
+
   async refresh() {
     this.src = await this.getSrc();
   }
@@ -274,7 +290,7 @@ $icon-size: $icon-half-size * 2;
     color: var(--color-primary);
   }
 }
-.play-circle-outline-icon,
+.video,
 .star-icon {
   position: absolute;
   z-index: 100;
@@ -282,12 +298,23 @@ $icon-size: $icon-half-size * 2;
   transition: transform 0.15s ease;
   filter: invert(1) brightness(100);
 }
-.play-circle-outline-icon {
+.video {
+  position: absolute;
   top: var(--icon-dist);
   right: var(--icon-dist);
   .p-outer.selected > & {
     transform: translate(-$icon-size, $icon-size);
   }
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .time {
+    font-size: 0.75em;
+    font-weight: bold;
+    margin-right: 3px;
+  }
 }
 .star-icon {
   bottom: var(--icon-dist);
diff --git a/src/services/Utils.ts b/src/services/Utils.ts
index 858ddf0fb..548af5d61 100644
--- a/src/services/Utils.ts
+++ b/src/services/Utils.ts
@@ -69,6 +69,26 @@ export function getFromNowStr(date: Date) {
   return text.charAt(0).toUpperCase() + text.slice(1);
 }
 
+/** Convert number of seconds to time string */
+export function getDurationStr(sec: number) {
+  let hours = Math.floor(sec / 3600);
+  let minutes: number | string = Math.floor((sec - hours * 3600) / 60);
+  let seconds: number | string = sec - hours * 3600 - minutes * 60;
+
+  if (seconds < 10) {
+    seconds = "0" + seconds;
+  }
+
+  if (hours > 0) {
+    if (minutes < 10) {
+      minutes = "0" + minutes;
+    }
+    return `${hours}:${minutes}:${seconds}`;
+  }
+
+  return `${minutes}:${seconds}`;
+}
+
 /**
  * Returns a hash code from a string
  * @param  {String} str The string to hash.
diff --git a/src/types.ts b/src/types.ts
index e30eb360d..87a46901f 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -77,6 +77,8 @@ export type IPhoto = {
 
   /** Video flag from server */
   isvideo?: boolean;
+  /** Video duration from server */
+  video_duration?: number;
   /** Favorite flag from server */
   isfavorite?: boolean;
   /** Is this a folder */

From 6454d439f53a247df8b9c3a39d673bc19b361da0 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 19:50:24 -0800
Subject: [PATCH 047/163] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc07282b2..235aa0141 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,8 @@ This file is manually updated. Please file an issue if something is missing.
 - **Massively improved video performance**
   - Memories now comes with a dedicated transcoding server with HLS support.
   - Read the documentation [here](https://github.com/pulsejet/memories/wiki/Configuration#video-transcoding) carefully for more details.
-- **Feature**: show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
+- **Feature**: Show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
+- **Feature**: Show duration on video tiles
 - Fix stretched images in viewer ([#176](https://github.com/pulsejet/memories/issues/176))
 
 ## v4.6.1, v3.6.1 (2022-11-07)

From 0dc4784f1a8e90bae6316cceb81be490b9649ddd Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 21:39:13 -0800
Subject: [PATCH 048/163] Restore metadata after image edit (fix #174)

---
 CHANGELOG.md                       |  1 +
 appinfo/routes.php                 |  5 ++-
 lib/Controller/ImageController.php | 43 +++++++++++++++++++
 lib/Db/TimelineWrite.php           |  4 --
 lib/Exif.php                       | 44 +++++++++++++++++--
 src/components/ImageEditor.vue     | 69 +++++++++++++++++++++++++++---
 src/components/Metadata.vue        |  3 +-
 src/components/PsVideo.ts          |  2 +-
 src/components/Timeline.vue        |  2 +
 src/components/Viewer.vue          |  1 -
 src/components/modal/EditDate.vue  |  4 +-
 11 files changed, 157 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 235aa0141..678372fc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ This file is manually updated. Please file an issue if something is missing.
 - **Feature**: Show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
 - **Feature**: Show duration on video tiles
 - Fix stretched images in viewer ([#176](https://github.com/pulsejet/memories/issues/176))
+- Restore metadata after image edit ([#174](https://github.com/pulsejet/memories/issues/174))
 
 ## v4.6.1, v3.6.1 (2022-11-07)
 
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 3bee0f373..e480734fc 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -52,8 +52,9 @@ function w($base, $param) {
         ['name' => 'Faces#faces', 'url' => '/api/faces', 'verb' => 'GET'],
         ['name' => 'Faces#preview', 'url' => '/api/faces/preview/{id}', 'verb' => 'GET'],
 
-        ['name' => 'Image#info', 'url' => '/api/info/{id}', 'verb' => 'GET'],
-        ['name' => 'Image#edit', 'url' => '/api/edit/{id}', 'verb' => 'PATCH'],
+        ['name' => 'Image#info', 'url' => '/api/image/info/{id}', 'verb' => 'GET'],
+        ['name' => 'Image#edit', 'url' => '/api/image/edit/{id}', 'verb' => 'PATCH'],
+        ['name' => 'Image#setExif', 'url' => '/api/image/set-exif/{id}', 'verb' => 'PUT'],
 
         ['name' => 'Archive#archive', 'url' => '/api/archive/{id}', 'verb' => 'PATCH'],
 
diff --git a/lib/Controller/ImageController.php b/lib/Controller/ImageController.php
index d790ee83e..b793318d5 100644
--- a/lib/Controller/ImageController.php
+++ b/lib/Controller/ImageController.php
@@ -55,6 +55,11 @@ public function info(string $id): JSONResponse
         $basic = false !== $this->request->getParam('basic', false);
         $info = $this->timelineQuery->getInfoById($file->getId(), $basic);
 
+        // Get latest exif data if requested
+        if ($this->request->getParam('current', false)) {
+            $info["current"] = Exif::getExifFromFile($file);
+        }
+
         return new JSONResponse($info, Http::STATUS_OK);
     }
 
@@ -113,4 +118,42 @@ public function edit(string $id): JSONResponse
 
         return $this->info($id);
     }
+
+    /**
+     * Set the exif data for a file
+     */
+    public function setExif(string $id): JSONResponse
+    {
+        $user = $this->userSession->getUser();
+        if (null === $user) {
+            return new JSONResponse([], Http::STATUS_PRECONDITION_FAILED);
+        }
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+
+        // Check for permissions and get numeric Id
+        $file = $userFolder->getById((int) $id);
+        if (0 === \count($file)) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+        $file = $file[0];
+
+        // Check if user has permissions
+        if (!$file->isUpdateable()) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        // Get original file from body
+        $exif = $this->request->getParam('raw');
+        $path = $file->getStorage()->getLocalFile($file->getInternalPath());
+        try {
+            Exif::setExif($path, $exif);
+        } catch (\Exception $e) {
+            return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+
+        // Reprocess the file
+        $this->timelineWrite->processFile($file, true);
+
+        return new JSONResponse([], Http::STATUS_OK);
+    }
 }
diff --git a/lib/Db/TimelineWrite.php b/lib/Db/TimelineWrite.php
index 19da9a3a6..a1eceba7b 100644
--- a/lib/Db/TimelineWrite.php
+++ b/lib/Db/TimelineWrite.php
@@ -103,10 +103,6 @@ public function processFile(
             $videoDuration = round($exif['Duration'] ?? $exif['TrackDuration'] ?? 0);
         }
 
-        // Store raw metadata in the database
-        // We need to remove blacklisted fields to prevent leaking info
-        unset($exif['SourceFile'], $exif['FileName'], $exif['ExifToolVersion'], $exif['Directory'], $exif['FileSize'], $exif['FileModifyDate'], $exif['FileAccessDate'], $exif['FileInodeChangeDate'], $exif['FilePermissions']);
-
         // Truncate any fields >2048 chars
         foreach ($exif as $key => &$value) {
             if (\is_string($value) && \strlen($value) > 2048) {
diff --git a/lib/Exif.php b/lib/Exif.php
index 756a7ac20..80313f3cf 100644
--- a/lib/Exif.php
+++ b/lib/Exif.php
@@ -109,7 +109,12 @@ public static function getExifFromFile(File &$file)
             throw new \Exception('Failed to get local file path');
         }
 
-        return self::getExifFromLocalPath($path);
+        $exif = self::getExifFromLocalPath($path);
+
+        // We need to remove blacklisted fields to prevent leaking info
+        unset($exif['SourceFile'], $exif['FileName'], $exif['ExifToolVersion'], $exif['Directory'], $exif['FileSize'], $exif['FileModifyDate'], $exif['FileAccessDate'], $exif['FileInodeChangeDate'], $exif['FilePermissions'], $exif['ThumbnailImage']);
+
+        return $exif;
     }
 
     /** Get exif data as a JSON object from a local file path */
@@ -357,7 +362,7 @@ private static function readOrTimeout($handle, $timeout, $delimiter = null)
 
     private static function getExifFromLocalPathWithStaticProc(string &$path)
     {
-        fwrite(self::$staticPipes[0], "{$path}\n-json\n-api\nQuickTimeUTC=1\n-n\n-execute\n");
+        fwrite(self::$staticPipes[0], "{$path}\n-json\n-b\n-api\nQuickTimeUTC=1\n-n\n-execute\n");
         fflush(self::$staticPipes[0]);
 
         $readyToken = "\n{ready}\n";
@@ -379,7 +384,7 @@ private static function getExifFromLocalPathWithStaticProc(string &$path)
     private static function getExifFromLocalPathWithSeparateProc(string &$path)
     {
         $pipes = [];
-        $proc = proc_open(array_merge(self::getExiftool(), ['-api', 'QuickTimeUTC=1', '-n', '-json', $path]), [
+        $proc = proc_open(array_merge(self::getExiftool(), ['-api', 'QuickTimeUTC=1', '-n', '-json', '-b', $path]), [
             1 => ['pipe', 'w'],
             2 => ['pipe', 'w'],
         ], $pipes);
@@ -435,4 +440,37 @@ private static function updateExifDateForLocalFile(string $path, string $newDate
             throw new \Exception('Could not update exif date: '.$stdout);
         }
     }
+
+    /**
+     * Set exif data using raw json.
+     *
+     * @param string $path to local file
+     * @param array $data exif data
+     *
+     * @throws \Exception on failure
+     */
+    public static function setExif(string &$path, array &$data)
+    {
+        $data['SourceFile'] = $path;
+        $raw = json_encode([$data]);
+        $cmd = array_merge(self::getExiftool(), ['-json=-', $path]);
+        $proc = proc_open($cmd, [
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+        ], $pipes);
+
+        fwrite($pipes[0], $raw);
+        fclose($pipes[0]);
+
+        $stdout = self::readOrTimeout($pipes[1], 30000);
+        fclose($pipes[1]);
+        fclose($pipes[2]);
+        proc_terminate($proc);
+        if (false !== strpos($stdout, 'error')) {
+            error_log("Exiftool error: {$stdout}");
+
+            throw new \Exception('Could not set exif data: '.$stdout);
+        }
+    }
 }
diff --git a/src/components/ImageEditor.vue b/src/components/ImageEditor.vue
index 01bdedc9b..17f7e2465 100644
--- a/src/components/ImageEditor.vue
+++ b/src/components/ImageEditor.vue
@@ -9,7 +9,9 @@ import GlobalMixin from "../mixins/GlobalMixin";
 import { basename, dirname, extname, join } from "path";
 import { emit } from "@nextcloud/event-bus";
 import { showError, showSuccess } from "@nextcloud/dialogs";
+import { generateUrl } from "@nextcloud/router";
 import axios from "@nextcloud/axios";
+
 import FilerobotImageEditor from "filerobot-image-editor";
 import { FilerobotImageEditorConfig } from "react-filerobot-image-editor";
 
@@ -25,6 +27,8 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
   @Prop() mime: string;
   @Prop() src: string;
 
+  private exif: any = null;
+
   private imageEditor: FilerobotImageEditor = null;
 
   get config(): FilerobotImageEditorConfig & { theme: any } {
@@ -117,7 +121,7 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
     };
   }
 
-  mounted() {
+  async mounted() {
     this.imageEditor = new FilerobotImageEditor(
       <any>this.$refs.editor,
       <any>this.config
@@ -125,6 +129,25 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
     this.imageEditor.render();
     window.addEventListener("keydown", this.handleKeydown, true);
     window.addEventListener("DOMNodeInserted", this.handleSfxModal);
+
+    // Get latest exif data
+    try {
+      const res = await axios.get(
+        generateUrl("/apps/memories/api/image/info/{id}?basic=1&current=1", {
+          id: this.fileid,
+        })
+      );
+
+      this.exif = res.data?.current;
+      if (!this.exif) {
+        throw new Error("No exif data");
+      }
+    } catch (err) {
+      console.error(err);
+      alert(
+        this.t("memories", "Failed to get Exif data. Metadata may be lost!")
+      );
+    }
   }
 
   beforeDestroy() {
@@ -132,6 +155,7 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
       this.imageEditor.terminate();
     }
     window.removeEventListener("keydown", this.handleKeydown, true);
+    window.removeEventListener("DOMNodeInserted", this.handleSfxModal);
   }
 
   onClose(closingReason, haveNotSavedChanges) {
@@ -173,20 +197,51 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
     // Sanity check, 0 < quality < 1
     quality = Math.max(Math.min(quality, 1), 0) || 1;
 
+    if (
+      !this.exif &&
+      !confirm(this.t("memories", "No Exif data found! Continue?"))
+    ) {
+      return;
+    }
+
     try {
       const blob = await new Promise((resolve: BlobCallback) =>
         imageCanvas.toBlob(resolve, mimeType, quality)
       );
       const response = await axios.put(putUrl, new File([blob], fullName));
+      const fileid =
+        parseInt(response?.headers?.["oc-fileid"]?.split("oc")[0]) || null;
+      if (response.status >= 400) {
+        throw new Error("Failed to save image");
+      }
+
+      // Strip old and incorrect exif data
+      const exif = this.exif;
+      delete exif.Orientation;
+      delete exif.Rotation;
+      delete exif.ImageHeight;
+      delete exif.ImageWidth;
+      delete exif.ImageSize;
+      delete exif.ModifyDate;
+      delete exif.ExifImageHeight;
+      delete exif.ExifImageWidth;
+      delete exif.ExifImageSize;
+
+      // Update exif data
+      await axios.put(
+        generateUrl("/apps/memories/api/image/set-exif/{id}", {
+          id: fileid,
+        }),
+        {
+          raw: exif,
+        }
+      );
 
       showSuccess(this.t("memories", "Image saved successfully"));
-      if (putUrl !== this.src) {
-        emit("files:file:created", {
-          fileid:
-            parseInt(response?.headers?.["oc-fileid"]?.split("oc")[0]) || null,
-        });
+      if (fileid !== this.fileid) {
+        emit("files:file:created", { fileid });
       } else {
-        emit("files:file:updated", { fileid: this.fileid });
+        emit("files:file:updated", { fileid });
       }
       this.onClose(undefined, false);
     } catch (error) {
diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index 960bb27db..3985713cf 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -87,7 +87,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
 
     let state = this.state;
     const res = await axios.get<any>(
-      generateUrl("/apps/memories/api/info/{id}", { id: fileInfo.id })
+      generateUrl("/apps/memories/api/image/info/{id}", { id: fileInfo.id })
     );
     if (state !== this.state) return;
 
@@ -193,6 +193,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
     const make = this.exif["Make"];
     const model = this.exif["Model"];
     if (!make || !model) return null;
+    if (model.startsWith(make)) return model;
     return `${make} ${model}`;
   }
 
diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index d88d58c0f..b9660dc7d 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -152,7 +152,7 @@ class VideoContentSetup {
           // Get correct orientation
           axios
             .get<any>(
-              generateUrl("/apps/memories/api/info/{id}", {
+              generateUrl("/apps/memories/api/image/info/{id}", {
                 id: content.data.photo.fileid,
               })
             )
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index 19050a590..e19bbc573 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -286,11 +286,13 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
 
   beforeDestroy() {
     unsubscribe(this.config_eventName, this.softRefresh);
+    unsubscribe("files:file:created", this.softRefresh);
     this.resetState();
   }
 
   created() {
     subscribe(this.config_eventName, this.softRefresh);
+    subscribe("files:file:created", this.softRefresh);
     window.addEventListener("resize", this.handleResizeWithDelay);
   }
 
diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index c3baa61f6..d0bc88599 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -229,7 +229,6 @@ export default class Viewer extends Mixins(GlobalMixin) {
 
   /** Event on file changed */
   handleFileUpdated({ fileid }: { fileid: number }) {
-    console.log("file updated", fileid);
     if (this.currentPhoto && this.currentPhoto.fileid === fileid) {
       this.currentPhoto.etag += "_";
       this.photoswipe.refreshSlideContent(this.currIndex);
diff --git a/src/components/modal/EditDate.vue b/src/components/modal/EditDate.vue
index 985ec7a69..8cf5ec3c7 100644
--- a/src/components/modal/EditDate.vue
+++ b/src/components/modal/EditDate.vue
@@ -143,8 +143,8 @@ import axios from "@nextcloud/axios";
 import * as utils from "../../services/Utils";
 import * as dav from "../../services/DavRequests";
 
-const INFO_API_URL = "/apps/memories/api/info/{id}";
-const EDIT_API_URL = "/apps/memories/api/edit/{id}";
+const INFO_API_URL = "/apps/memories/api/image/info/{id}";
+const EDIT_API_URL = "/apps/memories/api/image/edit/{id}";
 
 @Component({
   components: {

From 5519020c2a8e3f8afc2ca19deab13345b8a5d69a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 21:55:14 -0800
Subject: [PATCH 049/163] editor: use b64 for save

---
 lib/Controller/PageController.php |  3 +++
 src/components/ImageEditor.vue    | 32 ++++++++++++-------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 8097d7218..7c2100d1f 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -103,6 +103,9 @@ public function main()
         $policy->addAllowedScriptDomain('blob:');
         $policy->addAllowedMediaDomain('blob:');
 
+        // Image editor
+        $policy->addAllowedConnectDomain('data:');
+
         // Allow nominatim for metadata
         $policy->addAllowedConnectDomain('nominatim.openstreetmap.org');
         $policy->addAllowedFrameDomain('www.openstreetmap.org');
diff --git a/src/components/ImageEditor.vue b/src/components/ImageEditor.vue
index 17f7e2465..9b4c62156 100644
--- a/src/components/ImageEditor.vue
+++ b/src/components/ImageEditor.vue
@@ -171,32 +171,21 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
    * User saved the image
    *
    * @see https://github.com/scaleflex/filerobot-image-editor#onsave
-   * @param {object} props destructuring object
-   * @param {string} props.fullName the file name
-   * @param {HTMLCanvasElement} props.imageCanvas the image canvas
-   * @param {string} props.mimeType the image mime type
-   * @param {number} props.quality the image saving quality
    */
   async onSave({
     fullName,
-    imageCanvas,
-    mimeType,
-    quality,
+    imageBase64,
   }: {
     fullName?: string;
-    imageCanvas?: HTMLCanvasElement;
-    mimeType?: string;
-    quality?: number;
+    imageBase64?: string;
   }): Promise<void> {
+    if (!imageBase64) {
+      throw new Error("No image data");
+    }
+
     const { origin, pathname } = new URL(this.src);
     const putUrl = origin + join(dirname(pathname), fullName);
 
-    // toBlob is not very smart...
-    mimeType = mimeType.replace("jpg", "jpeg");
-
-    // Sanity check, 0 < quality < 1
-    quality = Math.max(Math.min(quality, 1), 0) || 1;
-
     if (
       !this.exif &&
       !confirm(this.t("memories", "No Exif data found! Continue?"))
@@ -205,9 +194,7 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
     }
 
     try {
-      const blob = await new Promise((resolve: BlobCallback) =>
-        imageCanvas.toBlob(resolve, mimeType, quality)
-      );
+      const blob = await fetch(imageBase64).then((res) => res.blob());
       const response = await axios.put(putUrl, new File([blob], fullName));
       const fileid =
         parseInt(response?.headers?.["oc-fileid"]?.split("oc")[0]) || null;
@@ -645,4 +632,9 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
 
   filter: var(--background-invert-if-dark);
 }
+
+.FIE_carousel-prev-button,
+.FIE_carousel-next-button {
+  background: none !important;
+}
 </style>
\ No newline at end of file

From 67e5c835cec2f47ca62ff5b35a92adc53d142480 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 21:59:26 -0800
Subject: [PATCH 050/163] editor: fix loss of resolution

---
 CHANGELOG.md                   | 3 ++-
 src/components/ImageEditor.vue | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 678372fc5..6b91bf932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,8 @@ This file is manually updated. Please file an issue if something is missing.
 - **Feature**: Show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
 - **Feature**: Show duration on video tiles
 - Fix stretched images in viewer ([#176](https://github.com/pulsejet/memories/issues/176))
-- Restore metadata after image edit ([#174](https://github.com/pulsejet/memories/issues/174))
+- Editor: Restore metadata after image edit ([#174](https://github.com/pulsejet/memories/issues/174))
+- Editor: Fix loss of resolution after edit
 
 ## v4.6.1, v3.6.1 (2022-11-07)
 
diff --git a/src/components/ImageEditor.vue b/src/components/ImageEditor.vue
index 9b4c62156..6c4c000ea 100644
--- a/src/components/ImageEditor.vue
+++ b/src/components/ImageEditor.vue
@@ -88,8 +88,8 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
         },
       },
 
-      savingPixelRatio: 1,
-      previewPixelRatio: 1,
+      savingPixelRatio: 8,
+      previewPixelRatio: window.devicePixelRatio,
     };
   }
 

From 11afad852bc6039f1031ea462dfb30468f8cf855 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 22:19:44 -0800
Subject: [PATCH 051/163] Lot of de-duplication

---
 appinfo/routes.php                 |  3 +-
 lib/Controller/ApiBase.php         | 18 ++++++
 lib/Controller/ImageController.php | 98 +++++++++---------------------
 lib/Db/TimelineQueryDays.php       |  3 +-
 lib/Exif.php                       | 98 +++++++-----------------------
 src/components/ImageEditor.vue     |  2 +-
 src/components/modal/EditDate.vue  | 13 ++--
 7 files changed, 78 insertions(+), 157 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index e480734fc..32b991631 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -53,8 +53,7 @@ function w($base, $param) {
         ['name' => 'Faces#preview', 'url' => '/api/faces/preview/{id}', 'verb' => 'GET'],
 
         ['name' => 'Image#info', 'url' => '/api/image/info/{id}', 'verb' => 'GET'],
-        ['name' => 'Image#edit', 'url' => '/api/image/edit/{id}', 'verb' => 'PATCH'],
-        ['name' => 'Image#setExif', 'url' => '/api/image/set-exif/{id}', 'verb' => 'PUT'],
+        ['name' => 'Image#setExif', 'url' => '/api/image/set-exif/{id}', 'verb' => 'PATCH'],
 
         ['name' => 'Archive#archive', 'url' => '/api/archive/{id}', 'verb' => 'PATCH'],
 
diff --git a/lib/Controller/ApiBase.php b/lib/Controller/ApiBase.php
index 1916cca4c..1dcd43360 100644
--- a/lib/Controller/ApiBase.php
+++ b/lib/Controller/ApiBase.php
@@ -31,6 +31,7 @@
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\IConfig;
@@ -133,6 +134,23 @@ protected function getRequestFolder()
         return $folder;
     }
 
+    protected function getUserFile(int $id): File
+    {
+        $user = $this->userSession->getUser();
+        if (null === $user) {
+            return null;
+        }
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+
+        // Check for permissions and get numeric Id
+        $file = $userFolder->getById($id);
+        if (0 === \count($file)) {
+            return null;
+        }
+
+        return $file[0];
+    }
+
     protected function isRecursive()
     {
         return null === $this->request->getParam('folder');
diff --git a/lib/Controller/ImageController.php b/lib/Controller/ImageController.php
index b793318d5..ee5c36e8b 100644
--- a/lib/Controller/ImageController.php
+++ b/lib/Controller/ImageController.php
@@ -38,18 +38,10 @@ class ImageController extends ApiBase
      */
     public function info(string $id): JSONResponse
     {
-        $user = $this->userSession->getUser();
-        if (null === $user) {
-            return new JSONResponse([], Http::STATUS_PRECONDITION_FAILED);
-        }
-        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
-
-        // Check for permissions and get numeric Id
-        $file = $userFolder->getById((int) $id);
-        if (0 === \count($file)) {
+        $file = $this->getUserFile((int) $id);
+        if (!$file) {
             return new JSONResponse([], Http::STATUS_NOT_FOUND);
         }
-        $file = $file[0];
 
         // Get the image info
         $basic = false !== $this->request->getParam('basic', false);
@@ -57,103 +49,69 @@ public function info(string $id): JSONResponse
 
         // Get latest exif data if requested
         if ($this->request->getParam('current', false)) {
-            $info["current"] = Exif::getExifFromFile($file);
+            $info['current'] = Exif::getExifFromFile($file);
         }
 
         return new JSONResponse($info, Http::STATUS_OK);
     }
 
     /**
-     * @NoAdminRequired
-     *
-     * Change exif data for one file
-     *
-     * @param string fileid
+     * Set the exif data for a file.
      */
-    public function edit(string $id): JSONResponse
+    public function setExif(string $id): JSONResponse
     {
-        $user = $this->userSession->getUser();
-        if (null === $user) {
-            return new JSONResponse([], Http::STATUS_PRECONDITION_FAILED);
-        }
-        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
-
-        // Check for permissions and get numeric Id
-        $file = $userFolder->getById((int) $id);
-        if (0 === \count($file)) {
+        $file = $this->getUserFile((int) $id);
+        if (!$file) {
             return new JSONResponse([], Http::STATUS_NOT_FOUND);
         }
-        $file = $file[0];
 
         // Check if user has permissions
         if (!$file->isUpdateable()) {
             return new JSONResponse([], Http::STATUS_FORBIDDEN);
         }
 
-        // Get new date from body
-        $body = $this->request->getParams();
-        if (!isset($body['date'])) {
-            return new JSONResponse(['message' => 'Missing date'], Http::STATUS_BAD_REQUEST);
-        }
+        // Get original file from body
+        $exif = $this->request->getParam('raw');
+        $path = $file->getStorage()->getLocalFile($file->getInternalPath());
 
-        // Make sure the date is valid
         try {
-            Exif::parseExifDate($body['date']);
+            Exif::setExif($path, $exif);
         } catch (\Exception $e) {
-            return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
+            return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
         }
 
-        // Update date
-        try {
-            $res = Exif::updateExifDate($file, $body['date']);
-            if (false === $res) {
-                return new JSONResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
-            }
-        } catch (\Exception $e) {
-            return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+        // Update remote file if not local
+        if (!$file->getStorage()->isLocal()) {
+            $file->putContent(fopen($path, 'r')); // closes the handler
         }
 
         // Reprocess the file
         $this->timelineWrite->processFile($file, true);
 
-        return $this->info($id);
+        return new JSONResponse([], Http::STATUS_OK);
     }
 
     /**
-     * Set the exif data for a file
+     * Get a full resolution PNG for editing from a file.
      */
-    public function setExif(string $id): JSONResponse
+    public function getPNG(string $id)
     {
-        $user = $this->userSession->getUser();
-        if (null === $user) {
-            return new JSONResponse([], Http::STATUS_PRECONDITION_FAILED);
-        }
-        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
-
-        // Check for permissions and get numeric Id
-        $file = $userFolder->getById((int) $id);
-        if (0 === \count($file)) {
+        $file = $this->getUserFile((int) $id);
+        if (!$file) {
             return new JSONResponse([], Http::STATUS_NOT_FOUND);
         }
-        $file = $file[0];
 
-        // Check if user has permissions
-        if (!$file->isUpdateable()) {
-            return new JSONResponse([], Http::STATUS_FORBIDDEN);
-        }
+        // Get the image info
+        $info = $this->timelineQuery->getInfoById($file->getId(), true);
 
-        // Get original file from body
-        $exif = $this->request->getParam('raw');
+        // Get the image
         $path = $file->getStorage()->getLocalFile($file->getInternalPath());
-        try {
-            Exif::setExif($path, $exif);
-        } catch (\Exception $e) {
-            return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
-        }
+        $image = Exif::getPNG($path, $info['exif']);
 
-        // Reprocess the file
-        $this->timelineWrite->processFile($file, true);
+        // Return the image
+        $response = new Http\DataDisplayResponse($image, Http::STATUS_OK, ['Content-Type' => 'image/png']);
+        $response->cacheFor(0);
 
-        return new JSONResponse([], Http::STATUS_OK);
+        return $response;
     }
 }
diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index 2899c2d95..0bbbe9a1d 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -203,8 +203,7 @@ private function processDay(&$day, $uid, $folder)
             $row['w'] = (int) $row['w'];
             $row['h'] = (int) $row['h'];
             if (!$row['isvideo']) {
-                unset($row['isvideo']);
-                unset($row['video_duration']);
+                unset($row['isvideo'], $row['video_duration']);
             }
             if ($row['categoryid']) {
                 $row['isfavorite'] = 1;
diff --git a/lib/Exif.php b/lib/Exif.php
index 80313f3cf..1d98df75c 100644
--- a/lib/Exif.php
+++ b/lib/Exif.php
@@ -230,29 +230,35 @@ public static function getDimensions(array &$exif)
     }
 
     /**
-     * Update exif date using exiftool.
+     * Set exif data using raw json.
+     *
+     * @param string $path to local file
+     * @param array  $data exif data
      *
-     * @param string $newDate formatted in standard Exif format (YYYY:MM:DD HH:MM:SS)
+     * @throws \Exception on failure
      */
-    public static function updateExifDate(File &$file, string $newDate)
+    public static function setExif(string &$path, array &$data)
     {
-        // Don't want to mess these up, definitely
-        if ($file->isEncrypted()) {
-            throw new \Exception('Cannot update exif date on encrypted files');
-        }
+        $data['SourceFile'] = $path;
+        $raw = json_encode([$data]);
+        $cmd = array_merge(self::getExiftool(), ['-json=-', $path]);
+        $proc = proc_open($cmd, [
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+        ], $pipes);
 
-        // Get path to local (copy) of the file
-        $path = $file->getStorage()->getLocalFile($file->getInternalPath());
-        if (!\is_string($path)) {
-            throw new \Exception('Failed to get local file path');
-        }
+        fwrite($pipes[0], $raw);
+        fclose($pipes[0]);
 
-        // Update exif data
-        self::updateExifDateForLocalFile($path, $newDate);
+        $stdout = self::readOrTimeout($pipes[1], 30000);
+        fclose($pipes[1]);
+        fclose($pipes[2]);
+        proc_terminate($proc);
+        if (false !== strpos($stdout, 'error')) {
+            error_log("Exiftool error: {$stdout}");
 
-        // Update remote file if not local
-        if (!$file->getStorage()->isLocal()) {
-            $file->putContent(fopen($path, 'r')); // closes the handler
+            throw new \Exception('Could not set exif data: '.$stdout);
         }
     }
 
@@ -415,62 +421,4 @@ private static function processStdout(string &$stdout)
 
         return $json[0];
     }
-
-    /**
-     * Update exif date using exiftool for a local file.
-     *
-     * @param string $newDate formatted in standard Exif format (YYYY:MM:DD HH:MM:SS)
-     *
-     * @throws \Exception on failure
-     */
-    private static function updateExifDateForLocalFile(string $path, string $newDate)
-    {
-        $cmd = array_merge(self::getExiftool(), ['-api', 'QuickTimeUTC=1', '-overwrite_original', '-DateTimeOriginal='.$newDate, $path]);
-        $proc = proc_open($cmd, [
-            1 => ['pipe', 'w'],
-            2 => ['pipe', 'w'],
-        ], $pipes);
-        $stdout = self::readOrTimeout($pipes[1], 300000);
-        fclose($pipes[1]);
-        fclose($pipes[2]);
-        proc_terminate($proc);
-        if (false !== strpos($stdout, 'error')) {
-            error_log("Exiftool error: {$stdout}");
-
-            throw new \Exception('Could not update exif date: '.$stdout);
-        }
-    }
-
-    /**
-     * Set exif data using raw json.
-     *
-     * @param string $path to local file
-     * @param array $data exif data
-     *
-     * @throws \Exception on failure
-     */
-    public static function setExif(string &$path, array &$data)
-    {
-        $data['SourceFile'] = $path;
-        $raw = json_encode([$data]);
-        $cmd = array_merge(self::getExiftool(), ['-json=-', $path]);
-        $proc = proc_open($cmd, [
-            0 => ['pipe', 'r'],
-            1 => ['pipe', 'w'],
-            2 => ['pipe', 'w'],
-        ], $pipes);
-
-        fwrite($pipes[0], $raw);
-        fclose($pipes[0]);
-
-        $stdout = self::readOrTimeout($pipes[1], 30000);
-        fclose($pipes[1]);
-        fclose($pipes[2]);
-        proc_terminate($proc);
-        if (false !== strpos($stdout, 'error')) {
-            error_log("Exiftool error: {$stdout}");
-
-            throw new \Exception('Could not set exif data: '.$stdout);
-        }
-    }
 }
diff --git a/src/components/ImageEditor.vue b/src/components/ImageEditor.vue
index 6c4c000ea..1b76e9b8e 100644
--- a/src/components/ImageEditor.vue
+++ b/src/components/ImageEditor.vue
@@ -215,7 +215,7 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
       delete exif.ExifImageSize;
 
       // Update exif data
-      await axios.put(
+      await axios.patch(
         generateUrl("/apps/memories/api/image/set-exif/{id}", {
           id: fileid,
         }),
diff --git a/src/components/modal/EditDate.vue b/src/components/modal/EditDate.vue
index 8cf5ec3c7..fbf99c0b8 100644
--- a/src/components/modal/EditDate.vue
+++ b/src/components/modal/EditDate.vue
@@ -144,7 +144,7 @@ import * as utils from "../../services/Utils";
 import * as dav from "../../services/DavRequests";
 
 const INFO_API_URL = "/apps/memories/api/image/info/{id}";
-const EDIT_API_URL = "/apps/memories/api/image/edit/{id}";
+const EDIT_API_URL = "/apps/memories/api/image/set-exif/{id}";
 
 @Component({
   components: {
@@ -269,12 +269,11 @@ export default class EditDate extends Mixins(GlobalMixin) {
     try {
       this.processing = true;
       const fileid = this.photos[0].fileid;
-      const res = await axios.patch<any>(
-        generateUrl(EDIT_API_URL, { id: fileid }),
-        {
-          date: this.getExifFormat(this.getDate()),
-        }
-      );
+      await axios.patch<any>(generateUrl(EDIT_API_URL, { id: fileid }), {
+        raw: {
+          DateTimeOriginal: this.getExifFormat(this.getDate()),
+        },
+      });
       emit("files:file:updated", { fileid });
       this.emitRefresh(true);
       this.close();

From 8a002ac331ab8fc1835ebb4a47b79d1d54344b2a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 22:24:38 -0800
Subject: [PATCH 052/163] Add missing annotations

---
 lib/Controller/ImageController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Controller/ImageController.php b/lib/Controller/ImageController.php
index ee5c36e8b..3c182e764 100644
--- a/lib/Controller/ImageController.php
+++ b/lib/Controller/ImageController.php
@@ -56,7 +56,11 @@ public function info(string $id): JSONResponse
     }
 
     /**
+     * @NoAdminRequired
+     *
      * Set the exif data for a file.
+     *
+     * @param string fileid
      */
     public function setExif(string $id): JSONResponse
     {

From a85b06bac05cb2338d9d62108a7fbfc7e0e0e72f Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 22:25:41 -0800
Subject: [PATCH 053/163] metaview: fix wrong date tz

---
 src/components/Metadata.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index 3985713cf..850aa3920 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -163,7 +163,7 @@ export default class Metadata extends Mixins(GlobalMixin) {
     const dt = this.exif["DateTimeOriginal"] || this.exif["CreateDate"];
     if (!dt) return null;
 
-    const m = moment(dt, "YYYY:MM:DD HH:mm:ss");
+    const m = moment.utc(dt, "YYYY:MM:DD HH:mm:ss");
     if (!m.isValid()) return null;
     m.locale(getCanonicalLocale());
     return m;

From 0074647b2114b245d176af64bbf5b4cfd2b5a003 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 22:34:58 -0800
Subject: [PATCH 054/163] apibase: fix getuserfile

---
 lib/Controller/ApiBase.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/ApiBase.php b/lib/Controller/ApiBase.php
index 1dcd43360..072ab26d9 100644
--- a/lib/Controller/ApiBase.php
+++ b/lib/Controller/ApiBase.php
@@ -134,7 +134,14 @@ protected function getRequestFolder()
         return $folder;
     }
 
-    protected function getUserFile(int $id): File
+    /**
+     * Get a file with ID from user's folder
+     *
+     * @param int $fileId
+     *
+     * @return File|null
+     */
+    protected function getUserFile(int $id)
     {
         $user = $this->userSession->getUser();
         if (null === $user) {
@@ -148,6 +155,11 @@ protected function getUserFile(int $id): File
             return null;
         }
 
+        // Check if node is a file
+        if (!($file[0] instanceof File)) {
+            return null;
+        }
+
         return $file[0];
     }
 

From 515f0c48ebb24c856c69612def0060cd81e445c9 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 22:43:58 -0800
Subject: [PATCH 055/163] editor: heic

---
 CHANGELOG.md                       |  1 +
 appinfo/routes.php                 |  1 +
 lib/Controller/ApiBase.php         |  6 +++---
 lib/Controller/ImageController.php | 25 ++++++++++++++++++-------
 src/components/ImageEditor.vue     | 11 ++++++++++-
 src/components/Viewer.vue          |  2 +-
 6 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b91bf932..70dc2fc6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This file is manually updated. Please file an issue if something is missing.
 - Fix stretched images in viewer ([#176](https://github.com/pulsejet/memories/issues/176))
 - Editor: Restore metadata after image edit ([#174](https://github.com/pulsejet/memories/issues/174))
 - Editor: Fix loss of resolution after edit
+- Editor: Allow editing all image formats (HEIC etc.)
 
 ## v4.6.1, v3.6.1 (2022-11-07)
 
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 32b991631..6915ed88d 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -54,6 +54,7 @@ function w($base, $param) {
 
         ['name' => 'Image#info', 'url' => '/api/image/info/{id}', 'verb' => 'GET'],
         ['name' => 'Image#setExif', 'url' => '/api/image/set-exif/{id}', 'verb' => 'PATCH'],
+        ['name' => 'Image#jpeg', 'url' => '/api/image/jpeg/{id}', 'verb' => 'GET'],
 
         ['name' => 'Archive#archive', 'url' => '/api/archive/{id}', 'verb' => 'PATCH'],
 
diff --git a/lib/Controller/ApiBase.php b/lib/Controller/ApiBase.php
index 072ab26d9..3d3ef6674 100644
--- a/lib/Controller/ApiBase.php
+++ b/lib/Controller/ApiBase.php
@@ -135,11 +135,11 @@ protected function getRequestFolder()
     }
 
     /**
-     * Get a file with ID from user's folder
+     * Get a file with ID from user's folder.
      *
      * @param int $fileId
      *
-     * @return File|null
+     * @return null|File
      */
     protected function getUserFile(int $id)
     {
@@ -156,7 +156,7 @@ protected function getUserFile(int $id)
         }
 
         // Check if node is a file
-        if (!($file[0] instanceof File)) {
+        if (!$file[0] instanceof File) {
             return null;
         }
 
diff --git a/lib/Controller/ImageController.php b/lib/Controller/ImageController.php
index 3c182e764..43531472f 100644
--- a/lib/Controller/ImageController.php
+++ b/lib/Controller/ImageController.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Memories\Controller;
 
+use OCA\Memories\AppInfo\Application;
 use OCA\Memories\Exif;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
@@ -96,25 +97,35 @@ public function setExif(string $id): JSONResponse
     }
 
     /**
-     * Get a full resolution PNG for editing from a file.
+     * @NoAdminRequired
+     *
+     * @NoCSRFRequired
+     *
+     * Get a full resolution JPEG for editing from a file.
      */
-    public function getPNG(string $id)
+    public function jpeg(string $id)
     {
         $file = $this->getUserFile((int) $id);
         if (!$file) {
             return new JSONResponse([], Http::STATUS_NOT_FOUND);
         }
 
-        // Get the image info
-        $info = $this->timelineQuery->getInfoById($file->getId(), true);
+        // check if valid image
+        $mimetype = $file->getMimeType();
+        if (!\in_array($mimetype, Application::IMAGE_MIMES, true)) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
 
         // Get the image
         $path = $file->getStorage()->getLocalFile($file->getInternalPath());
-        $image = Exif::getPNG($path, $info['exif']);
+        $image = new \Imagick($path);
+        $image->setImageFormat('jpeg');
+        $image->setImageCompressionQuality(95);
+        $blob = $image->getImageBlob();
 
         // Return the image
-        $response = new Http\DataDisplayResponse($image, Http::STATUS_OK, ['Content-Type' => 'image/png']);
-        $response->cacheFor(0);
+        $response = new Http\DataDisplayResponse($blob, Http::STATUS_OK, ['Content-Type' => $image->getImageMimeType()]);
+        $response->cacheFor(3600 * 24, false, false);
 
         return $response;
     }
diff --git a/src/components/ImageEditor.vue b/src/components/ImageEditor.vue
index 1b76e9b8e..be4c24221 100644
--- a/src/components/ImageEditor.vue
+++ b/src/components/ImageEditor.vue
@@ -32,8 +32,17 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
   private imageEditor: FilerobotImageEditor = null;
 
   get config(): FilerobotImageEditorConfig & { theme: any } {
+    let src: string;
+    if (["image/png", "image/jpeg", "image/webp"].includes(this.mime)) {
+      src = this.src;
+    } else {
+      src = generateUrl("/apps/memories/api/image/jpeg/{fileid}", {
+        fileid: this.fileid,
+      });
+    }
+
     return {
-      source: this.src,
+      source: src,
 
       defaultSavedImageName: this.defaultSavedImageName,
       defaultSavedImageType: this.defaultSavedImageType,
diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index d0bc88599..001e2d269 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -586,7 +586,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
   }
 
   get canEdit() {
-    return ["image/jpeg", "image/png"].includes(this.currentPhoto?.mimetype);
+    return this.currentPhoto?.mimetype?.startsWith("image/");
   }
 
   private openEditor() {

From 0e84a648279761b2dfe30339d6e8b0459fac92b0 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 22:44:45 -0800
Subject: [PATCH 056/163] Update changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70dc2fc6c..9dd04e71e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,10 +10,10 @@ This file is manually updated. Please file an issue if something is missing.
   - Read the documentation [here](https://github.com/pulsejet/memories/wiki/Configuration#video-transcoding) carefully for more details.
 - **Feature**: Show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
 - **Feature**: Show duration on video tiles
+- **Feature**: Allow editing all image formats (HEIC etc.)
 - Fix stretched images in viewer ([#176](https://github.com/pulsejet/memories/issues/176))
-- Editor: Restore metadata after image edit ([#174](https://github.com/pulsejet/memories/issues/174))
-- Editor: Fix loss of resolution after edit
-- Editor: Allow editing all image formats (HEIC etc.)
+- Restore metadata after image edit ([#174](https://github.com/pulsejet/memories/issues/174))
+- Fix loss of resolution after image edit
 
 ## v4.6.1, v3.6.1 (2022-11-07)
 

From 8569af561b3828e02a9541a0dedc95314baeb23b Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 9 Nov 2022 23:02:20 -0800
Subject: [PATCH 057/163] editor: remove useless event

---
 src/components/ImageEditor.vue | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/components/ImageEditor.vue b/src/components/ImageEditor.vue
index be4c24221..80131b849 100644
--- a/src/components/ImageEditor.vue
+++ b/src/components/ImageEditor.vue
@@ -137,7 +137,6 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
     );
     this.imageEditor.render();
     window.addEventListener("keydown", this.handleKeydown, true);
-    window.addEventListener("DOMNodeInserted", this.handleSfxModal);
 
     // Get latest exif data
     try {
@@ -164,7 +163,6 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
       this.imageEditor.terminate();
     }
     window.removeEventListener("keydown", this.handleKeydown, true);
-    window.removeEventListener("DOMNodeInserted", this.handleSfxModal);
   }
 
   onClose(closingReason, haveNotSavedChanges) {
@@ -298,21 +296,6 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
       ).click();
     }
   }
-
-  /**
-   * Watch out for Modal inject in document root
-   * That way we can adjust the focusTrap
-   *
-   * @param {Event} event Dom insertion event
-   */
-  handleSfxModal(event) {
-    if (
-      event.target?.classList &&
-      event.target.classList.contains("SfxModal-Wrapper")
-    ) {
-      emit("viewer:trapElements:changed", event.target);
-    }
-  }
 }
 </script>
 

From 6b566b34e0076cb1adfc8c080da89cd13a441978 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 21:25:26 -0800
Subject: [PATCH 058/163] Switch to go-vod

---
 appinfo/routes.php                 |  2 +-
 lib/Command/VideoSetup.php         | 38 +++++++++----------
 lib/Controller/VideoController.php | 34 ++++++++---------
 scripts/get-exiftool.sh            | 10 ++---
 src/components/PsVideo.ts          |  6 ++-
 transcoder.yaml                    | 59 ------------------------------
 6 files changed, 43 insertions(+), 106 deletions(-)
 delete mode 100644 transcoder.yaml

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 6915ed88d..b5d367baa 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -58,7 +58,7 @@ function w($base, $param) {
 
         ['name' => 'Archive#archive', 'url' => '/api/archive/{id}', 'verb' => 'PATCH'],
 
-        ['name' => 'Video#transcode', 'url' => '/api/video/transcode/{fileid}/{profile}', 'verb' => 'GET'],
+        ['name' => 'Video#transcode', 'url' => '/api/video/transcode/{client}/{fileid}/{profile}', 'verb' => 'GET'],
 
         // Config API
         ['name' => 'Other#setUserConfig', 'url' => '/api/config/{key}', 'verb' => 'PUT'],
diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index 752858c98..6afa8669a 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -82,34 +82,33 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return $this->suggestDisable($output);
         }
 
-        // Check go-transcode binary
-        $output->writeln('Checking for go-transcode binary');
+        // Check go-vod binary
+        $output->writeln('Checking for go-vod binary');
 
         // Detect architecture
         $arch = \OCA\Memories\Util::getArch();
-        $libc = \OCA\Memories\Util::getLibc();
 
-        if (!$arch || !$libc) {
-            $output->writeln('<error>Compatible go-transcode binary not found</error>');
-            $this->suggestGoTranscode($output);
+        if (!$arch) {
+            $output->writeln('<error>Compatible go-vod binary not found</error>');
+            $this->suggestGoVod($output);
 
             return $this->suggestDisable($output);
         }
 
-        $goTranscodePath = realpath(__DIR__."/../../exiftool-bin/go-transcode-{$arch}-{$libc}");
-        $output->writeln("Trying go-transcode from {$goTranscodePath}");
-        chmod($goTranscodePath, 0755);
+        $goVodPath = realpath(__DIR__."/../../exiftool-bin/go-vod-{$arch}");
+        $output->writeln("Trying go-vod from {$goVodPath}");
+        chmod($goVodPath, 0755);
 
-        $goTranscode = shell_exec($goTranscodePath.' --help');
-        if (!$goTranscode || false === strpos($goTranscode, 'Available Commands')) {
-            $output->writeln('<error>go-transcode could not be run</error>');
-            $this->suggestGoTranscode($output);
+        $goVod = shell_exec($goVodPath.' test');
+        if (!$goVod || false === strpos($goVod, 'test successful')) {
+            $output->writeln('<error>go-vod could not be run</error>');
+            $this->suggestGoVod($output);
 
             return $this->suggestDisable($output);
         }
 
         // Go transcode is working. Yay!
-        $output->writeln('go-transcode is installed!');
+        $output->writeln('go-vod is installed!');
         $output->writeln('');
         $output->writeln('You can use transcoding and HLS streaming');
         $output->writeln('This is recommended for better performance, but has implications if');
@@ -127,10 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 0;
         }
 
-        $tConfig = realpath(__DIR__.'/../../transcoder.yaml');
-
-        $this->config->setSystemValue('memories.transcoder', $goTranscodePath);
-        $this->config->setSystemValue('memories.transcoder_config', $tConfig);
+        $this->config->setSystemValue('memories.transcoder', $goVodPath);
         $this->config->setSystemValue('memories.no_transcode', false);
         $output->writeln('Transcoding and HLS are now enabled!');
 
@@ -153,10 +149,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    protected function suggestGoTranscode(OutputInterface $output): void
+    protected function suggestGoVod(OutputInterface $output): void
     {
-        $output->writeln('You may build go-transcode from source');
-        $output->writeln('It can be downloaded from https://github.com/pulsejet/go-transcode');
+        $output->writeln('You may build go-vod from source');
+        $output->writeln('It can be downloaded from https://github.com/pulsejet/go-vod');
         $output->writeln('Once built, point the path to the binary in the config for `memories.transcoder`');
     }
 
diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 07ada0438..66f14345d 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -36,12 +36,9 @@ class VideoController extends ApiBase
      *
      * Transcode a video to HLS by proxy
      *
-     * @param string fileid
-     * @param string video profile
-     *
      * @return JSONResponse an empty JSONResponse with respective http status code
      */
-    public function transcode(string $fileid, string $profile): Http\Response
+    public function transcode(string $client, string $fileid, string $profile): Http\Response
     {
         $user = $this->userSession->getUser();
         if (null === $user) {
@@ -53,6 +50,11 @@ public function transcode(string $fileid, string $profile): Http\Response
             return new JSONResponse(['message' => 'Transcoding disabled'], Http::STATUS_FORBIDDEN);
         }
 
+        // Check client identifier is 8 characters or more
+        if (\strlen($client) < 8) {
+            return new JSONResponse(['message' => 'Invalid client identifier'], Http::STATUS_BAD_REQUEST);
+        }
+
         // Get file
         $files = $this->rootFolder->getUserFolder($user->getUID())->getById($fileid);
         if (0 === \count($files)) {
@@ -78,14 +80,13 @@ public function transcode(string $fileid, string $profile): Http\Response
         }
 
         // Make upstream request
-        [$data, $contentType, $returnCode] = $this->getUpstream($path, $profile);
+        [$data, $contentType, $returnCode] = $this->getUpstream($client, $path, $profile);
 
         // If status code was 0, it's likely the server is down
         // Make one attempt to start if we can't find the process
         if (0 === $returnCode) {
             $transcoder = $this->config->getSystemValue('memories.transcoder', false);
-            $tConfig = $this->config->getSystemValue('memories.transcoder_config', false);
-            if (!$transcoder || !$tConfig) {
+            if (!$transcoder) {
                 return new JSONResponse(['message' => 'Transcoder not configured'], Http::STATUS_INTERNAL_SERVER_ERROR);
             }
 
@@ -97,15 +98,12 @@ public function transcode(string $fileid, string $profile): Http\Response
             }
 
             // Check if already running
-            exec('ps a | grep go-transcode | grep -v grep', $procs);
-            if (0 === \count($procs)) {
-                shell_exec("mkdir -p {$tmpDir}/transcoder"); // php func has some weird problems
-                shell_exec("{$env} nohup {$transcoder} serve --config {$tConfig} > {$tmpDir}/transcoder/run.log 2>&1 & > /dev/null");
-            }
+            shell_exec("pkill {$transcoder}");
+            shell_exec("{$env} nohup {$transcoder} > {$tmpDir}/go-vod.log 2>&1 & > /dev/null");
 
-            // wait for 2s and try again
-            sleep(2);
-            [$data, $contentType, $returnCode] = $this->getUpstream($path, $profile);
+            // wait for 1s and try again
+            sleep(1);
+            [$data, $contentType, $returnCode] = $this->getUpstream($client, $path, $profile);
         }
 
         // Check data was received
@@ -117,15 +115,15 @@ public function transcode(string $fileid, string $profile): Http\Response
         $response = new DataDisplayResponse($data, Http::STATUS_OK, [
             'Content-Type' => $contentType,
         ]);
-        $response->cacheFor(3600 * 24, false, false);
+        $response->cacheFor(0, false, false);
 
         return $response;
     }
 
-    private function getUpstream($path, $profile)
+    private function getUpstream($client, $path, $profile)
     {
         $path = rawurlencode($path);
-        $ch = curl_init("http://127.0.0.1:47788/vod/{$path}/{$profile}");
+        $ch = curl_init("http://127.0.0.1:47788/{$client}{$path}/{$profile}");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
         curl_setopt($ch, CURLOPT_HEADER, 0);
diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 44217fc2b..363b3fc84 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,11 +17,9 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-gotranscode="v0.0.3"
-wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-amd64-musl"
-wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-amd64-glibc"
-wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-aarch64-musl"
-wget -q "https://github.com/pulsejet/go-transcode/releases/download/$gotranscode/go-transcode-aarch64-glibc"
-chmod 755 go-transcode-*
+govod="0.0.2"
+wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
+wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
+chmod 755 go-vod-*
 
 cd ..
diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index b9660dc7d..25a652d7f 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -14,6 +14,10 @@ const config_noTranscode = loadState(
   <string>"UNSET"
 ) as boolean | string;
 
+// Generate client id for this instance
+// Does not need to be cryptographically secure
+const clientId = Math.random().toString(36).substring(2, 15).padEnd(12, "0");
+
 /**
  * Check if slide has video content
  *
@@ -89,7 +93,7 @@ class VideoContentSetup {
           // Create hls sources if enabled
           let sources: any[] = [];
           const baseUrl = generateUrl(
-            `/apps/memories/api/video/transcode/${fileid}`
+            `/apps/memories/api/video/transcode/${clientId}/${fileid}`
           );
 
           if (!config_noTranscode) {
diff --git a/transcoder.yaml b/transcoder.yaml
deleted file mode 100644
index 063b40e7f..000000000
--- a/transcoder.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# allow debug outputs
-debug: false
-
-# mount debug pprof endpoint at /debug/pprof/
-pprof: false
-
-# bind server to IP:PORT (use :47788 for all connections)
-# DO NOT expose this port to the world
-bind: localhost:47788
-
-# X-Forwarded-For headers will be used to determine the client IP
-proxy: true
-
-# For static files
-vod:
-  # Root directory for media
-  media-dir: /
-
-  # Temporary transcode output directory, if empty, default tmp folder will be used
-  transcode-dir: /tmp/transcoder/data
-
-  # Available video profiles
-  # Do not change these
-  video-profiles:
-    360p:
-      width: 640 # px
-      height: 360 # px
-      bitrate: 800 # kbps
-    480p:
-      width: 640
-      height: 480
-      bitrate: 1200
-    720p:
-      width: 1280
-      height: 720
-      bitrate: 2800
-    1080p:
-      width: 1920
-      height: 1080
-      bitrate: 5000
-
-  # Use video keyframes as existing reference for chunks split
-  # Using this might cause long probing times in order to get
-  # all keyframes - therefore they should be cached
-  video-keyframes: false
-
-  # Single audio profile used
-  audio-profile:
-    bitrate: 192 # kbps
-
-  # If cache is enabled
-  cache: true
-  # If dir is empty, cache will be stored in the same directory as media source
-  # If not empty, cache files will be saved to specified directory
-  cache-dir: /tmp/transcoder/cache
-
-  # OPTIONAL: Use custom ffmpeg & ffprobe binary paths
-  ffmpeg-binary: ffmpeg
-  ffprobe-binary: ffprobe

From cb4495cb17e008a3f314c227ad959413f089b387 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 21:45:44 -0800
Subject: [PATCH 059/163] video: fix control bar

---
 src/components/PsVideo.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 25a652d7f..aaf6c488e 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -67,6 +67,16 @@ class VideoContentSetup {
       if (isVideoContent(slide) && this.options.preventDragOffset) {
         const origEvent = e.originalEvent;
         if (origEvent.type === "pointerdown") {
+          // Check if directly over the videojs control bar
+          const elems = document.elementsFromPoint(
+            origEvent.clientX,
+            origEvent.clientY
+          );
+          if (elems.some((el) => el.classList.contains("vjs-control-bar"))) {
+            e.preventDefault();
+            return;
+          }
+
           const videoHeight = Math.ceil(slide.height * slide.currZoomLevel);
           const verticalEnding = videoHeight + slide.bounds.center.y;
           const pointerYPos = origEvent.pageY - pswp.offset.y;

From 529f7f8a88cb606555977988536ffc68d4987f5d Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 22:01:52 -0800
Subject: [PATCH 060/163] Bump up vod

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 363b3fc84..41c86c66b 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.2"
+govod="0.0.3"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From 782a1143da12d4e0530e26e8aa1c790fe3f5f96f Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 22:02:33 -0800
Subject: [PATCH 061/163] release: v4.7.0-alpha.4

---
 appinfo/info.xml      | 2 +-
 lib/Command/Index.php | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index a589cea32..e78887777 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-alpha.1</version>
+    <version>4.7.0-alpha.4</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>
diff --git a/lib/Command/Index.php b/lib/Command/Index.php
index 4613a970b..389659464 100644
--- a/lib/Command/Index.php
+++ b/lib/Command/Index.php
@@ -264,6 +264,14 @@ private function parseFolder(Folder &$folder, bool &$refresh): void
                 return;
             }
 
+            // skip 'IMDB' in path
+            if (false !== strpos($folderPath, 'IMDB')) {
+                $this->output->writeln('Skipping folder '.$folderPath.' because of IMDB');
+                $this->previousLineLength = 0;
+
+                return;
+            }
+
             $nodes = $folder->getDirectoryListing();
 
             foreach ($nodes as &$node) {

From b14a01962f488a857360093fba5aff57c7fe2e32 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 22:18:15 -0800
Subject: [PATCH 062/163] Add repair steps

---
 appinfo/info.xml         |  8 ++++++++
 lib/Migration/Repair.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 lib/Migration/Repair.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index e78887777..1deec080a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -55,4 +55,12 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
             <route>memories.Page.main</route>
         </navigation>
     </navigations>
+	<repair-steps>
+		<post-migration>
+			<step>OCA\Memories\Migration\Repair</step>
+		</post-migration>
+		<install>
+			<step>OCA\Memories\Migration\Repair</step>
+		</install>
+	</repair-steps>
 </info>
diff --git a/lib/Migration/Repair.php b/lib/Migration/Repair.php
new file mode 100644
index 000000000..2f99d7fb6
--- /dev/null
+++ b/lib/Migration/Repair.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Memories\Migration;
+
+use OCP\IConfig;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class Repair implements IRepairStep {
+
+	protected IConfig $config;
+
+	public function __construct(IConfig $config) {
+		$this->config = $config;
+	}
+
+	public function getName(): string {
+		return 'Repair steps for Memories';
+	}
+
+	public function run(IOutput $output): void {
+		// kill any instances of go-transcode and go-vod
+        shell_exec('pkill go-transcode');
+        shell_exec('pkill go-vod');
+	}
+}
\ No newline at end of file

From 831d265931003d10d29629070a151a0cdef9238f Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 22:18:52 -0800
Subject: [PATCH 063/163] release: v4.7.0-alpha.5

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 1deec080a..d1f9921ec 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-alpha.4</version>
+    <version>4.7.0-alpha.5</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From 09e0929096a65cd84f8f79a750ebb0f7aaa582e6 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 22:22:06 -0800
Subject: [PATCH 064/163] Lint fixes

---
 .github/workflows/lint-php.yaml | 12 -----------
 lib/Migration/Repair.php        | 35 ++++++++++++++++++---------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/lint-php.yaml b/.github/workflows/lint-php.yaml
index fbbda5d39..d5fdff463 100644
--- a/.github/workflows/lint-php.yaml
+++ b/.github/workflows/lint-php.yaml
@@ -5,18 +5,6 @@ on:
   - pull_request
 
 jobs:
-  xml-linters:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-      - name: Download schema
-        run: wget https://apps.nextcloud.com/schema/apps/info.xsd
-      - name: Lint info.xml
-        uses: ChristophWurst/xmllint-action@v1
-        with:
-          xml-file: ./appinfo/info.xml
-          xml-schema-file: ./info.xsd
   php-cs-fixer:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
diff --git a/lib/Migration/Repair.php b/lib/Migration/Repair.php
index 2f99d7fb6..ddfb93b33 100644
--- a/lib/Migration/Repair.php
+++ b/lib/Migration/Repair.php
@@ -8,21 +8,24 @@
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
-class Repair implements IRepairStep {
-
-	protected IConfig $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
-
-	public function getName(): string {
-		return 'Repair steps for Memories';
-	}
-
-	public function run(IOutput $output): void {
-		// kill any instances of go-transcode and go-vod
+class Repair implements IRepairStep
+{
+    protected IConfig $config;
+
+    public function __construct(IConfig $config)
+    {
+        $this->config = $config;
+    }
+
+    public function getName(): string
+    {
+        return 'Repair steps for Memories';
+    }
+
+    public function run(IOutput $output): void
+    {
+        // kill any instances of go-transcode and go-vod
         shell_exec('pkill go-transcode');
         shell_exec('pkill go-vod');
-	}
-}
\ No newline at end of file
+    }
+}

From e3b9a44b68e074d2e6983bd17ccb3c962dedf8b8 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 22:22:23 -0800
Subject: [PATCH 065/163] release: v4.7.0-alpha.6

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index d1f9921ec..9848fa745 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-alpha.5</version>
+    <version>4.7.0-alpha.6</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From c61edac55d7dc2a3779cb9114b1edab5e3f54245 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 22:39:52 -0800
Subject: [PATCH 066/163] Fix error in info

---
 lib/Db/TimelineQuery.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/Db/TimelineQuery.php b/lib/Db/TimelineQuery.php
index e5d4eb2ad..54d33574e 100644
--- a/lib/Db/TimelineQuery.php
+++ b/lib/Db/TimelineQuery.php
@@ -72,13 +72,21 @@ public function getInfoById(int $id, bool $basic): array
         } catch (\Throwable $e) {
         }
 
+        $exif = [];
+        if (!$basic && !empty($row['exif'])) {
+            try {
+                $exif = json_decode($row['exif'], true);
+            } catch (\Throwable $e) {
+            }
+        }
+
         return [
             'fileid' => (int) $row['fileid'],
             'dayid' => (int) $row['dayid'],
             'datetaken' => $utcTs,
             'w' => (int) $row['w'],
             'h' => (int) $row['h'],
-            'exif' => $basic ? [] : json_decode($row['exif'], true),
+            'exif' => $exif,
         ];
     }
 }

From ce6afddc4fcb3312ef90620674a52530cc97362b Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 02:49:02 -0800
Subject: [PATCH 067/163] IMDB LMAO

---
 lib/Command/Index.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/Command/Index.php b/lib/Command/Index.php
index 389659464..4613a970b 100644
--- a/lib/Command/Index.php
+++ b/lib/Command/Index.php
@@ -264,14 +264,6 @@ private function parseFolder(Folder &$folder, bool &$refresh): void
                 return;
             }
 
-            // skip 'IMDB' in path
-            if (false !== strpos($folderPath, 'IMDB')) {
-                $this->output->writeln('Skipping folder '.$folderPath.' because of IMDB');
-                $this->previousLineLength = 0;
-
-                return;
-            }
-
             $nodes = $folder->getDirectoryListing();
 
             foreach ($nodes as &$node) {

From 50ab37181f4bf2bd32657eb768482baae4ab26b3 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 03:01:16 -0800
Subject: [PATCH 068/163] video: fix on changing slide

---
 src/components/PsVideo.ts | 248 ++++++++++++++++++--------------------
 1 file changed, 119 insertions(+), 129 deletions(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index aaf6c488e..cacd85176 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -98,82 +98,7 @@ class VideoContentSetup {
         if (!e.slide.isActive) {
           e.preventDefault();
         } else if (content.videoElement) {
-          const fileid = content.data.photo.fileid;
-
-          // Create hls sources if enabled
-          let sources: any[] = [];
-          const baseUrl = generateUrl(
-            `/apps/memories/api/video/transcode/${clientId}/${fileid}`
-          );
-
-          if (!config_noTranscode) {
-            sources.push({
-              src: `${baseUrl}/index.m3u8`,
-              type: "application/x-mpegURL",
-            });
-          }
-
-          sources.push({
-            src: e.slide.data.src,
-          });
-
-          const overrideNative = !videojs.browser.IS_SAFARI;
-          content.videojs = videojs(content.videoElement, {
-            fill: true,
-            autoplay: true,
-            controls: true,
-            sources: sources,
-            preload: "metadata",
-            playbackRates: [0.5, 1, 1.5, 2],
-            responsive: true,
-            html5: {
-              vhs: {
-                overrideNative: overrideNative,
-                withCredentials: false,
-              },
-              nativeAudioTracks: !overrideNative,
-              nativeVideoTracks: !overrideNative,
-            },
-          });
-
-          content.videojs.on("error", () => {
-            if (content.videojs.error().code === 4) {
-              if (content.videojs.src().includes("m3u8")) {
-                // HLS could not be streamed
-                console.error("Video.js: HLS stream could not be opened.");
-                content.videojs.src({
-                  src: e.slide.data.src,
-                });
-                this.updateRotation(content, 0);
-              }
-            }
-          });
-
-          content.videojs.qualityLevels();
-          content.videojs.hlsQualitySelector({
-            displayCurrentQuality: true,
-          });
-
-          setTimeout(() => {
-            content.videojs
-              .contentEl()
-              .querySelectorAll("button")
-              .forEach((b: HTMLButtonElement) => {
-                b.classList.add("button-vue");
-              });
-          }, 500);
-
-          // Get correct orientation
-          axios
-            .get<any>(
-              generateUrl("/apps/memories/api/image/info/{id}", {
-                id: content.data.photo.fileid,
-              })
-            )
-            .then((response) => {
-              content.data.exif = response.data?.exif;
-              this.updateRotation(content);
-            });
+          this.initVideo(content);
         }
       }
     });
@@ -189,15 +114,129 @@ class VideoContentSetup {
           pswp.options.showHideAnimationType = "fade";
         }
 
-        // pause video when closing
-        this.pauseVideo(pswp.currSlide.content);
+        // prevent more requests
+        this.destroyVideo(pswp.currSlide.content);
+      }
+    });
+  }
+
+  initVideo(content: any) {
+    if (!isVideoContent(content) || content.videojs) {
+      return;
+    }
+
+    content.videoElement = document.createElement("video");
+    content.videoElement.className = "video-js";
+    content.videoElement.setAttribute("poster", content.data.msrc);
+    if (this.options.videoAttributes) {
+      for (let key in this.options.videoAttributes) {
+        content.videoElement.setAttribute(
+          key,
+          this.options.videoAttributes[key] || ""
+        );
+      }
+    }
+    content.element.appendChild(content.videoElement);
+
+    const fileid = content.data.photo.fileid;
+
+    // Create hls sources if enabled
+    let sources: any[] = [];
+    const baseUrl = generateUrl(
+      `/apps/memories/api/video/transcode/${clientId}/${fileid}`
+    );
+
+    if (!config_noTranscode) {
+      sources.push({
+        src: `${baseUrl}/index.m3u8`,
+        type: "application/x-mpegURL",
+      });
+    }
+
+    sources.push({
+      src: content.data.src,
+    });
+
+    const overrideNative = !videojs.browser.IS_SAFARI;
+    content.videojs = videojs(content.videoElement, {
+      fill: true,
+      autoplay: true,
+      controls: true,
+      sources: sources,
+      preload: "metadata",
+      playbackRates: [0.5, 1, 1.5, 2],
+      responsive: true,
+      html5: {
+        vhs: {
+          overrideNative: overrideNative,
+          withCredentials: false,
+        },
+        nativeAudioTracks: !overrideNative,
+        nativeVideoTracks: !overrideNative,
+      },
+    });
+
+    content.videojs.on("error", () => {
+      if (content.videojs.error().code === 4) {
+        if (content.videojs.src().includes("m3u8")) {
+          // HLS could not be streamed
+          console.error("Video.js: HLS stream could not be opened.");
+          content.videojs.src({
+            src: content.data.src,
+          });
+          this.updateRotation(content, 0);
+        }
       }
     });
+
+    content.videojs.qualityLevels();
+    content.videojs.hlsQualitySelector({
+      displayCurrentQuality: true,
+    });
+
+    setTimeout(() => {
+      content.videojs
+        .contentEl()
+        .querySelectorAll("button")
+        .forEach((b: HTMLButtonElement) => {
+          b.classList.add("button-vue");
+        });
+    }, 500);
+
+    // Get correct orientation
+    axios
+      .get<any>(
+        generateUrl("/apps/memories/api/image/info/{id}", {
+          id: content.data.photo.fileid,
+        })
+      )
+      .then((response) => {
+        content.data.exif = response.data?.exif;
+        this.updateRotation(content);
+      });
+  }
+
+  destroyVideo(content: any) {
+    if (isVideoContent(content) && content.videojs) {
+      content.videojs.dispose();
+      content.videojs = null;
+
+      const elem: HTMLDivElement = content.element;
+      while (elem.lastElementChild) {
+        elem.removeChild(elem.lastElementChild);
+      }
+      content.videoElement = null;
+    }
   }
 
   updateRotation(content, val?: number) {
+    if (!content.videojs || !content.videoElement) {
+      return;
+    }
+
     const rotation = val ?? Number(content.data.exif?.Rotation);
     const shouldRotate = content.videojs?.src().includes("m3u8");
+
     if (rotation && shouldRotate) {
       let transform = `rotate(${rotation}deg)`;
 
@@ -219,11 +258,6 @@ class VideoContentSetup {
 
   onContentDestroy({ content }) {
     if (isVideoContent(content)) {
-      if (content._videoPosterImg) {
-        content._videoPosterImg.onload = content._videoPosterImg.onerror = null;
-        content._videoPosterImg = null;
-      }
-
       if (content.videojs) {
         content.videojs.dispose();
         content.videojs = null;
@@ -271,15 +305,11 @@ class VideoContentSetup {
   }
 
   onContentActivate({ content }) {
-    if (isVideoContent(content) && this.options.autoplay) {
-      this.playVideo(content);
-    }
+    this.initVideo(content);
   }
 
   onContentDeactivate({ content }) {
-    if (isVideoContent(content)) {
-      this.pauseVideo(content);
-    }
+    this.destroyVideo(content);
   }
 
   onContentAppend(e) {
@@ -319,19 +349,6 @@ class VideoContentSetup {
     content.state = "loading";
     content.type = "video"; // TODO: move this to pswp core?
 
-    content.videoElement = document.createElement("video");
-    content.videoElement.className = "video-js";
-    content.videoElement.setAttribute("controls", "true");
-
-    if (this.options.videoAttributes) {
-      for (let key in this.options.videoAttributes) {
-        content.videoElement.setAttribute(
-          key,
-          this.options.videoAttributes[key] || ""
-        );
-      }
-    }
-
     content.element = document.createElement("div");
     content.element.style.position = "absolute";
     content.element.style.left = 0;
@@ -339,34 +356,7 @@ class VideoContentSetup {
     content.element.style.width = "100%";
     content.element.style.height = "100%";
 
-    // content.videoElement.setAttribute("poster", content.data.msrc);
-    // this.preloadVideoPoster(content, content.data.msrc);
     content.onLoaded();
-
-    content.element.appendChild(content.videoElement);
-  }
-
-  preloadVideoPoster(content, src) {
-    if (!content._videoPosterImg && src) {
-      content._videoPosterImg = new Image();
-      content._videoPosterImg.src = src;
-      if (content._videoPosterImg.complete) {
-        content.onLoaded();
-      } else {
-        content._videoPosterImg.onload = content._videoPosterImg.onerror =
-          () => {
-            content.onLoaded();
-          };
-      }
-    }
-  }
-
-  playVideo(content) {
-    content.videojs?.play();
-  }
-
-  pauseVideo(content) {
-    content.videojs?.pause();
   }
 
   useContentPlaceholder(usePlaceholder, content) {

From 7969b5e802a98f0df8abe4cd906ef0dac11e7305 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 05:55:47 -0800
Subject: [PATCH 069/163] Close nav on link click (#180)

---
 src/App.vue | 140 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 78 insertions(+), 62 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2aba1a9e7..839a7102d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,74 +8,20 @@
       'remove-gap': removeOuterGap,
     }"
   >
-    <NcAppNavigation v-if="showNavigation">
+    <NcAppNavigation v-if="showNavigation" ref="nav">
       <template id="app-memories-navigation" #list>
         <NcAppNavigationItem
-          :to="{ name: 'timeline' }"
-          :title="t('memories', 'Timeline')"
+          v-for="item in navItems"
+          :key="item.name"
+          :to="{ name: item.name }"
+          :title="item.title"
+          @click="linkClick"
           exact
         >
-          <ImageMultiple slot="icon" :size="20" />
-        </NcAppNavigationItem>
-        <NcAppNavigationItem
-          :to="{ name: 'folders' }"
-          :title="t('memories', 'Folders')"
-        >
-          <FolderIcon slot="icon" :size="20" />
-        </NcAppNavigationItem>
-        <NcAppNavigationItem
-          :to="{ name: 'favorites' }"
-          :title="t('memories', 'Favorites')"
-        >
-          <Star slot="icon" :size="20" />
-        </NcAppNavigationItem>
-        <NcAppNavigationItem
-          :to="{ name: 'videos' }"
-          :title="t('memories', 'Videos')"
-        >
-          <Video slot="icon" :size="20" />
-        </NcAppNavigationItem>
-        <NcAppNavigationItem
-          :to="{ name: 'albums' }"
-          :title="t('memories', 'Albums')"
-          v-if="showAlbums"
-        >
-          <AlbumIcon slot="icon" :size="20" />
-        </NcAppNavigationItem>
-        <NcAppNavigationItem
-          :to="{ name: 'people' }"
-          :title="t('memories', 'People')"
-          v-if="showPeople"
-        >
-          <PeopleIcon slot="icon" :size="20" />
-        </NcAppNavigationItem>
-        <NcAppNavigationItem
-          :to="{ name: 'archive' }"
-          :title="t('memories', 'Archive')"
-        >
-          <ArchiveIcon slot="icon" :size="20" />
-        </NcAppNavigationItem>
-        <NcAppNavigationItem
-          :to="{ name: 'thisday' }"
-          :title="t('memories', 'On this day')"
-        >
-          <CalendarIcon slot="icon" :size="20" />
-        </NcAppNavigationItem>
-        <NcAppNavigationItem
-          :to="{ name: 'tags' }"
-          v-if="config_tagsEnabled"
-          :title="t('memories', 'Tags')"
-        >
-          <TagsIcon slot="icon" :size="20" />
-        </NcAppNavigationItem>
-        <NcAppNavigationItem
-          :to="{ name: 'maps' }"
-          v-if="config_mapsEnabled"
-          :title="t('memories', 'Maps')"
-        >
-          <MapIcon slot="icon" :size="20" />
+          <component :is="item.icon" slot="icon" :size="20" />
         </NcAppNavigationItem>
       </template>
+
       <template #footer>
         <NcAppNavigationSettings :title="t('memories', 'Settings')">
           <Settings />
@@ -102,6 +48,7 @@ import {
 } from "@nextcloud/vue";
 import { generateUrl } from "@nextcloud/router";
 import { getCurrentUser } from "@nextcloud/auth";
+import { translate as t } from "@nextcloud/l10n";
 
 import Timeline from "./components/Timeline.vue";
 import Settings from "./components/Settings.vue";
@@ -150,6 +97,65 @@ export default class App extends Mixins(GlobalMixin, UserConfig) {
 
   private metadataComponent!: Metadata;
 
+  private readonly navItemsAll = [
+    {
+      name: "timeline",
+      icon: ImageMultiple,
+      title: t("memories", "Timeline"),
+    },
+    {
+      name: "folders",
+      icon: FolderIcon,
+      title: t("memories", "Folders"),
+    },
+    {
+      name: "favorites",
+      icon: Star,
+      title: t("memories", "Favorites"),
+    },
+    {
+      name: "videos",
+      icon: Video,
+      title: t("memories", "Videos"),
+    },
+    {
+      name: "albums",
+      icon: AlbumIcon,
+      title: t("memories", "Albums"),
+      if: (self: any) => self.showAlbums,
+    },
+    {
+      name: "people",
+      icon: PeopleIcon,
+      title: t("memories", "People"),
+      if: (self: any) => self.showPeople,
+    },
+    {
+      name: "archive",
+      icon: ArchiveIcon,
+      title: t("memories", "Archive"),
+    },
+    {
+      name: "thisday",
+      icon: CalendarIcon,
+      title: t("memories", "On this day"),
+    },
+    {
+      name: "tags",
+      icon: TagsIcon,
+      title: t("memories", "Tags"),
+      if: (self: any) => self.config_tagsEnabled,
+    },
+    {
+      name: "maps",
+      icon: MapIcon,
+      title: t("memories", "Maps"),
+      if: (self: any) => self.config_mapsEnabled,
+    },
+  ];
+
+  private navItems = [];
+
   get ncVersion() {
     const version = (<any>window.OC).config.version.split(".");
     return Number(version[0]);
@@ -183,6 +189,11 @@ export default class App extends Mixins(GlobalMixin, UserConfig) {
   mounted() {
     this.doRouteChecks();
 
+    // Populate navigation
+    this.navItems = this.navItemsAll.filter(
+      (item) => !item.if || item.if(this)
+    );
+
     // Store CSS variables modified
     const root = document.documentElement;
     const colorPrimary =
@@ -241,6 +252,11 @@ export default class App extends Mixins(GlobalMixin, UserConfig) {
     }
   }
 
+  linkClick() {
+    const nav: any = this.$refs.nav;
+    if (window.innerWidth <= 1024) nav?.toggleNavigation(false);
+  }
+
   doRouteChecks() {
     if (this.$route.name === "folder-share") {
       this.putFolderShareToken(this.$route.params.token);

From 8cff42614754789a8d18ed761239941f244d340d Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 07:01:05 -0800
Subject: [PATCH 070/163] video: mobile fixes

---
 src/components/PsVideo.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index cacd85176..4702457da 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -138,6 +138,22 @@ class VideoContentSetup {
     }
     content.element.appendChild(content.videoElement);
 
+    // Pause / play on click on mobile
+    let touchAt = 0;
+    content.videoElement.addEventListener("touchstart", (e) => {
+      touchAt = e.timeStamp;
+    });
+    content.videoElement.addEventListener("touchend", (e) => {
+      if (touchAt && e.timeStamp - touchAt < 200) {
+        if (content.videojs.paused()) {
+          content.videojs.play();
+        } else {
+          content.videojs.pause();
+        }
+      }
+      touchAt = 0;
+    });
+
     const fileid = content.data.photo.fileid;
 
     // Create hls sources if enabled
@@ -201,6 +217,9 @@ class VideoContentSetup {
         .forEach((b: HTMLButtonElement) => {
           b.classList.add("button-vue");
         });
+
+      // iOS needs this
+      content.videojs.play();
     }, 500);
 
     // Get correct orientation

From 801902e5c6591f8fe61379a40f0b25048396e1a8 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 07:01:43 -0800
Subject: [PATCH 071/163] release: v4.7.0-alpha.7

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 9848fa745..cc7979309 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-alpha.6</version>
+    <version>4.7.0-alpha.7</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From 2ed0182a7756564d3a528092cce0a979566c1189 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 18:20:48 -0800
Subject: [PATCH 072/163] Show transcoding fail error to admin

---
 src/components/PsVideo.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 4702457da..973704ee0 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -2,6 +2,9 @@ import PhotoSwipe from "photoswipe";
 import { generateUrl } from "@nextcloud/router";
 import { loadState } from "@nextcloud/initial-state";
 import axios from "@nextcloud/axios";
+import { showError } from "@nextcloud/dialogs";
+import { translate as t } from "@nextcloud/l10n";
+import { getCurrentUser } from "@nextcloud/auth";
 
 import videojs from "video.js";
 import "video.js/dist/video-js.min.css";
@@ -197,6 +200,11 @@ class VideoContentSetup {
         if (content.videojs.src().includes("m3u8")) {
           // HLS could not be streamed
           console.error("Video.js: HLS stream could not be opened.");
+
+          if (getCurrentUser()?.isAdmin) {
+            showError(t("memories", "Transcoding failed."));
+          }
+
           content.videojs.src({
             src: content.data.src,
           });

From b93d613fab3384339b5aea582bbf27a85b2fc79c Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 18:24:37 -0800
Subject: [PATCH 073/163] video-setup: improve docs

---
 lib/Command/VideoSetup.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index 6afa8669a..122ac29e7 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -128,7 +128,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $this->config->setSystemValue('memories.transcoder', $goVodPath);
         $this->config->setSystemValue('memories.no_transcode', false);
-        $output->writeln('Transcoding and HLS are now enabled!');
+        $output->writeln('Transcoding and HLS are now enabled! Monitor the output at /tmp/go-vod.log for any errors');
 
         // Check for VAAPI
         $output->writeln("\nChecking for QSV (/dev/dri/renderD128)");
@@ -139,6 +139,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $this->config->setSystemValue('memories.qsv', false);
                 $output->writeln('QSV is now disabled');
             } else {
+                $output->writeln("\nQSV is now enabled. You may still need to install the Intel Media Driver");
+                $output->writeln("and ensure proper permissions for /dev/dri/renderD128.");
+                $output->writeln('See the documentation for more details.');
                 $this->config->setSystemValue('memories.qsv', true);
             }
         } else {

From ce0fcc8210db4091d9df6c92af157e5676f29fa4 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 18:26:02 -0800
Subject: [PATCH 074/163] PHP lint fix

---
 lib/Command/VideoSetup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index 122ac29e7..c84960dd7 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -140,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $output->writeln('QSV is now disabled');
             } else {
                 $output->writeln("\nQSV is now enabled. You may still need to install the Intel Media Driver");
-                $output->writeln("and ensure proper permissions for /dev/dri/renderD128.");
+                $output->writeln('and ensure proper permissions for /dev/dri/renderD128.');
                 $output->writeln('See the documentation for more details.');
                 $this->config->setSystemValue('memories.qsv', true);
             }

From 1f86c2e13066703b9dc3a4ef803eca24cf5124eb Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 18:28:32 -0800
Subject: [PATCH 075/163] Bump up go-vod

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 41c86c66b..fd522ddac 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.3"
+govod="0.0.4"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From ad0b2b28a5562e687471e58a791c3f16300845d2 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Sat, 12 Nov 2022 03:16:37 +0000
Subject: [PATCH 076/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/af.js         |  2 +-
 l10n/af.json       |  2 +-
 l10n/an.js         |  2 +-
 l10n/an.json       |  2 +-
 l10n/ar.js         |  2 +-
 l10n/ar.json       |  2 +-
 l10n/ast.js        |  2 +-
 l10n/ast.json      |  2 +-
 l10n/az.js         |  2 +-
 l10n/az.json       |  2 +-
 l10n/bg.js         |  2 +-
 l10n/bg.json       |  2 +-
 l10n/bn_BD.js      |  2 +-
 l10n/bn_BD.json    |  2 +-
 l10n/br.js         |  2 +-
 l10n/br.json       |  2 +-
 l10n/bs.js         |  2 +-
 l10n/bs.json       |  2 +-
 l10n/ca.js         |  2 +-
 l10n/ca.json       |  2 +-
 l10n/cs.js         |  3 ++-
 l10n/cs.json       |  3 ++-
 l10n/cy_GB.js      |  2 +-
 l10n/cy_GB.json    |  2 +-
 l10n/da.js         |  2 +-
 l10n/da.json       |  2 +-
 l10n/de.js         |  3 ++-
 l10n/de.json       |  3 ++-
 l10n/de_DE.js      |  3 ++-
 l10n/de_DE.json    |  3 ++-
 l10n/el.js         |  2 +-
 l10n/el.json       |  2 +-
 l10n/en_GB.js      |  2 +-
 l10n/en_GB.json    |  2 +-
 l10n/eo.js         |  2 +-
 l10n/eo.json       |  2 +-
 l10n/es.js         |  3 ++-
 l10n/es.json       |  3 ++-
 l10n/es_419.js     |  2 +-
 l10n/es_419.json   |  2 +-
 l10n/es_AR.js      |  2 +-
 l10n/es_AR.json    |  2 +-
 l10n/es_CL.js      |  2 +-
 l10n/es_CL.json    |  2 +-
 l10n/es_CO.js      |  2 +-
 l10n/es_CO.json    |  2 +-
 l10n/es_CR.js      |  2 +-
 l10n/es_CR.json    |  2 +-
 l10n/es_DO.js      |  2 +-
 l10n/es_DO.json    |  2 +-
 l10n/es_EC.js      |  2 +-
 l10n/es_EC.json    |  2 +-
 l10n/es_GT.js      |  2 +-
 l10n/es_GT.json    |  2 +-
 l10n/es_HN.js      |  2 +-
 l10n/es_HN.json    |  2 +-
 l10n/es_MX.js      |  2 +-
 l10n/es_MX.json    |  2 +-
 l10n/es_NI.js      |  2 +-
 l10n/es_NI.json    |  2 +-
 l10n/es_PA.js      |  2 +-
 l10n/es_PA.json    |  2 +-
 l10n/es_PE.js      |  2 +-
 l10n/es_PE.json    |  2 +-
 l10n/es_PR.js      |  2 +-
 l10n/es_PR.json    |  2 +-
 l10n/es_PY.js      |  2 +-
 l10n/es_PY.json    |  2 +-
 l10n/es_SV.js      |  2 +-
 l10n/es_SV.json    |  2 +-
 l10n/es_UY.js      |  2 +-
 l10n/es_UY.json    |  2 +-
 l10n/et_EE.js      |  2 +-
 l10n/et_EE.json    |  2 +-
 l10n/eu.js         |  2 +-
 l10n/eu.json       |  2 +-
 l10n/fa.js         |  2 +-
 l10n/fa.json       |  2 +-
 l10n/fi.js         |  2 +-
 l10n/fi.json       |  2 +-
 l10n/fr.js         |  2 +-
 l10n/fr.json       |  2 +-
 l10n/gd.js         |  2 +-
 l10n/gd.json       |  2 +-
 l10n/gl.js         |  2 +-
 l10n/gl.json       |  2 +-
 l10n/he.js         |  2 +-
 l10n/he.json       |  2 +-
 l10n/hr.js         |  2 +-
 l10n/hr.json       |  2 +-
 l10n/hu.js         |  3 ++-
 l10n/hu.json       |  3 ++-
 l10n/hy.js         |  2 +-
 l10n/hy.json       |  2 +-
 l10n/ia.js         |  2 +-
 l10n/ia.json       |  2 +-
 l10n/id.js         |  2 +-
 l10n/id.json       |  2 +-
 l10n/is.js         |  2 +-
 l10n/is.json       |  2 +-
 l10n/it.js         |  2 +-
 l10n/it.json       |  2 +-
 l10n/ja.js         |  2 +-
 l10n/ja.json       |  2 +-
 l10n/ka_GE.js      |  2 +-
 l10n/ka_GE.json    |  2 +-
 l10n/kab.js        |  2 +-
 l10n/kab.json      |  2 +-
 l10n/km.js         |  2 +-
 l10n/km.json       |  2 +-
 l10n/kn.js         |  2 +-
 l10n/kn.json       |  2 +-
 l10n/ko.js         |  2 +-
 l10n/ko.json       |  2 +-
 l10n/lb.js         |  2 +-
 l10n/lb.json       |  2 +-
 l10n/lo.js         |  2 +-
 l10n/lo.json       |  2 +-
 l10n/lt_LT.js      | 11 +++++++++--
 l10n/lt_LT.json    | 11 +++++++++--
 l10n/lv.js         |  2 +-
 l10n/lv.json       |  2 +-
 l10n/mk.js         |  2 +-
 l10n/mk.json       |  2 +-
 l10n/mn.js         |  2 +-
 l10n/mn.json       |  2 +-
 l10n/ms_MY.js      |  2 +-
 l10n/ms_MY.json    |  2 +-
 l10n/nb.js         |  2 +-
 l10n/nb.json       |  2 +-
 l10n/nl.js         |  2 +-
 l10n/nl.json       |  2 +-
 l10n/nn_NO.js      |  2 +-
 l10n/nn_NO.json    |  2 +-
 l10n/oc.js         |  2 +-
 l10n/oc.json       |  2 +-
 l10n/pl.js         |  2 +-
 l10n/pl.json       |  2 +-
 l10n/ps.js         |  2 +-
 l10n/ps.json       |  2 +-
 l10n/pt_BR.js      |  2 +-
 l10n/pt_BR.json    |  2 +-
 l10n/pt_PT.js      |  2 +-
 l10n/pt_PT.json    |  2 +-
 l10n/ro.js         |  2 +-
 l10n/ro.json       |  2 +-
 l10n/ru.js         |  2 +-
 l10n/ru.json       |  2 +-
 l10n/sc.js         |  2 +-
 l10n/sc.json       |  2 +-
 l10n/si.js         |  2 +-
 l10n/si.json       |  2 +-
 l10n/sk.js         |  2 +-
 l10n/sk.json       |  2 +-
 l10n/sl.js         |  2 +-
 l10n/sl.json       |  2 +-
 l10n/sq.js         |  2 +-
 l10n/sq.json       |  2 +-
 l10n/sr.js         |  2 +-
 l10n/sr.json       |  2 +-
 l10n/sr@latin.js   |  2 +-
 l10n/sr@latin.json |  2 +-
 l10n/sv.js         |  2 +-
 l10n/sv.json       |  2 +-
 l10n/ta.js         |  2 +-
 l10n/ta.json       |  2 +-
 l10n/th.js         |  2 +-
 l10n/th.json       |  2 +-
 l10n/tk.js         |  2 +-
 l10n/tk.json       |  2 +-
 l10n/tr.js         |  2 +-
 l10n/tr.json       |  2 +-
 l10n/ug.js         |  2 +-
 l10n/ug.json       |  2 +-
 l10n/uk.js         |  2 +-
 l10n/uk.json       |  2 +-
 l10n/ur_PK.js      |  2 +-
 l10n/ur_PK.json    |  2 +-
 l10n/uz.js         |  2 +-
 l10n/uz.json       |  2 +-
 l10n/vi.js         |  2 +-
 l10n/vi.json       |  2 +-
 l10n/zh_CN.js      |  2 +-
 l10n/zh_CN.json    |  2 +-
 l10n/zh_HK.js      |  3 ++-
 l10n/zh_HK.json    |  3 ++-
 l10n/zh_TW.js      |  3 ++-
 l10n/zh_TW.json    |  3 ++-
 188 files changed, 218 insertions(+), 190 deletions(-)

diff --git a/l10n/af.js b/l10n/af.js
index 50710f315..aab4e7c2b 100644
--- a/l10n/af.js
+++ b/l10n/af.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Instellings",
     "Folders" : "Vouers",
     "Favorites" : "Gunstelinge",
     "Videos" : "Video's ",
     "Archive" : "Argief",
     "Tags" : "Etikette",
     "Maps" : "Kaarte",
-    "Settings" : "Instellings",
     "Unsaved changes" : "Onbewaarde veranderinge",
     "Edit" : "Wysig",
     "Loading …" : "Laai …",
diff --git a/l10n/af.json b/l10n/af.json
index dc1d40d82..75ac74470 100644
--- a/l10n/af.json
+++ b/l10n/af.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Instellings",
     "Folders" : "Vouers",
     "Favorites" : "Gunstelinge",
     "Videos" : "Video's ",
     "Archive" : "Argief",
     "Tags" : "Etikette",
     "Maps" : "Kaarte",
-    "Settings" : "Instellings",
     "Unsaved changes" : "Onbewaarde veranderinge",
     "Edit" : "Wysig",
     "Loading …" : "Laai …",
diff --git a/l10n/an.js b/l10n/an.js
index e70430d81..4002b9836 100644
--- a/l10n/an.js
+++ b/l10n/an.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configurazión",
     "Favorites" : "Favoritos",
     "Tags" : "Etiquetas",
-    "Settings" : "Configurazión",
     "Cancel" : "Canzelar",
     "Delete" : "Borrar",
     "Download" : "Escargar",
diff --git a/l10n/an.json b/l10n/an.json
index 909a91740..05dfad441 100644
--- a/l10n/an.json
+++ b/l10n/an.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Settings" : "Configurazión",
     "Favorites" : "Favoritos",
     "Tags" : "Etiquetas",
-    "Settings" : "Configurazión",
     "Cancel" : "Canzelar",
     "Delete" : "Borrar",
     "Download" : "Escargar",
diff --git a/l10n/ar.js b/l10n/ar.js
index e75d01a94..bfb2bfb09 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "الإعدادات",
     "Timeline" : "الجدول الزمني",
     "Folders" : "المجلدات",
     "Favorites" : "المفضلات",
@@ -8,7 +9,6 @@ OC.L10N.register(
     "Archive" : "الأرشيف",
     "Tags" : "الوسوم",
     "Maps" : "الخرائط",
-    "Settings" : "الإعدادات",
     "Edit" : "تعديل",
     "Loading …" : "جاري التحميل …",
     "Cancel" : "إلغاء",
diff --git a/l10n/ar.json b/l10n/ar.json
index 547d5c375..a1412f694 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "الإعدادات",
     "Timeline" : "الجدول الزمني",
     "Folders" : "المجلدات",
     "Favorites" : "المفضلات",
@@ -6,7 +7,6 @@
     "Archive" : "الأرشيف",
     "Tags" : "الوسوم",
     "Maps" : "الخرائط",
-    "Settings" : "الإعدادات",
     "Edit" : "تعديل",
     "Loading …" : "جاري التحميل …",
     "Cancel" : "إلغاء",
diff --git a/l10n/ast.js b/l10n/ast.js
index fbe39e686..0349acb14 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Settings",
     "Folders" : "Carpetes",
     "Favorites" : "Favorites",
     "Videos" : "Vídeos",
     "Archive" : "Archivu",
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
-    "Settings" : "Settings",
     "Edit" : "Editar",
     "Loading …" : "Cargando...",
     "Cancel" : "Encaboxar",
diff --git a/l10n/ast.json b/l10n/ast.json
index ec821229d..e39516945 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Settings",
     "Folders" : "Carpetes",
     "Favorites" : "Favorites",
     "Videos" : "Vídeos",
     "Archive" : "Archivu",
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
-    "Settings" : "Settings",
     "Edit" : "Editar",
     "Loading …" : "Cargando...",
     "Cancel" : "Encaboxar",
diff --git a/l10n/az.js b/l10n/az.js
index 35674fd6b..8624884da 100644
--- a/l10n/az.js
+++ b/l10n/az.js
@@ -1,11 +1,11 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Quraşdırmalar",
     "Favorites" : "Sevimlilər",
     "Archive" : "Arxiv",
     "Tags" : "Işarələr",
     "Maps" : "Xəritələr",
-    "Settings" : "Quraşdırmalar",
     "Edit" : "Dəyişiklik et",
     "Cancel" : "Dayandır",
     "Delete" : "Sil",
diff --git a/l10n/az.json b/l10n/az.json
index 8fa88e4e2..eced9701b 100644
--- a/l10n/az.json
+++ b/l10n/az.json
@@ -1,9 +1,9 @@
 { "translations": {
+    "Settings" : "Quraşdırmalar",
     "Favorites" : "Sevimlilər",
     "Archive" : "Arxiv",
     "Tags" : "Işarələr",
     "Maps" : "Xəritələr",
-    "Settings" : "Quraşdırmalar",
     "Edit" : "Dəyişiklik et",
     "Cancel" : "Dayandır",
     "Delete" : "Sil",
diff --git a/l10n/bg.js b/l10n/bg.js
index 1c5af1385..42f08eb42 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Спомени",
     "Yet another photo management app" : "Вече е на разположение още едно приложение за управление на снимки",
+    "Settings" : "Настройки",
     "Timeline" : "Времева линия",
     "Folders" : "Папки",
     "Favorites" : "Любими",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "На този ден",
     "Tags" : "Етикети",
     "Maps" : "Карти",
-    "Settings" : "Настройки",
     "EXIF" : "EXIF стандарт",
     "A better photos experience awaits you" : "Очаква ви по-добро изживяване при управлението на снимки",
     "Choose the root folder of your timeline to begin" : "Изберете основната папка на вашата времева линия /хронология/, за да започнете",
diff --git a/l10n/bg.json b/l10n/bg.json
index 022cb4efe..628e79d0c 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Спомени",
     "Yet another photo management app" : "Вече е на разположение още едно приложение за управление на снимки",
+    "Settings" : "Настройки",
     "Timeline" : "Времева линия",
     "Folders" : "Папки",
     "Favorites" : "Любими",
@@ -11,7 +12,6 @@
     "On this day" : "На този ден",
     "Tags" : "Етикети",
     "Maps" : "Карти",
-    "Settings" : "Настройки",
     "EXIF" : "EXIF стандарт",
     "A better photos experience awaits you" : "Очаква ви по-добро изживяване при управлението на снимки",
     "Choose the root folder of your timeline to begin" : "Изберете основната папка на вашата времева линия /хронология/, за да започнете",
diff --git a/l10n/bn_BD.js b/l10n/bn_BD.js
index 481b48fc4..c1e8e500c 100644
--- a/l10n/bn_BD.js
+++ b/l10n/bn_BD.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "সেটিংস",
     "Favorites" : "প্রিয়জন",
     "Tags" : "ট্যাগ",
     "Maps" : "মানচিত্র",
-    "Settings" : "সেটিংস",
     "Edit" : "সম্পাদনা",
     "Cancel" : "বাতির",
     "Delete" : "মুছে",
diff --git a/l10n/bn_BD.json b/l10n/bn_BD.json
index 7414f54ce..8adf74936 100644
--- a/l10n/bn_BD.json
+++ b/l10n/bn_BD.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "সেটিংস",
     "Favorites" : "প্রিয়জন",
     "Tags" : "ট্যাগ",
     "Maps" : "মানচিত্র",
-    "Settings" : "সেটিংস",
     "Edit" : "সম্পাদনা",
     "Cancel" : "বাতির",
     "Delete" : "মুছে",
diff --git a/l10n/br.js b/l10n/br.js
index 5f10a1665..754ebb01b 100644
--- a/l10n/br.js
+++ b/l10n/br.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Arventennoù",
     "Favorites" : "Pennrolloù",
     "Videos" : "Videoioù",
     "Tags" : "Klavioù",
-    "Settings" : "Arventennoù",
     "Unsaved changes" : "Kemmoù n'int ket bet enrollet",
     "Edit" : "Cheñch",
     "Loading …" : "O Kargañ ...",
diff --git a/l10n/br.json b/l10n/br.json
index d51fc0f62..5e1b80060 100644
--- a/l10n/br.json
+++ b/l10n/br.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "Arventennoù",
     "Favorites" : "Pennrolloù",
     "Videos" : "Videoioù",
     "Tags" : "Klavioù",
-    "Settings" : "Arventennoù",
     "Unsaved changes" : "Kemmoù n'int ket bet enrollet",
     "Edit" : "Cheñch",
     "Loading …" : "O Kargañ ...",
diff --git a/l10n/bs.js b/l10n/bs.js
index c810389a1..afbb0d068 100644
--- a/l10n/bs.js
+++ b/l10n/bs.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "memories",
     {
-    "Favorites" : "Favoriti",
     "Settings" : "Podešavanje",
+    "Favorites" : "Favoriti",
     "Edit" : "Izmjeni",
     "Cancel" : "Otkaži",
     "Delete" : "Obriši",
diff --git a/l10n/bs.json b/l10n/bs.json
index 5d91da067..28d02b6da 100644
--- a/l10n/bs.json
+++ b/l10n/bs.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Favorites" : "Favoriti",
     "Settings" : "Podešavanje",
+    "Favorites" : "Favoriti",
     "Edit" : "Izmjeni",
     "Cancel" : "Otkaži",
     "Delete" : "Obriši",
diff --git a/l10n/ca.js b/l10n/ca.js
index 44213988d..c2418d1a1 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Paràmetres",
     "Timeline" : "Línia de temps",
     "Folders" : "Carpetes",
     "Favorites" : "Preferits",
@@ -11,7 +12,6 @@ OC.L10N.register(
     "On this day" : "Aquest mateix dia",
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
-    "Settings" : "Paràmetres",
     "Error saving image" : "S'ha produït un error en desar la imatge",
     "Unsaved changes" : "Canvis sense desar",
     "Drop changes" : "Elimina els canvis",
diff --git a/l10n/ca.json b/l10n/ca.json
index 7d9d85ec1..dfb91d27c 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Paràmetres",
     "Timeline" : "Línia de temps",
     "Folders" : "Carpetes",
     "Favorites" : "Preferits",
@@ -9,7 +10,6 @@
     "On this day" : "Aquest mateix dia",
     "Tags" : "Etiquetes",
     "Maps" : "Mapes",
-    "Settings" : "Paràmetres",
     "Error saving image" : "S'ha produït un error en desar la imatge",
     "Unsaved changes" : "Canvis sense desar",
     "Drop changes" : "Elimina els canvis",
diff --git a/l10n/cs.js b/l10n/cs.js
index 9e5222e4b..c1cfff613 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Memories" : "Vzpomínky",
     "Yet another photo management app" : "Další z aplikací pro správu fotek",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Vzpomínky\n\n# Vzpomínky je okamžitě použitelné řešení pro správu fotek v rámci Nextcloud, nabízející pokročilé funkce jako jsou:\n\n- **📸 Časová osa**: Řadí fotky a videa podle data pořízení, získaného z Exif metadat.\n- **⏪ Převíjení**: Během okamžiku přeskočte na kdykoli v minulosti oživte své vzpomínky.\n- **🤖 Opatřování štítky pomocí strojového učení**: Seskupujte fotky podle lidí a objektů na nich (založeno na aplikaci [Rozpoznat](https://github.com/nextcloud/recognize).\n- **🖼️ Alba**: Vytvářejte alba a seskupujte tak fotky a videa. Pak je sdílejte s ostatními.\n- **🫱🏻‍🫲🏻 Externí sdílení**: Sdílejte fotky a videa s lidmi mimo vámi využívanou instanci Nextcloud.\n- **📱 Podpora mobilních platforem**: Funguje na zařízeních různých podob a velikostí prostřednictvím webové aplikace.\n- **✏️ Úprava metadat**: Pohotově a snadno upravujte data fotek.\n- **📦 Archiv**: Fotky, kterými nechcete znepřehledňovat časovou osu ukládejte do oddělené složky.\n-**📹 Překódovávání videa**: Vzpomínky překódovávají videa a pro dosažení nejlepšího výkonu používají HLS\n- **⚡️ Výkon**: Obecně, aplikace vzpomínky je velmi rychlá.\n\n## 🌐 Ukázka na Internetu\n\n- Pro získání představy jak vzpomínky vypadají a jak se ovládají, podívejte se na [veřejnou ukázku](https://memories-demo.radialapps.com/apps/memories/).\n- Tato ukázka je pouze pro čtení a může být pomalá (je provozováno na virt. stroji v rámci bezplatné úrovně na službě [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Fotky pocházejí ze služby [Unsplash](https://unsplash.com/) (autorství jednotlivých snímků viz každá ze složek).\n\n## 🚀 Instalace\n\n1. Nainstalujte aplikaci z Nextcloud katalogu aplikací.\n1. Proveďte doporučené [kroky nastavení](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Spusťte příkaz `php ./occ memories:index` a vytvořte tak rejstříky metadat pro stávající fotky.\n1. Otevřete aplikaci 📷 Vzpomínky v Nextcloud a nastavte která složka obsahuje vaše fotky.",
+    "Settings" : "Nastavení",
     "Timeline" : "Časová osa",
     "Folders" : "Složky",
     "Favorites" : "Oblíbené",
@@ -13,7 +15,6 @@ OC.L10N.register(
     "On this day" : "V tento den",
     "Tags" : "Štítky",
     "Maps" : "Mapy",
-    "Settings" : "Nastavení",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Lepší zážitek z fotek na vás čeká",
     "Choose the root folder of your timeline to begin" : "Začněte zvolením kořenové složky vaší časové osy",
diff --git a/l10n/cs.json b/l10n/cs.json
index e3bb39ed5..4a1882440 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Memories" : "Vzpomínky",
     "Yet another photo management app" : "Další z aplikací pro správu fotek",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Vzpomínky\n\n# Vzpomínky je okamžitě použitelné řešení pro správu fotek v rámci Nextcloud, nabízející pokročilé funkce jako jsou:\n\n- **📸 Časová osa**: Řadí fotky a videa podle data pořízení, získaného z Exif metadat.\n- **⏪ Převíjení**: Během okamžiku přeskočte na kdykoli v minulosti oživte své vzpomínky.\n- **🤖 Opatřování štítky pomocí strojového učení**: Seskupujte fotky podle lidí a objektů na nich (založeno na aplikaci [Rozpoznat](https://github.com/nextcloud/recognize).\n- **🖼️ Alba**: Vytvářejte alba a seskupujte tak fotky a videa. Pak je sdílejte s ostatními.\n- **🫱🏻‍🫲🏻 Externí sdílení**: Sdílejte fotky a videa s lidmi mimo vámi využívanou instanci Nextcloud.\n- **📱 Podpora mobilních platforem**: Funguje na zařízeních různých podob a velikostí prostřednictvím webové aplikace.\n- **✏️ Úprava metadat**: Pohotově a snadno upravujte data fotek.\n- **📦 Archiv**: Fotky, kterými nechcete znepřehledňovat časovou osu ukládejte do oddělené složky.\n-**📹 Překódovávání videa**: Vzpomínky překódovávají videa a pro dosažení nejlepšího výkonu používají HLS\n- **⚡️ Výkon**: Obecně, aplikace vzpomínky je velmi rychlá.\n\n## 🌐 Ukázka na Internetu\n\n- Pro získání představy jak vzpomínky vypadají a jak se ovládají, podívejte se na [veřejnou ukázku](https://memories-demo.radialapps.com/apps/memories/).\n- Tato ukázka je pouze pro čtení a může být pomalá (je provozováno na virt. stroji v rámci bezplatné úrovně na službě [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Fotky pocházejí ze služby [Unsplash](https://unsplash.com/) (autorství jednotlivých snímků viz každá ze složek).\n\n## 🚀 Instalace\n\n1. Nainstalujte aplikaci z Nextcloud katalogu aplikací.\n1. Proveďte doporučené [kroky nastavení](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Spusťte příkaz `php ./occ memories:index` a vytvořte tak rejstříky metadat pro stávající fotky.\n1. Otevřete aplikaci 📷 Vzpomínky v Nextcloud a nastavte která složka obsahuje vaše fotky.",
+    "Settings" : "Nastavení",
     "Timeline" : "Časová osa",
     "Folders" : "Složky",
     "Favorites" : "Oblíbené",
@@ -11,7 +13,6 @@
     "On this day" : "V tento den",
     "Tags" : "Štítky",
     "Maps" : "Mapy",
-    "Settings" : "Nastavení",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Lepší zážitek z fotek na vás čeká",
     "Choose the root folder of your timeline to begin" : "Začněte zvolením kořenové složky vaší časové osy",
diff --git a/l10n/cy_GB.js b/l10n/cy_GB.js
index 5d4810e09..92805fea1 100644
--- a/l10n/cy_GB.js
+++ b/l10n/cy_GB.js
@@ -1,11 +1,11 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Gosodiadau",
     "Favorites" : "Ffefrynnau",
     "Videos" : "Fideos",
     "Archive" : "Archif",
     "Tags" : "Tagiau",
-    "Settings" : "Gosodiadau",
     "Edit" : "Golygu",
     "Loading …" : "Yn llwytho …",
     "Cancel" : "Diddymu",
diff --git a/l10n/cy_GB.json b/l10n/cy_GB.json
index 79569b24b..715bffd21 100644
--- a/l10n/cy_GB.json
+++ b/l10n/cy_GB.json
@@ -1,9 +1,9 @@
 { "translations": {
+    "Settings" : "Gosodiadau",
     "Favorites" : "Ffefrynnau",
     "Videos" : "Fideos",
     "Archive" : "Archif",
     "Tags" : "Tagiau",
-    "Settings" : "Gosodiadau",
     "Edit" : "Golygu",
     "Loading …" : "Yn llwytho …",
     "Cancel" : "Diddymu",
diff --git a/l10n/da.js b/l10n/da.js
index 49b3f1480..af60c4335 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Minder",
     "Yet another photo management app" : "Endnu en fotostyringsapp",
+    "Settings" : "Indstillinger",
     "Timeline" : "Tidslinje",
     "Folders" : "Mapper",
     "Favorites" : "Favoritter",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "På denne dag",
     "Tags" : "Mærker",
     "Maps" : "Kort",
-    "Settings" : "Indstillinger",
     "Unsaved changes" : "Ikke gemte ændringer",
     "Edit" : "Redigér",
     "Loading …" : "Loading …",
diff --git a/l10n/da.json b/l10n/da.json
index 4879760c1..8ee94fcf2 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Minder",
     "Yet another photo management app" : "Endnu en fotostyringsapp",
+    "Settings" : "Indstillinger",
     "Timeline" : "Tidslinje",
     "Folders" : "Mapper",
     "Favorites" : "Favoritter",
@@ -11,7 +12,6 @@
     "On this day" : "På denne dag",
     "Tags" : "Mærker",
     "Maps" : "Kort",
-    "Settings" : "Indstillinger",
     "Unsaved changes" : "Ikke gemte ændringer",
     "Edit" : "Redigér",
     "Loading …" : "Loading …",
diff --git a/l10n/de.js b/l10n/de.js
index 6240ef680..5b691a8e3 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -3,16 +3,17 @@ OC.L10N.register(
     {
     "Memories" : "Erinnerungen",
     "Yet another photo management app" : "Eine weitere App zur Verwaltung von Fotos",
+    "Settings" : "Einstellungen",
     "Timeline" : "Verlauf",
     "Folders" : "Ordner",
     "Favorites" : "Favoriten",
     "Videos" : "Videos",
     "Albums" : "Alben",
     "People" : "Personen",
+    "Archive" : "Archiv",
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Maps" : "Karten",
-    "Settings" : "Einstellungen",
     "A better photos experience awaits you" : "Ein besseres Fotoerlebnis erwartet dich",
     "Choose the root folder of your timeline to begin" : "Wähle das Wurzelverzeichnis deiner Zeitleiste, um zu beginnen",
     "If you just installed Memories, run:" : "Wenn du Memorys gerade installiert hast, führe Folgendes aus:",
diff --git a/l10n/de.json b/l10n/de.json
index 6f6a967aa..4b59a866a 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -1,16 +1,17 @@
 { "translations": {
     "Memories" : "Erinnerungen",
     "Yet another photo management app" : "Eine weitere App zur Verwaltung von Fotos",
+    "Settings" : "Einstellungen",
     "Timeline" : "Verlauf",
     "Folders" : "Ordner",
     "Favorites" : "Favoriten",
     "Videos" : "Videos",
     "Albums" : "Alben",
     "People" : "Personen",
+    "Archive" : "Archiv",
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Maps" : "Karten",
-    "Settings" : "Einstellungen",
     "A better photos experience awaits you" : "Ein besseres Fotoerlebnis erwartet dich",
     "Choose the root folder of your timeline to begin" : "Wähle das Wurzelverzeichnis deiner Zeitleiste, um zu beginnen",
     "If you just installed Memories, run:" : "Wenn du Memorys gerade installiert hast, führe Folgendes aus:",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index a926fdea6..90ed2fd8d 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Memories" : "Erinnerungen",
     "Yet another photo management app" : "Eine weitere Foto-Management-App",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Erinnerungen\n\nMemories ist eine Fotoverwaltungs-App für Nextcloud mit erweiterten Funktionen, darunter:\n\n- **📸 Zeitleiste**: Fotos und Videos nach Aufnahmedatum sortieren, geparst aus Exif-Daten.\n- **⏪ Zurückspulen**: Springe sofort zu einem beliebigen Zeitpunkt in der Vergangenheit und erlebe deine Erinnerungen erneut.\n- **🤖 KI-Tagging**: Gruppieren Sie Fotos nach Personen und Objekten mithilfe von KI, unterstützt von der App [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Alben**: Erstellen Sie Alben, um Fotos und Videos zu gruppieren. Dann teilen Sie diese Alben mit anderen.\n- **📁 Ordner**: Durchsuchen Sie Ihre eigenen und freigegebenen Ordner mit einer ähnlichen, effizienten Zeitleiste.\n- **🎦 Diashow**: Zeigen Sie ganz einfach Fotos aus Ihrer Chronik und Ihren Ordnern an.\n- **📱 Mobiler Support**: Funktioniert auf Geräten jeder Form und Größe über die Web-App.\n- **✏️ Metadaten bearbeiten**: Bearbeiten Sie Exif-Daten auf Fotos schnell und einfach.\n- **📦 Archiv**: Speichern Sie Fotos, die Sie nicht in Ihrer Chronik sehen möchten, in einem separaten Ordner.\n- **📹 Videotranskodierung**: Memories transkodiert Videos und verwendet HLS für maximale Leistung.\n- **📷 RAW-Unterstützung**: Zeigen Sie RAW-Fotos von Ihrer Kamera mit der App [Camera RAW Previews](https://apps.nextcloud.com/apps/camerarawpreviews) an.\n- **⚡️ Schnell**: Memories ist extrem schnell. Zeitraum.\n\nUm eine Vorstellung davon zu bekommen, wie Erinnerungen aussehen und sich anfühlen, sehen Sie sich die [öffentliche Demo](https://memories-demo.radialapps.com/apps/memories/) an. Beachten Sie, dass die Demo schreibgeschützt ist und möglicherweise langsam ist, da sie in einer von [Oracle Cloud] (https://www.oracle.com/cloud/free/) bereitgestellten Low-End-VM mit kostenlosem Kontingent ausgeführt wird. Fotonachweise gehen zu [Unsplash](https://unsplash.com/) (Einzelnachweise finden Sie in jedem Ordner).\n\n## 🚀 Installation\n\n1. Installieren Sie die App aus dem Nextcloud App Store\n1. Führen Sie `php ./occ memory:index` aus, um Metadaten-Indizes für vorhandene Fotos zu generieren.\n1. Öffnen Sie die App 📷 Erinnerungen in Nextcloud und legen Sie das Verzeichnis mit Ihren Fotos fest. Fotos aus diesem Verzeichnis werden in der Zeitleiste angezeigt, einschließlich aller Fotos in verschachtelten Unterverzeichnissen.\n1. Die Installation des [Vorschaugenerators](https://github.com/rullzer/previewgenerator) zum Vorgenerieren von Miniaturansichten wird dringend empfohlen.",
+    "Settings" : "Einstellungen",
     "Timeline" : "Zeitleiste",
     "Folders" : "Ordner",
     "Favorites" : "Favoriten",
@@ -13,7 +15,6 @@ OC.L10N.register(
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Maps" : "Karten",
-    "Settings" : "Einstellungen",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Ein besseres Fotoerlebnis erwartet Sie",
     "Choose the root folder of your timeline to begin" : "Wählen Sie das Wurzelverzeichnis Ihrer Zeitleiste um zu beginnen",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 6ba694c66..e0b5fbc56 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Memories" : "Erinnerungen",
     "Yet another photo management app" : "Eine weitere Foto-Management-App",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Erinnerungen\n\nMemories ist eine Fotoverwaltungs-App für Nextcloud mit erweiterten Funktionen, darunter:\n\n- **📸 Zeitleiste**: Fotos und Videos nach Aufnahmedatum sortieren, geparst aus Exif-Daten.\n- **⏪ Zurückspulen**: Springe sofort zu einem beliebigen Zeitpunkt in der Vergangenheit und erlebe deine Erinnerungen erneut.\n- **🤖 KI-Tagging**: Gruppieren Sie Fotos nach Personen und Objekten mithilfe von KI, unterstützt von der App [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Alben**: Erstellen Sie Alben, um Fotos und Videos zu gruppieren. Dann teilen Sie diese Alben mit anderen.\n- **📁 Ordner**: Durchsuchen Sie Ihre eigenen und freigegebenen Ordner mit einer ähnlichen, effizienten Zeitleiste.\n- **🎦 Diashow**: Zeigen Sie ganz einfach Fotos aus Ihrer Chronik und Ihren Ordnern an.\n- **📱 Mobiler Support**: Funktioniert auf Geräten jeder Form und Größe über die Web-App.\n- **✏️ Metadaten bearbeiten**: Bearbeiten Sie Exif-Daten auf Fotos schnell und einfach.\n- **📦 Archiv**: Speichern Sie Fotos, die Sie nicht in Ihrer Chronik sehen möchten, in einem separaten Ordner.\n- **📹 Videotranskodierung**: Memories transkodiert Videos und verwendet HLS für maximale Leistung.\n- **📷 RAW-Unterstützung**: Zeigen Sie RAW-Fotos von Ihrer Kamera mit der App [Camera RAW Previews](https://apps.nextcloud.com/apps/camerarawpreviews) an.\n- **⚡️ Schnell**: Memories ist extrem schnell. Zeitraum.\n\nUm eine Vorstellung davon zu bekommen, wie Erinnerungen aussehen und sich anfühlen, sehen Sie sich die [öffentliche Demo](https://memories-demo.radialapps.com/apps/memories/) an. Beachten Sie, dass die Demo schreibgeschützt ist und möglicherweise langsam ist, da sie in einer von [Oracle Cloud] (https://www.oracle.com/cloud/free/) bereitgestellten Low-End-VM mit kostenlosem Kontingent ausgeführt wird. Fotonachweise gehen zu [Unsplash](https://unsplash.com/) (Einzelnachweise finden Sie in jedem Ordner).\n\n## 🚀 Installation\n\n1. Installieren Sie die App aus dem Nextcloud App Store\n1. Führen Sie `php ./occ memory:index` aus, um Metadaten-Indizes für vorhandene Fotos zu generieren.\n1. Öffnen Sie die App 📷 Erinnerungen in Nextcloud und legen Sie das Verzeichnis mit Ihren Fotos fest. Fotos aus diesem Verzeichnis werden in der Zeitleiste angezeigt, einschließlich aller Fotos in verschachtelten Unterverzeichnissen.\n1. Die Installation des [Vorschaugenerators](https://github.com/rullzer/previewgenerator) zum Vorgenerieren von Miniaturansichten wird dringend empfohlen.",
+    "Settings" : "Einstellungen",
     "Timeline" : "Zeitleiste",
     "Folders" : "Ordner",
     "Favorites" : "Favoriten",
@@ -11,7 +13,6 @@
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Maps" : "Karten",
-    "Settings" : "Einstellungen",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Ein besseres Fotoerlebnis erwartet Sie",
     "Choose the root folder of your timeline to begin" : "Wählen Sie das Wurzelverzeichnis Ihrer Zeitleiste um zu beginnen",
diff --git a/l10n/el.js b/l10n/el.js
index 053e8f434..c24d6f3a3 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Ρυθμίσεις",
     "Timeline" : "Χρονολόγιο",
     "Folders" : "Φάκελοι",
     "Favorites" : "Αγαπημένα",
@@ -11,7 +12,6 @@ OC.L10N.register(
     "On this day" : "Αυτή τη μέρα",
     "Tags" : "Ετικέτες",
     "Maps" : "Χάρτες",
-    "Settings" : "Ρυθμίσεις",
     "Unsaved changes" : "Μη αποθηκευμένες αλλαγές",
     "Edit" : "Επεξεργασία",
     "Loading …" : "Φόρτωση …",
diff --git a/l10n/el.json b/l10n/el.json
index 55ec07396..ae6e143f3 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Ρυθμίσεις",
     "Timeline" : "Χρονολόγιο",
     "Folders" : "Φάκελοι",
     "Favorites" : "Αγαπημένα",
@@ -9,7 +10,6 @@
     "On this day" : "Αυτή τη μέρα",
     "Tags" : "Ετικέτες",
     "Maps" : "Χάρτες",
-    "Settings" : "Ρυθμίσεις",
     "Unsaved changes" : "Μη αποθηκευμένες αλλαγές",
     "Edit" : "Επεξεργασία",
     "Loading …" : "Φόρτωση …",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 6f170977f..b3477b7c0 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Settings",
     "Folders" : "Folders",
     "Favorites" : "Favourites",
     "Videos" : "Videos",
     "Archive" : "Archive",
     "Tags" : "Tags",
     "Maps" : "Maps",
-    "Settings" : "Settings",
     "Unsaved changes" : "Unsaved changes",
     "Edit" : "Edit",
     "Loading …" : "Loading …",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 465fab69e..79e01300a 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Settings",
     "Folders" : "Folders",
     "Favorites" : "Favourites",
     "Videos" : "Videos",
     "Archive" : "Archive",
     "Tags" : "Tags",
     "Maps" : "Maps",
-    "Settings" : "Settings",
     "Unsaved changes" : "Unsaved changes",
     "Edit" : "Edit",
     "Loading …" : "Loading …",
diff --git a/l10n/eo.js b/l10n/eo.js
index caa415f20..2ce109096 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Agordoj",
     "Timeline" : "Kronologio",
     "Folders" : "Dosierujoj",
     "Favorites" : "Plej ŝatataj",
@@ -8,7 +9,6 @@ OC.L10N.register(
     "Archive" : "Arĥivujo",
     "Tags" : "Etikedoj",
     "Maps" : "Mapoj",
-    "Settings" : "Agordoj",
     "Unsaved changes" : "Nekonservitaj ŝanĝoj",
     "Edit" : "Modifi",
     "Loading …" : "Ŝargas …",
diff --git a/l10n/eo.json b/l10n/eo.json
index d2830e886..2952bd625 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Agordoj",
     "Timeline" : "Kronologio",
     "Folders" : "Dosierujoj",
     "Favorites" : "Plej ŝatataj",
@@ -6,7 +7,6 @@
     "Archive" : "Arĥivujo",
     "Tags" : "Etikedoj",
     "Maps" : "Mapoj",
-    "Settings" : "Agordoj",
     "Unsaved changes" : "Nekonservitaj ŝanĝoj",
     "Edit" : "Modifi",
     "Loading …" : "Ŝargas …",
diff --git a/l10n/es.js b/l10n/es.js
index a16ce4986..690f4197c 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Memories" : "Memories",
     "Yet another photo management app" : "Otra aplicación de gestión de fotos mas",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Memories\n\nMemories es una solución con *baterías incluídas* para gestión de fotos en Nextcloud con algunas características avanzadas, incluyendo:\n\n- **📸 Línea de tiempo**: Organice fotos y videos por fecha, analizadas desde los datos Exif.\n- **⏪ Rebobinar**: Navegue a cualquier momento del pasado instantáneamente y reviva sus memorias.\n- **🤖 Etiquetado IA**: Agrupe fotos por persona y objetos utilizando IA, aprovechando las capacidades de la aplicación [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Álbumes**: Cree álbumes para agrupar fotos y videos en conjunto. Podrá entonces compartir estos álbumes con otros.\n **🫱🏻‍🫲🏻 Compartir externamente**:  Comparta fotos y videos con personas fuera de su instancia Nextcloud.\n-- **📱 Soporte a Móviles**: Funciona con dispositivos de cualquier tamaño y forma a través de la aplicación web.\n- **✏️ Editar Metadatos**: Edite las fechas en las fotos de forma rápida y sencilla.\n- **📦 Archivar**: Almacene las fotos que no quiere ver en su línea de tiempo en una carpeta separada.\n- **📹 Conversión de video**: Memories convierte entre formatos de video y utiliza HLS para máximo rendimiento.\n- **⚡️ Rápida**: En general, Memories es extremadamente rápida.\n\n## 🌐 Demostración en línea\n\n- Para tener una idea de como se siente y se vé Memories, compruebe la [demostración pública](https://memories-demo.radialapps.com/apps/memories/). \n- Tenga en cuenta que la demostración es de sólo lectura y podría ser lenta (se ejecuta en una VM en la nube de la capa gratuita de [Oracle Cloud](https://www.oracle.com/cloud/free/)). \n- Los créditos de las fotos son para [Unsplash](https://unsplash.com/) (para créditos individuales, refiérase a cada carpeta).\n\n## 🚀 Instalación\n\n1. Instale la aplicación desde la tienda de Nextcloud.\n2. Ejecute los [pasos recomendados de configuración](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n3. Ejecute `php ./occ memories:index` para generar los índices de metadatos para las fotos existentes.\n4. Abra la aplicación 📷 Memories en Nextcloud y especifique la carpeta que contiene sus fotos.",
+    "Settings" : "Ajustes",
     "Timeline" : "Línea de tiempo",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
@@ -13,7 +15,6 @@ OC.L10N.register(
     "On this day" : "En este día",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Una mejor experiencia de fotos te espera",
     "Choose the root folder of your timeline to begin" : "Escoja la carpeta raíz de su línea de tiempo para comenzar",
diff --git a/l10n/es.json b/l10n/es.json
index a37d11e27..314546c85 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Memories" : "Memories",
     "Yet another photo management app" : "Otra aplicación de gestión de fotos mas",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Memories\n\nMemories es una solución con *baterías incluídas* para gestión de fotos en Nextcloud con algunas características avanzadas, incluyendo:\n\n- **📸 Línea de tiempo**: Organice fotos y videos por fecha, analizadas desde los datos Exif.\n- **⏪ Rebobinar**: Navegue a cualquier momento del pasado instantáneamente y reviva sus memorias.\n- **🤖 Etiquetado IA**: Agrupe fotos por persona y objetos utilizando IA, aprovechando las capacidades de la aplicación [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Álbumes**: Cree álbumes para agrupar fotos y videos en conjunto. Podrá entonces compartir estos álbumes con otros.\n **🫱🏻‍🫲🏻 Compartir externamente**:  Comparta fotos y videos con personas fuera de su instancia Nextcloud.\n-- **📱 Soporte a Móviles**: Funciona con dispositivos de cualquier tamaño y forma a través de la aplicación web.\n- **✏️ Editar Metadatos**: Edite las fechas en las fotos de forma rápida y sencilla.\n- **📦 Archivar**: Almacene las fotos que no quiere ver en su línea de tiempo en una carpeta separada.\n- **📹 Conversión de video**: Memories convierte entre formatos de video y utiliza HLS para máximo rendimiento.\n- **⚡️ Rápida**: En general, Memories es extremadamente rápida.\n\n## 🌐 Demostración en línea\n\n- Para tener una idea de como se siente y se vé Memories, compruebe la [demostración pública](https://memories-demo.radialapps.com/apps/memories/). \n- Tenga en cuenta que la demostración es de sólo lectura y podría ser lenta (se ejecuta en una VM en la nube de la capa gratuita de [Oracle Cloud](https://www.oracle.com/cloud/free/)). \n- Los créditos de las fotos son para [Unsplash](https://unsplash.com/) (para créditos individuales, refiérase a cada carpeta).\n\n## 🚀 Instalación\n\n1. Instale la aplicación desde la tienda de Nextcloud.\n2. Ejecute los [pasos recomendados de configuración](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n3. Ejecute `php ./occ memories:index` para generar los índices de metadatos para las fotos existentes.\n4. Abra la aplicación 📷 Memories en Nextcloud y especifique la carpeta que contiene sus fotos.",
+    "Settings" : "Ajustes",
     "Timeline" : "Línea de tiempo",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
@@ -11,7 +13,6 @@
     "On this day" : "En este día",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Una mejor experiencia de fotos te espera",
     "Choose the root folder of your timeline to begin" : "Escoja la carpeta raíz de su línea de tiempo para comenzar",
diff --git a/l10n/es_419.js b/l10n/es_419.js
index 2cc3b9c23..73444a4d2 100644
--- a/l10n/es_419.js
+++ b/l10n/es_419.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_419.json b/l10n/es_419.json
index 63c1ca037..e022b67c4 100644
--- a/l10n/es_419.json
+++ b/l10n/es_419.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_AR.js b/l10n/es_AR.js
index 5a7fa98df..3c216ac0c 100644
--- a/l10n/es_AR.js
+++ b/l10n/es_AR.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
@@ -8,7 +9,6 @@ OC.L10N.register(
     "On this day" : "En este día",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Edit" : "Editar",
     "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_AR.json b/l10n/es_AR.json
index d04ebd58d..79ddc9f4a 100644
--- a/l10n/es_AR.json
+++ b/l10n/es_AR.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
@@ -6,7 +7,6 @@
     "On this day" : "En este día",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Edit" : "Editar",
     "Loading …" : "Cargando …",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_CL.js b/l10n/es_CL.js
index d05665f0d..500b5448b 100644
--- a/l10n/es_CL.js
+++ b/l10n/es_CL.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Loading …" : "Cargando …",
diff --git a/l10n/es_CL.json b/l10n/es_CL.json
index f20787944..393112cd4 100644
--- a/l10n/es_CL.json
+++ b/l10n/es_CL.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Loading …" : "Cargando …",
diff --git a/l10n/es_CO.js b/l10n/es_CO.js
index 4f1cfbb66..054b5bd52 100644
--- a/l10n/es_CO.js
+++ b/l10n/es_CO.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_CO.json b/l10n/es_CO.json
index 15e8297cd..1801a1c64 100644
--- a/l10n/es_CO.json
+++ b/l10n/es_CO.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_CR.js b/l10n/es_CR.js
index 263dd8e7c..1adbcbc47 100644
--- a/l10n/es_CR.js
+++ b/l10n/es_CR.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_CR.json b/l10n/es_CR.json
index 0a64cf38b..8a97726f0 100644
--- a/l10n/es_CR.json
+++ b/l10n/es_CR.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_DO.js b/l10n/es_DO.js
index 263dd8e7c..1adbcbc47 100644
--- a/l10n/es_DO.js
+++ b/l10n/es_DO.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_DO.json b/l10n/es_DO.json
index 0a64cf38b..8a97726f0 100644
--- a/l10n/es_DO.json
+++ b/l10n/es_DO.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
index 7cbe2cdca..1478a63e6 100644
--- a/l10n/es_EC.js
+++ b/l10n/es_EC.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
index aedb8049b..02c57b562 100644
--- a/l10n/es_EC.json
+++ b/l10n/es_EC.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index 6a026f1e7..3a35c0f8e 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index 89a47fb59..f61b35380 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
index 263dd8e7c..1adbcbc47 100644
--- a/l10n/es_HN.js
+++ b/l10n/es_HN.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
index 0a64cf38b..8a97726f0 100644
--- a/l10n/es_HN.json
+++ b/l10n/es_HN.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index 330996111..e90cdf939 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index 095407796..8aa54c4bf 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_NI.js b/l10n/es_NI.js
index e03c9d429..854c75e8e 100644
--- a/l10n/es_NI.js
+++ b/l10n/es_NI.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_NI.json b/l10n/es_NI.json
index c424f6887..ed8847251 100644
--- a/l10n/es_NI.json
+++ b/l10n/es_NI.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
index e03c9d429..854c75e8e 100644
--- a/l10n/es_PA.js
+++ b/l10n/es_PA.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
index c424f6887..ed8847251 100644
--- a/l10n/es_PA.json
+++ b/l10n/es_PA.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_PE.js b/l10n/es_PE.js
index 5da469777..114445c1b 100644
--- a/l10n/es_PE.js
+++ b/l10n/es_PE.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_PE.json b/l10n/es_PE.json
index 6b75d0ebe..fa3f1dd40 100644
--- a/l10n/es_PE.json
+++ b/l10n/es_PE.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Ajustes",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Ajustes",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
index e03c9d429..854c75e8e 100644
--- a/l10n/es_PR.js
+++ b/l10n/es_PR.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
index c424f6887..ed8847251 100644
--- a/l10n/es_PR.json
+++ b/l10n/es_PR.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_PY.js b/l10n/es_PY.js
index e03c9d429..854c75e8e 100644
--- a/l10n/es_PY.js
+++ b/l10n/es_PY.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_PY.json b/l10n/es_PY.json
index c424f6887..ed8847251 100644
--- a/l10n/es_PY.json
+++ b/l10n/es_PY.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
index 263dd8e7c..1adbcbc47 100644
--- a/l10n/es_SV.js
+++ b/l10n/es_SV.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
index 0a64cf38b..8a97726f0 100644
--- a/l10n/es_SV.json
+++ b/l10n/es_SV.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
index e03c9d429..854c75e8e 100644
--- a/l10n/es_UY.js
+++ b/l10n/es_UY.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
index c424f6887..ed8847251 100644
--- a/l10n/es_UY.json
+++ b/l10n/es_UY.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Configuraciones ",
     "Folders" : "Carpetas",
     "Favorites" : "Favoritos",
     "Videos" : "Videos",
     "Archive" : "Archivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configuraciones ",
     "Unsaved changes" : "Cambios no guardados",
     "Edit" : "Editar",
     "Cancel" : "Cancelar",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index 81adb9950..e17229f1d 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Seaded",
     "Folders" : "Kaustad",
     "Favorites" : "Lemmikud",
     "Videos" : "Videod",
     "Archive" : "Arhiiv",
     "Tags" : "Sildid",
     "Maps" : "Kaardid",
-    "Settings" : "Seaded",
     "Unsaved changes" : "Salvestamata muutused",
     "Edit" : "Redigeeri",
     "Cancel" : "Loobu",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index 94ba71a6c..364934d90 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Seaded",
     "Folders" : "Kaustad",
     "Favorites" : "Lemmikud",
     "Videos" : "Videod",
     "Archive" : "Arhiiv",
     "Tags" : "Sildid",
     "Maps" : "Kaardid",
-    "Settings" : "Seaded",
     "Unsaved changes" : "Salvestamata muutused",
     "Edit" : "Redigeeri",
     "Cancel" : "Loobu",
diff --git a/l10n/eu.js b/l10n/eu.js
index 897d483db..db4b7dcae 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Memoriak",
     "Yet another photo management app" : "Beste argazki kudeatze aplikazio bat",
+    "Settings" : "Ezarpenak",
     "Timeline" : "Denbora-lerroa",
     "Folders" : "Karpetak",
     "Favorites" : "Gogokoak",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "Egun honetan",
     "Tags" : "Etiketak",
     "Maps" : "Mapak",
-    "Settings" : "Ezarpenak",
     "Error saving image" : "Errorea irudia gordetzean",
     "Unsaved changes" : "Gorde gabeko aldaketak",
     "Drop changes" : "Jaregin aldaketak",
diff --git a/l10n/eu.json b/l10n/eu.json
index ca9ecc541..b69619e4a 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Memoriak",
     "Yet another photo management app" : "Beste argazki kudeatze aplikazio bat",
+    "Settings" : "Ezarpenak",
     "Timeline" : "Denbora-lerroa",
     "Folders" : "Karpetak",
     "Favorites" : "Gogokoak",
@@ -11,7 +12,6 @@
     "On this day" : "Egun honetan",
     "Tags" : "Etiketak",
     "Maps" : "Mapak",
-    "Settings" : "Ezarpenak",
     "Error saving image" : "Errorea irudia gordetzean",
     "Unsaved changes" : "Gorde gabeko aldaketak",
     "Drop changes" : "Jaregin aldaketak",
diff --git a/l10n/fa.js b/l10n/fa.js
index 8e23505b6..bb077fd4d 100644
--- a/l10n/fa.js
+++ b/l10n/fa.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "تنظیمات",
     "Timeline" : "خط زمانی",
     "Folders" : "پوشه ها",
     "Favorites" : "مورد علاقه‌ها",
@@ -9,7 +10,6 @@ OC.L10N.register(
     "Archive" : "بایگانی",
     "Tags" : "برچسب ها",
     "Maps" : "نقشه‌ها",
-    "Settings" : "تنظیمات",
     "Edit" : "ویرایش",
     "Loading …" : "بارگذاری …",
     "Cancel" : "لغو",
diff --git a/l10n/fa.json b/l10n/fa.json
index d2b23b3ce..1ee4ebc70 100644
--- a/l10n/fa.json
+++ b/l10n/fa.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "تنظیمات",
     "Timeline" : "خط زمانی",
     "Folders" : "پوشه ها",
     "Favorites" : "مورد علاقه‌ها",
@@ -7,7 +8,6 @@
     "Archive" : "بایگانی",
     "Tags" : "برچسب ها",
     "Maps" : "نقشه‌ها",
-    "Settings" : "تنظیمات",
     "Edit" : "ویرایش",
     "Loading …" : "بارگذاری …",
     "Cancel" : "لغو",
diff --git a/l10n/fi.js b/l10n/fi.js
index bd961a505..18e07b66c 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Muistot",
     "Yet another photo management app" : "Vaihtoehtoinen sovellus valokuvien hallintaan",
+    "Settings" : "Asetukset",
     "Timeline" : "Aikajana",
     "Folders" : "Kansiot",
     "Favorites" : "Suosikit",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "Tänä päivänä",
     "Tags" : "Tunnisteet",
     "Maps" : "Kartat",
-    "Settings" : "Asetukset",
     "A better photos experience awaits you" : "Parempi kuvakokemus odottaa sinua",
     "Choose the root folder of your timeline to begin" : "Valitse aikajanan juurihakemisto aloittaaksesi",
     "If you just installed Memories, run:" : "Jos olet juuri asentanut Muistot, suorita:",
diff --git a/l10n/fi.json b/l10n/fi.json
index 8195e5fd1..d6b14a800 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Muistot",
     "Yet another photo management app" : "Vaihtoehtoinen sovellus valokuvien hallintaan",
+    "Settings" : "Asetukset",
     "Timeline" : "Aikajana",
     "Folders" : "Kansiot",
     "Favorites" : "Suosikit",
@@ -11,7 +12,6 @@
     "On this day" : "Tänä päivänä",
     "Tags" : "Tunnisteet",
     "Maps" : "Kartat",
-    "Settings" : "Asetukset",
     "A better photos experience awaits you" : "Parempi kuvakokemus odottaa sinua",
     "Choose the root folder of your timeline to begin" : "Valitse aikajanan juurihakemisto aloittaaksesi",
     "If you just installed Memories, run:" : "Jos olet juuri asentanut Muistot, suorita:",
diff --git a/l10n/fr.js b/l10n/fr.js
index aa4d14bda..76b6c00cf 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Souvenirs",
     "Yet another photo management app" : "Une nouvelle application de gestion des photos",
+    "Settings" : "Paramètres",
     "Timeline" : "Fil chronologique",
     "Folders" : "Dossiers",
     "Favorites" : "Favoris",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "Ce même jour",
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
-    "Settings" : "Paramètres",
     "Error saving image" : "Erreur lors de l'enregistrement de l'image",
     "Unsaved changes" : "Modifications non enregistrées",
     "Drop changes" : "Abandonner les changements",
diff --git a/l10n/fr.json b/l10n/fr.json
index a9a582e92..621332650 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Souvenirs",
     "Yet another photo management app" : "Une nouvelle application de gestion des photos",
+    "Settings" : "Paramètres",
     "Timeline" : "Fil chronologique",
     "Folders" : "Dossiers",
     "Favorites" : "Favoris",
@@ -11,7 +12,6 @@
     "On this day" : "Ce même jour",
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
-    "Settings" : "Paramètres",
     "Error saving image" : "Erreur lors de l'enregistrement de l'image",
     "Unsaved changes" : "Modifications non enregistrées",
     "Drop changes" : "Abandonner les changements",
diff --git a/l10n/gd.js b/l10n/gd.js
index 8ac62503e..89df61946 100644
--- a/l10n/gd.js
+++ b/l10n/gd.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Roghainnean",
     "Favorites" : "Annsachdan",
     "Videos" : "Videothan",
     "Tags" : "Tagaichean",
-    "Settings" : "Roghainnean",
     "Edit" : "Deasaich",
     "Cancel" : "Sguir dheth",
     "Delete" : "Sguab às",
diff --git a/l10n/gd.json b/l10n/gd.json
index 8e08a751a..0ff3a5476 100644
--- a/l10n/gd.json
+++ b/l10n/gd.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "Roghainnean",
     "Favorites" : "Annsachdan",
     "Videos" : "Videothan",
     "Tags" : "Tagaichean",
-    "Settings" : "Roghainnean",
     "Edit" : "Deasaich",
     "Cancel" : "Sguir dheth",
     "Delete" : "Sguab às",
diff --git a/l10n/gl.js b/l10n/gl.js
index c7ebd8097..27cb2961d 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Axustes",
     "Timeline" : "Liña temporal",
     "Folders" : "Cartafoles",
     "Favorites" : "Favoritos",
@@ -9,7 +10,6 @@ OC.L10N.register(
     "Archive" : "Aquivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Axustes",
     "Unsaved changes" : "Cambios sen gardar",
     "Edit" : "Editar",
     "Loading …" : "Cargando…",
diff --git a/l10n/gl.json b/l10n/gl.json
index 414678711..440ff7c4f 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Axustes",
     "Timeline" : "Liña temporal",
     "Folders" : "Cartafoles",
     "Favorites" : "Favoritos",
@@ -7,7 +8,6 @@
     "Archive" : "Aquivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Axustes",
     "Unsaved changes" : "Cambios sen gardar",
     "Edit" : "Editar",
     "Loading …" : "Cargando…",
diff --git a/l10n/he.js b/l10n/he.js
index 2eba18292..7e758f485 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "הגדרות",
     "Timeline" : "ציר זמן",
     "Folders" : "תיקייה",
     "Favorites" : "מועדפים",
@@ -8,7 +9,6 @@ OC.L10N.register(
     "Archive" : "לארכיון",
     "Tags" : "תגיות",
     "Maps" : "מפות",
-    "Settings" : "הגדרות",
     "Unsaved changes" : "שינויים שלא נשמרו",
     "Edit" : "עריכה",
     "Loading …" : "בטעינה…",
diff --git a/l10n/he.json b/l10n/he.json
index ba773d2f4..3fadedcb2 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "הגדרות",
     "Timeline" : "ציר זמן",
     "Folders" : "תיקייה",
     "Favorites" : "מועדפים",
@@ -6,7 +7,6 @@
     "Archive" : "לארכיון",
     "Tags" : "תגיות",
     "Maps" : "מפות",
-    "Settings" : "הגדרות",
     "Unsaved changes" : "שינויים שלא נשמרו",
     "Edit" : "עריכה",
     "Loading …" : "בטעינה…",
diff --git a/l10n/hr.js b/l10n/hr.js
index a8a34d0d7..6eb70fc94 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Postavke",
     "Timeline" : "Vremenska crta",
     "Folders" : "Mape",
     "Favorites" : "Favoriti",
@@ -9,7 +10,6 @@ OC.L10N.register(
     "Archive" : "Arhiva",
     "Tags" : "Oznake",
     "Maps" : "Karte",
-    "Settings" : "Postavke",
     "Unsaved changes" : "Nespremljene promjene",
     "Edit" : "Uredi",
     "Loading …" : "Učitavanje…",
diff --git a/l10n/hr.json b/l10n/hr.json
index 66422a5de..040aebfef 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Postavke",
     "Timeline" : "Vremenska crta",
     "Folders" : "Mape",
     "Favorites" : "Favoriti",
@@ -7,7 +8,6 @@
     "Archive" : "Arhiva",
     "Tags" : "Oznake",
     "Maps" : "Karte",
-    "Settings" : "Postavke",
     "Unsaved changes" : "Nespremljene promjene",
     "Edit" : "Uredi",
     "Loading …" : "Učitavanje…",
diff --git a/l10n/hu.js b/l10n/hu.js
index 988b2598f..44466a518 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Emlékek",
     "Yet another photo management app" : "Még egy fényképkezelő alkalmazás",
+    "Settings" : "Beállítások",
     "Timeline" : "Idővonal",
     "Folders" : "Mappák",
     "Favorites" : "Kedvencek",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "A mai napon",
     "Tags" : "Címkék",
     "Maps" : "Térképek",
-    "Settings" : "Beállítások",
     "EXIF" : "EXIF",
     "Unsaved changes" : "Mentetlen változtatások",
     "Drop changes" : "Változtatások elvetése",
@@ -67,6 +67,7 @@ OC.L10N.register(
     "Add collaborators" : "Közreműködők hozzáadása",
     "Save" : "Mentés",
     "Create album" : "Album létrehozása",
+    "Add selection to album {albumName}" : "Kiválasztás hozzáadása a(z) {albumName} albumhoz",
     "Create a new album." : "Új album létrehozása.",
     "Save collaborators for this album." : "Közreműködők mentése ehhez az albumhoz.",
     "Year" : "Év",
diff --git a/l10n/hu.json b/l10n/hu.json
index 32b96c47b..1b563d024 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Emlékek",
     "Yet another photo management app" : "Még egy fényképkezelő alkalmazás",
+    "Settings" : "Beállítások",
     "Timeline" : "Idővonal",
     "Folders" : "Mappák",
     "Favorites" : "Kedvencek",
@@ -11,7 +12,6 @@
     "On this day" : "A mai napon",
     "Tags" : "Címkék",
     "Maps" : "Térképek",
-    "Settings" : "Beállítások",
     "EXIF" : "EXIF",
     "Unsaved changes" : "Mentetlen változtatások",
     "Drop changes" : "Változtatások elvetése",
@@ -65,6 +65,7 @@
     "Add collaborators" : "Közreműködők hozzáadása",
     "Save" : "Mentés",
     "Create album" : "Album létrehozása",
+    "Add selection to album {albumName}" : "Kiválasztás hozzáadása a(z) {albumName} albumhoz",
     "Create a new album." : "Új album létrehozása.",
     "Save collaborators for this album." : "Közreműködők mentése ehhez az albumhoz.",
     "Year" : "Év",
diff --git a/l10n/hy.js b/l10n/hy.js
index eaf9a18b6..296fcad87 100644
--- a/l10n/hy.js
+++ b/l10n/hy.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "memories",
     {
-    "Favorites" : "Սիրվածներ",
     "Settings" : "կարգավորումներ",
+    "Favorites" : "Սիրվածներ",
     "Edit" : "մշակել",
     "Cancel" : "ընդհատել",
     "Delete" : "հեռացնել",
diff --git a/l10n/hy.json b/l10n/hy.json
index 071c0dbf5..6169c0516 100644
--- a/l10n/hy.json
+++ b/l10n/hy.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Favorites" : "Սիրվածներ",
     "Settings" : "կարգավորումներ",
+    "Favorites" : "Սիրվածներ",
     "Edit" : "մշակել",
     "Cancel" : "ընդհատել",
     "Delete" : "հեռացնել",
diff --git a/l10n/ia.js b/l10n/ia.js
index 5b0b550c2..446e05cff 100644
--- a/l10n/ia.js
+++ b/l10n/ia.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configurationes",
     "Favorites" : "Favoritos",
     "Tags" : "Etiquettas",
     "Maps" : "Mappas",
-    "Settings" : "Configurationes",
     "Edit" : "Modificar",
     "Cancel" : "Cancellar",
     "Delete" : "Deler",
diff --git a/l10n/ia.json b/l10n/ia.json
index 3a86bcb0d..1189db7d5 100644
--- a/l10n/ia.json
+++ b/l10n/ia.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "Configurationes",
     "Favorites" : "Favoritos",
     "Tags" : "Etiquettas",
     "Maps" : "Mappas",
-    "Settings" : "Configurationes",
     "Edit" : "Modificar",
     "Cancel" : "Cancellar",
     "Delete" : "Deler",
diff --git a/l10n/id.js b/l10n/id.js
index f312e392c..fbe4dfe71 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Setelan",
     "Timeline" : "Linimasa",
     "Folders" : "Folder-folder",
     "Favorites" : "Disukai",
@@ -8,7 +9,6 @@ OC.L10N.register(
     "Archive" : "Arsip",
     "Tags" : "Tag",
     "Maps" : "Peta",
-    "Settings" : "Setelan",
     "Edit" : "Sunting",
     "Cancel" : "Membatalkan",
     "Delete" : "Hapus",
diff --git a/l10n/id.json b/l10n/id.json
index e333d4c6b..166e369bd 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Setelan",
     "Timeline" : "Linimasa",
     "Folders" : "Folder-folder",
     "Favorites" : "Disukai",
@@ -6,7 +7,6 @@
     "Archive" : "Arsip",
     "Tags" : "Tag",
     "Maps" : "Peta",
-    "Settings" : "Setelan",
     "Edit" : "Sunting",
     "Cancel" : "Membatalkan",
     "Delete" : "Hapus",
diff --git a/l10n/is.js b/l10n/is.js
index 934f28a25..a961b29aa 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Stillingar",
     "Timeline" : "Tímalína",
     "Folders" : "Möppur",
     "Favorites" : "Eftirlæti",
@@ -10,7 +11,6 @@ OC.L10N.register(
     "On this day" : "Á þessum degi",
     "Tags" : "Merki",
     "Maps" : "Landakort",
-    "Settings" : "Stillingar",
     "Unsaved changes" : "Óvistaðar breytingar",
     "Edit" : "Breyta",
     "Loading …" : "Hleð inn …",
diff --git a/l10n/is.json b/l10n/is.json
index 62e1bfa9f..cf39a1b5e 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Stillingar",
     "Timeline" : "Tímalína",
     "Folders" : "Möppur",
     "Favorites" : "Eftirlæti",
@@ -8,7 +9,6 @@
     "On this day" : "Á þessum degi",
     "Tags" : "Merki",
     "Maps" : "Landakort",
-    "Settings" : "Stillingar",
     "Unsaved changes" : "Óvistaðar breytingar",
     "Edit" : "Breyta",
     "Loading …" : "Hleð inn …",
diff --git a/l10n/it.js b/l10n/it.js
index b2e3c51ce..53e4808e6 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Impostazioni",
     "Timeline" : "Linea temporale",
     "Folders" : "Cartelle",
     "Favorites" : "Preferiti",
@@ -11,7 +12,6 @@ OC.L10N.register(
     "On this day" : "In questo giorno",
     "Tags" : "Etichette",
     "Maps" : "Mappe",
-    "Settings" : "Impostazioni",
     "Unsaved changes" : "Modifiche non salvate",
     "Edit" : "Modifica",
     "Loading …" : "Caricamento …",
diff --git a/l10n/it.json b/l10n/it.json
index 2581fd8b2..807701358 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Impostazioni",
     "Timeline" : "Linea temporale",
     "Folders" : "Cartelle",
     "Favorites" : "Preferiti",
@@ -9,7 +10,6 @@
     "On this day" : "In questo giorno",
     "Tags" : "Etichette",
     "Maps" : "Mappe",
-    "Settings" : "Impostazioni",
     "Unsaved changes" : "Modifiche non salvate",
     "Edit" : "Modifica",
     "Loading …" : "Caricamento …",
diff --git a/l10n/ja.js b/l10n/ja.js
index 6a950368a..027425b93 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "設定",
     "Timeline" : "タイムライン",
     "Folders" : "フォルダー",
     "Favorites" : "お気に入り",
@@ -10,7 +11,6 @@ OC.L10N.register(
     "On this day" : "この日",
     "Tags" : "タグ",
     "Maps" : "地図",
-    "Settings" : "設定",
     "Error saving image" : "画像保存でのエラー",
     "Unsaved changes" : "保存していない変更点",
     "Edit" : "編集",
diff --git a/l10n/ja.json b/l10n/ja.json
index 553a3c6f0..f8d063fe3 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "設定",
     "Timeline" : "タイムライン",
     "Folders" : "フォルダー",
     "Favorites" : "お気に入り",
@@ -8,7 +9,6 @@
     "On this day" : "この日",
     "Tags" : "タグ",
     "Maps" : "地図",
-    "Settings" : "設定",
     "Error saving image" : "画像保存でのエラー",
     "Unsaved changes" : "保存していない変更点",
     "Edit" : "編集",
diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js
index 20ed4c078..6db14874b 100644
--- a/l10n/ka_GE.js
+++ b/l10n/ka_GE.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "პარამეტრები",
     "Folders" : "დირექტორიები",
     "Favorites" : "რჩეულები",
     "Videos" : "ვიდეოები",
     "Archive" : "არქივი",
     "Tags" : "ტეგები",
     "Maps" : "რუკები",
-    "Settings" : "პარამეტრები",
     "Unsaved changes" : "შეუნახავი ცვლილებები",
     "Edit" : "შეცვლა",
     "Cancel" : "უარყოფა",
diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json
index 02df1df35..41069df28 100644
--- a/l10n/ka_GE.json
+++ b/l10n/ka_GE.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "პარამეტრები",
     "Folders" : "დირექტორიები",
     "Favorites" : "რჩეულები",
     "Videos" : "ვიდეოები",
     "Archive" : "არქივი",
     "Tags" : "ტეგები",
     "Maps" : "რუკები",
-    "Settings" : "პარამეტრები",
     "Unsaved changes" : "შეუნახავი ცვლილებები",
     "Edit" : "შეცვლა",
     "Cancel" : "უარყოფა",
diff --git a/l10n/kab.js b/l10n/kab.js
index 22fbcc307..ad2a8775c 100644
--- a/l10n/kab.js
+++ b/l10n/kab.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Iɣewwaṛen",
     "Favorites" : "Imenyafen",
     "Videos" : "Tividyutin",
     "Tags" : "Tibzimin",
-    "Settings" : "Iɣewwaṛen",
     "Edit" : "Ẓreg",
     "Cancel" : "Sefsex",
     "Delete" : "Kkes",
diff --git a/l10n/kab.json b/l10n/kab.json
index 684a0cc6c..63f3ef152 100644
--- a/l10n/kab.json
+++ b/l10n/kab.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "Iɣewwaṛen",
     "Favorites" : "Imenyafen",
     "Videos" : "Tividyutin",
     "Tags" : "Tibzimin",
-    "Settings" : "Iɣewwaṛen",
     "Edit" : "Ẓreg",
     "Cancel" : "Sefsex",
     "Delete" : "Kkes",
diff --git a/l10n/km.js b/l10n/km.js
index 26df0d0e5..ce4a44293 100644
--- a/l10n/km.js
+++ b/l10n/km.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "ការកំណត់",
     "Favorites" : "Favorites",
     "Tags" : "ស្លាក",
     "Maps" : "ផែនទី",
-    "Settings" : "ការកំណត់",
     "Edit" : "កែប្រែ",
     "Cancel" : "បោះបង់",
     "Delete" : "លុប",
diff --git a/l10n/km.json b/l10n/km.json
index 0b6458d4c..0f3ee5cb5 100644
--- a/l10n/km.json
+++ b/l10n/km.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "ការកំណត់",
     "Favorites" : "Favorites",
     "Tags" : "ស្លាក",
     "Maps" : "ផែនទី",
-    "Settings" : "ការកំណត់",
     "Edit" : "កែប្រែ",
     "Cancel" : "បោះបង់",
     "Delete" : "លុប",
diff --git a/l10n/kn.js b/l10n/kn.js
index 6d74274b7..e84812050 100644
--- a/l10n/kn.js
+++ b/l10n/kn.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "ಆಯ್ಕೆ",
     "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
     "Maps" : "ನಕಾಶೆ",
-    "Settings" : "ಆಯ್ಕೆ",
     "Edit" : "ಸಂಪಾದಿಸು",
     "Cancel" : "ರದ್ದು",
     "Delete" : "ಅಳಿಸಿ",
diff --git a/l10n/kn.json b/l10n/kn.json
index 5c6a20ba6..550a8279f 100644
--- a/l10n/kn.json
+++ b/l10n/kn.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Settings" : "ಆಯ್ಕೆ",
     "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
     "Maps" : "ನಕಾಶೆ",
-    "Settings" : "ಆಯ್ಕೆ",
     "Edit" : "ಸಂಪಾದಿಸು",
     "Cancel" : "ರದ್ದು",
     "Delete" : "ಅಳಿಸಿ",
diff --git a/l10n/ko.js b/l10n/ko.js
index f5a37f8ec..0432c5ecb 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "설정",
     "Timeline" : "타임라인",
     "Folders" : "폴더",
     "Favorites" : "즐겨찾기",
@@ -8,7 +9,6 @@ OC.L10N.register(
     "Archive" : "보관",
     "Tags" : "태그",
     "Maps" : "지도",
-    "Settings" : "설정",
     "Unsaved changes" : "저장하지 않은 변경 사항",
     "Edit" : "편집",
     "Loading …" : "불러오는 중 …",
diff --git a/l10n/ko.json b/l10n/ko.json
index db5349d7f..6246ea75c 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "설정",
     "Timeline" : "타임라인",
     "Folders" : "폴더",
     "Favorites" : "즐겨찾기",
@@ -6,7 +7,6 @@
     "Archive" : "보관",
     "Tags" : "태그",
     "Maps" : "지도",
-    "Settings" : "설정",
     "Unsaved changes" : "저장하지 않은 변경 사항",
     "Edit" : "편집",
     "Loading …" : "불러오는 중 …",
diff --git a/l10n/lb.js b/l10n/lb.js
index 98b930622..fff5088a8 100644
--- a/l10n/lb.js
+++ b/l10n/lb.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Astellungen",
     "Favorites" : "Favoriten",
     "Tags" : "Tags",
     "Maps" : "Kaarten",
-    "Settings" : "Astellungen",
     "Edit" : "Änneren",
     "Cancel" : "Ofbriechen",
     "Delete" : "Läschen",
diff --git a/l10n/lb.json b/l10n/lb.json
index 0fc2e70c0..b6b9dccc7 100644
--- a/l10n/lb.json
+++ b/l10n/lb.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "Astellungen",
     "Favorites" : "Favoriten",
     "Tags" : "Tags",
     "Maps" : "Kaarten",
-    "Settings" : "Astellungen",
     "Edit" : "Änneren",
     "Cancel" : "Ofbriechen",
     "Delete" : "Läschen",
diff --git a/l10n/lo.js b/l10n/lo.js
index 808a3fbb2..81ee13d9d 100644
--- a/l10n/lo.js
+++ b/l10n/lo.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "ການຕັ້ງຄ່າ",
     "Favorites" : "ລາຍການທີ່ມັກ",
     "Videos" : "ວິດີໂອ",
     "Tags" : "ປ້າຍກຳກັບ",
-    "Settings" : "ການຕັ້ງຄ່າ",
     "Edit" : "ແກ້ໄຂ",
     "Loading …" : "ກຳລັງໂຫຼດ",
     "Cancel" : "ຍົກເລີກ",
diff --git a/l10n/lo.json b/l10n/lo.json
index 1f4179ecd..74e031ee1 100644
--- a/l10n/lo.json
+++ b/l10n/lo.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "ການຕັ້ງຄ່າ",
     "Favorites" : "ລາຍການທີ່ມັກ",
     "Videos" : "ວິດີໂອ",
     "Tags" : "ປ້າຍກຳກັບ",
-    "Settings" : "ການຕັ້ງຄ່າ",
     "Edit" : "ແກ້ໄຂ",
     "Loading …" : "ກຳລັງໂຫຼດ",
     "Cancel" : "ຍົກເລີກ",
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 08a81994c..0575ce7e0 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Prisiminimai",
     "Yet another photo management app" : "Dar viena nuotraukų tvarkymo programėlė",
+    "Settings" : "Nustatymai",
     "Timeline" : "Laiko juosta",
     "Folders" : "Aplankai",
     "Favorites" : "Mėgstami",
@@ -13,8 +14,10 @@ OC.L10N.register(
     "On this day" : "Šią dieną",
     "Tags" : "Žymės",
     "Maps" : "Žemėlapiai",
-    "Settings" : "Nustatymai",
+    "EXIF" : "EXIF",
     "Click here to start" : "Spustelėkite čia, norėdami pradėti",
+    "Image saved successfully" : "Paveikslas sėkmingai įrašytas",
+    "Error saving image" : "Klaida įrašant paveikslą",
     "Unsaved changes" : "Neįrašyti pakeitimai",
     "Edit" : "Taisyti",
     "Loading …" : "Įkeliama…",
@@ -85,6 +88,7 @@ OC.L10N.register(
     "Too many failures, aborting" : "Per daug nesėkmių, nutraukiama",
     "Error while moving {basename}" : "Klaida perkeliant {basename}",
     "Failed to move {name}." : "Nepavyko perkelti {name}.",
+    "Share Folder" : "Bendrinti aplanką",
     "Refresh" : "Įkelti iš naujo",
     "Share album" : "Bendrinti albumą",
     "Delete album" : "Ištrinti albumą",
@@ -100,6 +104,8 @@ OC.L10N.register(
     "Undo" : "Atšaukti",
     "Redo" : "Grąžinti",
     "Zoom in" : "Didinti",
+    "Zoom out" : "Mažinti",
+    "Toggle zoom menu" : "Perjungti mastelio meniu",
     "Resize" : "Keisti dydį",
     "Crop" : "Apkirpti",
     "Custom" : "Tinkinti",
@@ -120,6 +126,7 @@ OC.L10N.register(
     "General Failure" : "Bendrinė nesėkmė",
     "Error: {msg}" : "Klaida: {msg}",
     "Failed to delete files." : "Nepavyko ištrinti failų.",
-    "Failed to delete {fileName}." : "Nepavyko ištrinti {fileName}."
+    "Failed to delete {fileName}." : "Nepavyko ištrinti {fileName}.",
+    "Failed to download some files." : "Nepavyko atsisiųsti kai kurių failų."
 },
 "nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index 79b18500e..c70915553 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Prisiminimai",
     "Yet another photo management app" : "Dar viena nuotraukų tvarkymo programėlė",
+    "Settings" : "Nustatymai",
     "Timeline" : "Laiko juosta",
     "Folders" : "Aplankai",
     "Favorites" : "Mėgstami",
@@ -11,8 +12,10 @@
     "On this day" : "Šią dieną",
     "Tags" : "Žymės",
     "Maps" : "Žemėlapiai",
-    "Settings" : "Nustatymai",
+    "EXIF" : "EXIF",
     "Click here to start" : "Spustelėkite čia, norėdami pradėti",
+    "Image saved successfully" : "Paveikslas sėkmingai įrašytas",
+    "Error saving image" : "Klaida įrašant paveikslą",
     "Unsaved changes" : "Neįrašyti pakeitimai",
     "Edit" : "Taisyti",
     "Loading …" : "Įkeliama…",
@@ -83,6 +86,7 @@
     "Too many failures, aborting" : "Per daug nesėkmių, nutraukiama",
     "Error while moving {basename}" : "Klaida perkeliant {basename}",
     "Failed to move {name}." : "Nepavyko perkelti {name}.",
+    "Share Folder" : "Bendrinti aplanką",
     "Refresh" : "Įkelti iš naujo",
     "Share album" : "Bendrinti albumą",
     "Delete album" : "Ištrinti albumą",
@@ -98,6 +102,8 @@
     "Undo" : "Atšaukti",
     "Redo" : "Grąžinti",
     "Zoom in" : "Didinti",
+    "Zoom out" : "Mažinti",
+    "Toggle zoom menu" : "Perjungti mastelio meniu",
     "Resize" : "Keisti dydį",
     "Crop" : "Apkirpti",
     "Custom" : "Tinkinti",
@@ -118,6 +124,7 @@
     "General Failure" : "Bendrinė nesėkmė",
     "Error: {msg}" : "Klaida: {msg}",
     "Failed to delete files." : "Nepavyko ištrinti failų.",
-    "Failed to delete {fileName}." : "Nepavyko ištrinti {fileName}."
+    "Failed to delete {fileName}." : "Nepavyko ištrinti {fileName}.",
+    "Failed to download some files." : "Nepavyko atsisiųsti kai kurių failų."
 },"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"
 }
\ No newline at end of file
diff --git a/l10n/lv.js b/l10n/lv.js
index 21317b634..567dbb0e7 100644
--- a/l10n/lv.js
+++ b/l10n/lv.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Iestatījumi",
     "Folders" : "Mapes",
     "Favorites" : "Favorīti",
     "Videos" : "Video",
@@ -8,7 +9,6 @@ OC.L10N.register(
     "Archive" : "Arhīvi",
     "Tags" : "Birkas",
     "Maps" : "Karte",
-    "Settings" : "Iestatījumi",
     "EXIF" : "EXIF",
     "Edit" : "Rediģēt",
     "Cancel" : "Atcelt",
diff --git a/l10n/lv.json b/l10n/lv.json
index 5ded0c628..361a07857 100644
--- a/l10n/lv.json
+++ b/l10n/lv.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Iestatījumi",
     "Folders" : "Mapes",
     "Favorites" : "Favorīti",
     "Videos" : "Video",
@@ -6,7 +7,6 @@
     "Archive" : "Arhīvi",
     "Tags" : "Birkas",
     "Maps" : "Karte",
-    "Settings" : "Iestatījumi",
     "EXIF" : "EXIF",
     "Edit" : "Rediģēt",
     "Cancel" : "Atcelt",
diff --git a/l10n/mk.js b/l10n/mk.js
index 6d7c0ab58..79992128b 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Параметри",
     "Timeline" : "Времеплов",
     "Folders" : "Папки",
     "Favorites" : "Омилени",
@@ -11,7 +12,6 @@ OC.L10N.register(
     "On this day" : "На денешен ден",
     "Tags" : "Ознаки",
     "Maps" : "Мапи",
-    "Settings" : "Параметри",
     "Unsaved changes" : "Незачувани промени",
     "Edit" : "Уреди",
     "Loading …" : "Се вчитува…",
diff --git a/l10n/mk.json b/l10n/mk.json
index 8ac7d3958..172da306d 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Параметри",
     "Timeline" : "Времеплов",
     "Folders" : "Папки",
     "Favorites" : "Омилени",
@@ -9,7 +10,6 @@
     "On this day" : "На денешен ден",
     "Tags" : "Ознаки",
     "Maps" : "Мапи",
-    "Settings" : "Параметри",
     "Unsaved changes" : "Незачувани промени",
     "Edit" : "Уреди",
     "Loading …" : "Се вчитува…",
diff --git a/l10n/mn.js b/l10n/mn.js
index aed6d47f5..04b030a10 100644
--- a/l10n/mn.js
+++ b/l10n/mn.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Тохиргоо",
     "Folders" : "Хавтсууд",
     "Favorites" : "Онцолсон",
     "Videos" : "Бичлэгүүд",
     "Archive" : "архив",
     "Tags" : "Tag-үүд",
     "Maps" : "Газрын зураг",
-    "Settings" : "Тохиргоо",
     "Edit" : "засварлах",
     "Loading …" : "Уншиж байна...",
     "Cancel" : "болиулах",
diff --git a/l10n/mn.json b/l10n/mn.json
index f8ef9ff88..9e987dd08 100644
--- a/l10n/mn.json
+++ b/l10n/mn.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Тохиргоо",
     "Folders" : "Хавтсууд",
     "Favorites" : "Онцолсон",
     "Videos" : "Бичлэгүүд",
     "Archive" : "архив",
     "Tags" : "Tag-үүд",
     "Maps" : "Газрын зураг",
-    "Settings" : "Тохиргоо",
     "Edit" : "засварлах",
     "Loading …" : "Уншиж байна...",
     "Cancel" : "болиулах",
diff --git a/l10n/ms_MY.js b/l10n/ms_MY.js
index 35fa16f99..ad8adcc8a 100644
--- a/l10n/ms_MY.js
+++ b/l10n/ms_MY.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "memories",
     {
-    "Favorites" : "Favorites",
     "Settings" : "Tetapan",
+    "Favorites" : "Favorites",
     "Edit" : "Sunting",
     "Cancel" : "Batal",
     "Delete" : "Padam",
diff --git a/l10n/ms_MY.json b/l10n/ms_MY.json
index 962e6ba6e..bdef3a5c1 100644
--- a/l10n/ms_MY.json
+++ b/l10n/ms_MY.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Favorites" : "Favorites",
     "Settings" : "Tetapan",
+    "Favorites" : "Favorites",
     "Edit" : "Sunting",
     "Cancel" : "Batal",
     "Delete" : "Padam",
diff --git a/l10n/nb.js b/l10n/nb.js
index 2f04739d5..d52db292f 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Innstillinger",
     "Timeline" : "Tidslinje",
     "Folders" : "Mapper",
     "Favorites" : "Favoritter",
@@ -10,7 +11,6 @@ OC.L10N.register(
     "On this day" : "På denne dagen",
     "Tags" : "Merkelapper",
     "Maps" : "Kart",
-    "Settings" : "Innstillinger",
     "Unsaved changes" : "Ulagrede endringer",
     "Edit" : "Rediger",
     "Loading …" : "Laster ...",
diff --git a/l10n/nb.json b/l10n/nb.json
index ff3202595..6fb6ac3a2 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Innstillinger",
     "Timeline" : "Tidslinje",
     "Folders" : "Mapper",
     "Favorites" : "Favoritter",
@@ -8,7 +9,6 @@
     "On this day" : "På denne dagen",
     "Tags" : "Merkelapper",
     "Maps" : "Kart",
-    "Settings" : "Innstillinger",
     "Unsaved changes" : "Ulagrede endringer",
     "Edit" : "Rediger",
     "Loading …" : "Laster ...",
diff --git a/l10n/nl.js b/l10n/nl.js
index 78534b435..5d5f721b5 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Instellingen",
     "Timeline" : "Tijdlijn",
     "Folders" : "Mappen",
     "Favorites" : "Favorieten",
@@ -11,7 +12,6 @@ OC.L10N.register(
     "On this day" : "Vandaag",
     "Tags" : "Tags",
     "Maps" : "Kaarten",
-    "Settings" : "Instellingen",
     "Unsaved changes" : "Niet opgeslagen veranderingen",
     "Edit" : "Bewerk",
     "Loading …" : "Laden …",
diff --git a/l10n/nl.json b/l10n/nl.json
index 13d9086d1..f09ec214f 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Instellingen",
     "Timeline" : "Tijdlijn",
     "Folders" : "Mappen",
     "Favorites" : "Favorieten",
@@ -9,7 +10,6 @@
     "On this day" : "Vandaag",
     "Tags" : "Tags",
     "Maps" : "Kaarten",
-    "Settings" : "Instellingen",
     "Unsaved changes" : "Niet opgeslagen veranderingen",
     "Edit" : "Bewerk",
     "Loading …" : "Laden …",
diff --git a/l10n/nn_NO.js b/l10n/nn_NO.js
index ef9a60123..e38cff249 100644
--- a/l10n/nn_NO.js
+++ b/l10n/nn_NO.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Innstillingar",
     "Favorites" : "Favorittar",
     "Videos" : "Video",
     "Tags" : "Emneord",
-    "Settings" : "Innstillingar",
     "Edit" : "Rediger",
     "Cancel" : "Avbryt",
     "Delete" : "Slett",
diff --git a/l10n/nn_NO.json b/l10n/nn_NO.json
index a2c312f5c..86f97d25f 100644
--- a/l10n/nn_NO.json
+++ b/l10n/nn_NO.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "Innstillingar",
     "Favorites" : "Favorittar",
     "Videos" : "Video",
     "Tags" : "Emneord",
-    "Settings" : "Innstillingar",
     "Edit" : "Rediger",
     "Cancel" : "Avbryt",
     "Delete" : "Slett",
diff --git a/l10n/oc.js b/l10n/oc.js
index 7dc87283d..ef6e1396c 100644
--- a/l10n/oc.js
+++ b/l10n/oc.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Paramètres",
     "Folders" : "Repertòris",
     "Favorites" : "Favorits",
     "Albums" : "Albums",
@@ -8,7 +9,6 @@ OC.L10N.register(
     "Archive" : "Archiu",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Paramètres",
     "Unsaved changes" : "Modificacions pas enregistradas",
     "Edit" : "Modificar",
     "Loading …" : "Cargament…",
diff --git a/l10n/oc.json b/l10n/oc.json
index fab29d6f7..cc9a344f8 100644
--- a/l10n/oc.json
+++ b/l10n/oc.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Paramètres",
     "Folders" : "Repertòris",
     "Favorites" : "Favorits",
     "Albums" : "Albums",
@@ -6,7 +7,6 @@
     "Archive" : "Archiu",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Paramètres",
     "Unsaved changes" : "Modificacions pas enregistradas",
     "Edit" : "Modificar",
     "Loading …" : "Cargament…",
diff --git a/l10n/pl.js b/l10n/pl.js
index a718190eb..a90a50043 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Wspomnienia",
     "Yet another photo management app" : "Kolejna aplikacja do zarządzania zdjęciami",
+    "Settings" : "Ustawienia",
     "Timeline" : "Oś czasu",
     "Folders" : "Katalogi",
     "Favorites" : "Ulubione",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "W tym dniu",
     "Tags" : "Etykiety",
     "Maps" : "Mapy",
-    "Settings" : "Ustawienia",
     "Error saving image" : "Błąd podczas zapisywania obrazu",
     "Unsaved changes" : "Niezapisane zmiany",
     "Drop changes" : "Odrzuć zmiany",
diff --git a/l10n/pl.json b/l10n/pl.json
index 47ca4abc5..80baa5a32 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Wspomnienia",
     "Yet another photo management app" : "Kolejna aplikacja do zarządzania zdjęciami",
+    "Settings" : "Ustawienia",
     "Timeline" : "Oś czasu",
     "Folders" : "Katalogi",
     "Favorites" : "Ulubione",
@@ -11,7 +12,6 @@
     "On this day" : "W tym dniu",
     "Tags" : "Etykiety",
     "Maps" : "Mapy",
-    "Settings" : "Ustawienia",
     "Error saving image" : "Błąd podczas zapisywania obrazu",
     "Unsaved changes" : "Niezapisane zmiany",
     "Drop changes" : "Odrzuć zmiany",
diff --git a/l10n/ps.js b/l10n/ps.js
index eca8c661f..32110a6d3 100644
--- a/l10n/ps.js
+++ b/l10n/ps.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "سمونې",
     "Favorites" : "په نښه شوي",
     "Tags" : "نښکې",
-    "Settings" : "سمونې",
     "Cancel" : "پرېښول",
     "Delete" : "ړنګول",
     "Download" : "ښکته کول",
diff --git a/l10n/ps.json b/l10n/ps.json
index 3a0f3c883..8322ab2c3 100644
--- a/l10n/ps.json
+++ b/l10n/ps.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Settings" : "سمونې",
     "Favorites" : "په نښه شوي",
     "Tags" : "نښکې",
-    "Settings" : "سمونې",
     "Cancel" : "پرېښول",
     "Delete" : "ړنګول",
     "Download" : "ښکته کول",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 2ab9ca4fb..2fa2d6883 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Memórias",
     "Yet another photo management app" : "Mais um aplicativo de gerenciamento de fotos",
+    "Settings" : "Configurações",
     "Timeline" : "Linha do tempo",
     "Folders" : "Pastas",
     "Favorites" : "Favoritos",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "Nesse dia",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configurações",
     "A better photos experience awaits you" : "Uma melhor experiência de fotos espera por você",
     "Choose the root folder of your timeline to begin" : "Escolha a pasta raiz da sua linha do tempo para começar",
     "If you just installed Memories, run:" : "Se você acabou de instalar o Memórias, execute:",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index bf961366b..cd92140fc 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Memórias",
     "Yet another photo management app" : "Mais um aplicativo de gerenciamento de fotos",
+    "Settings" : "Configurações",
     "Timeline" : "Linha do tempo",
     "Folders" : "Pastas",
     "Favorites" : "Favoritos",
@@ -11,7 +12,6 @@
     "On this day" : "Nesse dia",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Configurações",
     "A better photos experience awaits you" : "Uma melhor experiência de fotos espera por você",
     "Choose the root folder of your timeline to begin" : "Escolha a pasta raiz da sua linha do tempo para começar",
     "If you just installed Memories, run:" : "Se você acabou de instalar o Memórias, execute:",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 3b8c36050..b043ecfd9 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Memories",
     "Yet another photo management app" : "Mais uma aplicação de gestão de fotografias",
+    "Settings" : "Definições",
     "Timeline" : "Linha do tempo",
     "Folders" : "Pastas",
     "Favorites" : "Favoritos",
@@ -10,7 +11,6 @@ OC.L10N.register(
     "Archive" : "Arquivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Definições",
     "Unsaved changes" : "Modificações não guardadas",
     "Edit" : "Editar",
     "Loading …" : "A carregar...",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index 37fc45a4c..da72b5b98 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Memories",
     "Yet another photo management app" : "Mais uma aplicação de gestão de fotografias",
+    "Settings" : "Definições",
     "Timeline" : "Linha do tempo",
     "Folders" : "Pastas",
     "Favorites" : "Favoritos",
@@ -8,7 +9,6 @@
     "Archive" : "Arquivar",
     "Tags" : "Etiquetas",
     "Maps" : "Mapas",
-    "Settings" : "Definições",
     "Unsaved changes" : "Modificações não guardadas",
     "Edit" : "Editar",
     "Loading …" : "A carregar...",
diff --git a/l10n/ro.js b/l10n/ro.js
index fc13fff64..51a99dfbb 100644
--- a/l10n/ro.js
+++ b/l10n/ro.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Setări",
     "Folders" : "Director",
     "Favorites" : "Favorite",
     "Videos" : "Fișiere video",
     "Archive" : "Arhivă",
     "Tags" : "Etichete",
     "Maps" : "Hărți",
-    "Settings" : "Setări",
     "Unsaved changes" : "Modificări nesalvate",
     "Edit" : "Editează",
     "Loading …" : "Se încarcă…",
diff --git a/l10n/ro.json b/l10n/ro.json
index cc83670db..b571646a6 100644
--- a/l10n/ro.json
+++ b/l10n/ro.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Setări",
     "Folders" : "Director",
     "Favorites" : "Favorite",
     "Videos" : "Fișiere video",
     "Archive" : "Arhivă",
     "Tags" : "Etichete",
     "Maps" : "Hărți",
-    "Settings" : "Setări",
     "Unsaved changes" : "Modificări nesalvate",
     "Edit" : "Editează",
     "Loading …" : "Se încarcă…",
diff --git a/l10n/ru.js b/l10n/ru.js
index 9fffef910..9e8d27a08 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Воспоминания",
     "Yet another photo management app" : "Приложение для управления фотографиями",
+    "Settings" : "Настройки",
     "Timeline" : "История",
     "Folders" : "Папки",
     "Favorites" : "Избранное",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "В этот день",
     "Tags" : "Метки",
     "Maps" : "Карты",
-    "Settings" : "Настройки",
     "Error saving image" : "Не удалось сохранить изображение",
     "Unsaved changes" : "Несохранённые изменения",
     "Drop changes" : "Отменить изменения",
diff --git a/l10n/ru.json b/l10n/ru.json
index b3fb782bb..eddd830f7 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Воспоминания",
     "Yet another photo management app" : "Приложение для управления фотографиями",
+    "Settings" : "Настройки",
     "Timeline" : "История",
     "Folders" : "Папки",
     "Favorites" : "Избранное",
@@ -11,7 +12,6 @@
     "On this day" : "В этот день",
     "Tags" : "Метки",
     "Maps" : "Карты",
-    "Settings" : "Настройки",
     "Error saving image" : "Не удалось сохранить изображение",
     "Unsaved changes" : "Несохранённые изменения",
     "Drop changes" : "Отменить изменения",
diff --git a/l10n/sc.js b/l10n/sc.js
index fd0e10262..f12abe771 100644
--- a/l10n/sc.js
+++ b/l10n/sc.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Impostatziones",
     "Timeline" : "Lìnia de tempus",
     "Folders" : "Cartellas",
     "Favorites" : "Preferidos",
@@ -10,7 +11,6 @@ OC.L10N.register(
     "Archive" : "Cartella",
     "Tags" : "Etichetas",
     "Maps" : "Mapas",
-    "Settings" : "Impostatziones",
     "Unsaved changes" : "Mudas non sarvadas",
     "Edit" : "Modìfica",
     "Loading …" : "Carrigamentu …",
diff --git a/l10n/sc.json b/l10n/sc.json
index 40b0eb5c9..33465d9b8 100644
--- a/l10n/sc.json
+++ b/l10n/sc.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Impostatziones",
     "Timeline" : "Lìnia de tempus",
     "Folders" : "Cartellas",
     "Favorites" : "Preferidos",
@@ -8,7 +9,6 @@
     "Archive" : "Cartella",
     "Tags" : "Etichetas",
     "Maps" : "Mapas",
-    "Settings" : "Impostatziones",
     "Unsaved changes" : "Mudas non sarvadas",
     "Edit" : "Modìfica",
     "Loading …" : "Carrigamentu …",
diff --git a/l10n/si.js b/l10n/si.js
index 0cf060573..704ba7c03 100644
--- a/l10n/si.js
+++ b/l10n/si.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "සැකසුම්",
     "Favorites" : "ප්‍රියතම",
     "Archive" : "සංරක්ෂණය",
     "Maps" : "සිතියම්",
-    "Settings" : "සැකසුම්",
     "Edit" : "සංස්කරණය",
     "Loading …" : "පූරණය වෙමින් …",
     "Cancel" : "අවලංගු කරන්න",
diff --git a/l10n/si.json b/l10n/si.json
index 4524a5b6e..9a1e7fed9 100644
--- a/l10n/si.json
+++ b/l10n/si.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "සැකසුම්",
     "Favorites" : "ප්‍රියතම",
     "Archive" : "සංරක්ෂණය",
     "Maps" : "සිතියම්",
-    "Settings" : "සැකසුම්",
     "Edit" : "සංස්කරණය",
     "Loading …" : "පූරණය වෙමින් …",
     "Cancel" : "අවලංගු කරන්න",
diff --git a/l10n/sk.js b/l10n/sk.js
index 6eeb6b7f8..c26b88010 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Spomienky",
     "Yet another photo management app" : "Ďalšia aplikácia na správu fotografií",
+    "Settings" : "Nastavenia",
     "Timeline" : "Časová os",
     "Folders" : "Priečinky",
     "Favorites" : "Obľúbené",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "V tento deň",
     "Tags" : "Štítky",
     "Maps" : "Mapy",
-    "Settings" : "Nastavenia",
     "Error saving image" : "Chyba pri ukladaní obrázku",
     "Unsaved changes" : "Neuložené zmeny",
     "Drop changes" : "Zrušiť zmeny",
diff --git a/l10n/sk.json b/l10n/sk.json
index 164e97c82..f5d341e1a 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Spomienky",
     "Yet another photo management app" : "Ďalšia aplikácia na správu fotografií",
+    "Settings" : "Nastavenia",
     "Timeline" : "Časová os",
     "Folders" : "Priečinky",
     "Favorites" : "Obľúbené",
@@ -11,7 +12,6 @@
     "On this day" : "V tento deň",
     "Tags" : "Štítky",
     "Maps" : "Mapy",
-    "Settings" : "Nastavenia",
     "Error saving image" : "Chyba pri ukladaní obrázku",
     "Unsaved changes" : "Neuložené zmeny",
     "Drop changes" : "Zrušiť zmeny",
diff --git a/l10n/sl.js b/l10n/sl.js
index 6ffe532db..8cc89ae94 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Nastavitve",
     "Timeline" : "Časovnica",
     "Folders" : "Mape",
     "Favorites" : "Priljubljeno",
@@ -11,7 +12,6 @@ OC.L10N.register(
     "On this day" : "Na današnji dan",
     "Tags" : "Oznake",
     "Maps" : "Zemljevidi",
-    "Settings" : "Nastavitve",
     "Unsaved changes" : "Neshranjene spremembe",
     "Edit" : "Uredi",
     "Loading …" : "Poteka nalaganje …",
diff --git a/l10n/sl.json b/l10n/sl.json
index c40368b81..ebd52d55a 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Nastavitve",
     "Timeline" : "Časovnica",
     "Folders" : "Mape",
     "Favorites" : "Priljubljeno",
@@ -9,7 +10,6 @@
     "On this day" : "Na današnji dan",
     "Tags" : "Oznake",
     "Maps" : "Zemljevidi",
-    "Settings" : "Nastavitve",
     "Unsaved changes" : "Neshranjene spremembe",
     "Edit" : "Uredi",
     "Loading …" : "Poteka nalaganje …",
diff --git a/l10n/sq.js b/l10n/sq.js
index afe547efd..59317995e 100644
--- a/l10n/sq.js
+++ b/l10n/sq.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Rregullimet",
     "Folders" : "Dosjet",
     "Favorites" : "Favorites",
     "Videos" : "Videot",
     "Archive" : "Arkiva",
     "Tags" : "Etiketat",
     "Maps" : "Harta",
-    "Settings" : "Rregullimet",
     "Unsaved changes" : "Ndryshime të paruajtura",
     "Edit" : "Përpuno",
     "Cancel" : "Anullo",
diff --git a/l10n/sq.json b/l10n/sq.json
index f757680cc..44fd20577 100644
--- a/l10n/sq.json
+++ b/l10n/sq.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Rregullimet",
     "Folders" : "Dosjet",
     "Favorites" : "Favorites",
     "Videos" : "Videot",
     "Archive" : "Arkiva",
     "Tags" : "Etiketat",
     "Maps" : "Harta",
-    "Settings" : "Rregullimet",
     "Unsaved changes" : "Ndryshime të paruajtura",
     "Edit" : "Përpuno",
     "Cancel" : "Anullo",
diff --git a/l10n/sr.js b/l10n/sr.js
index bc73efc4e..26b34bb42 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Поставке",
     "Timeline" : "Временска оса",
     "Folders" : "Фасцикле",
     "Favorites" : "Омиљене",
@@ -9,7 +10,6 @@ OC.L10N.register(
     "Archive" : "Архива",
     "Tags" : "Ознаке",
     "Maps" : "Мапе",
-    "Settings" : "Поставке",
     "Unsaved changes" : "Несачуване измене",
     "Edit" : "Измени",
     "Loading …" : "Учитавање…",
diff --git a/l10n/sr.json b/l10n/sr.json
index 9b90497e1..df373dd04 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "Поставке",
     "Timeline" : "Временска оса",
     "Folders" : "Фасцикле",
     "Favorites" : "Омиљене",
@@ -7,7 +8,6 @@
     "Archive" : "Архива",
     "Tags" : "Ознаке",
     "Maps" : "Мапе",
-    "Settings" : "Поставке",
     "Unsaved changes" : "Несачуване измене",
     "Edit" : "Измени",
     "Loading …" : "Учитавање…",
diff --git a/l10n/sr@latin.js b/l10n/sr@latin.js
index 131e69cdb..dfb67f3fa 100644
--- a/l10n/sr@latin.js
+++ b/l10n/sr@latin.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Поставке",
     "Favorites" : "Omiljene",
     "Videos" : "Video",
     "Tags" : "Oznake",
-    "Settings" : "Поставке",
     "Edit" : "Izmeni",
     "Cancel" : "Otkaži",
     "Delete" : "Obriši",
diff --git a/l10n/sr@latin.json b/l10n/sr@latin.json
index 54100040f..6e85a8782 100644
--- a/l10n/sr@latin.json
+++ b/l10n/sr@latin.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "Поставке",
     "Favorites" : "Omiljene",
     "Videos" : "Video",
     "Tags" : "Oznake",
-    "Settings" : "Поставке",
     "Edit" : "Izmeni",
     "Cancel" : "Otkaži",
     "Delete" : "Obriši",
diff --git a/l10n/sv.js b/l10n/sv.js
index 764ae4997..754c9986f 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Memories",
     "Yet another photo management app" : "Ännu en app för fotohantering",
+    "Settings" : "Inställningar",
     "Timeline" : "Tidslinje",
     "Folders" : "Mappar",
     "Favorites" : "Favoriter",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "På den här dagen",
     "Tags" : "Taggar",
     "Maps" : "Kartor",
-    "Settings" : "Inställningar",
     "Unsaved changes" : "Ej sparade ändringar",
     "Edit" : "Ändra",
     "Loading …" : "Läser in …",
diff --git a/l10n/sv.json b/l10n/sv.json
index c7c752f91..72d8ec351 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Memories",
     "Yet another photo management app" : "Ännu en app för fotohantering",
+    "Settings" : "Inställningar",
     "Timeline" : "Tidslinje",
     "Folders" : "Mappar",
     "Favorites" : "Favoriter",
@@ -11,7 +12,6 @@
     "On this day" : "På den här dagen",
     "Tags" : "Taggar",
     "Maps" : "Kartor",
-    "Settings" : "Inställningar",
     "Unsaved changes" : "Ej sparade ändringar",
     "Edit" : "Ändra",
     "Loading …" : "Läser in …",
diff --git a/l10n/ta.js b/l10n/ta.js
index 85696c67d..dd456d0fc 100644
--- a/l10n/ta.js
+++ b/l10n/ta.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "அமைப்புகள்",
     "Favorites" : "விருப்பங்கள்",
     "Tags" : "சீட்டுகள்",
-    "Settings" : "அமைப்புகள்",
     "Edit" : "தொகுக்க",
     "Cancel" : "இரத்து செய்க",
     "Delete" : "நீக்குக",
diff --git a/l10n/ta.json b/l10n/ta.json
index f89bd1017..a149b5097 100644
--- a/l10n/ta.json
+++ b/l10n/ta.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Settings" : "அமைப்புகள்",
     "Favorites" : "விருப்பங்கள்",
     "Tags" : "சீட்டுகள்",
-    "Settings" : "அமைப்புகள்",
     "Edit" : "தொகுக்க",
     "Cancel" : "இரத்து செய்க",
     "Delete" : "நீக்குக",
diff --git a/l10n/th.js b/l10n/th.js
index 15e730aba..103b15d3b 100644
--- a/l10n/th.js
+++ b/l10n/th.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "การตั้งค่า",
     "Folders" : "แฟ้มเอกสาร",
     "Favorites" : "รายการโปรด",
     "Videos" : "วิดีโอ",
     "Archive" : "เก็บถาวร",
     "Tags" : "แท็ก",
     "Maps" : "แผนที่",
-    "Settings" : "การตั้งค่า",
     "Edit" : "แก้ไข",
     "Cancel" : "ยกเลิก",
     "Delete" : "ลบ",
diff --git a/l10n/th.json b/l10n/th.json
index 72b630831..b336c076a 100644
--- a/l10n/th.json
+++ b/l10n/th.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "การตั้งค่า",
     "Folders" : "แฟ้มเอกสาร",
     "Favorites" : "รายการโปรด",
     "Videos" : "วิดีโอ",
     "Archive" : "เก็บถาวร",
     "Tags" : "แท็ก",
     "Maps" : "แผนที่",
-    "Settings" : "การตั้งค่า",
     "Edit" : "แก้ไข",
     "Cancel" : "ยกเลิก",
     "Delete" : "ลบ",
diff --git a/l10n/tk.js b/l10n/tk.js
index ee5fe6a02..49fdf11cf 100644
--- a/l10n/tk.js
+++ b/l10n/tk.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Sazlamalar",
     "Favorites" : "Halanýanlar",
     "Videos" : "Wideo",
     "Tags" : "Bellikler",
-    "Settings" : "Sazlamalar",
     "Edit" : "Redaktirläň",
     "Cancel" : "ýatyrmak",
     "Delete" : "Pozmak",
diff --git a/l10n/tk.json b/l10n/tk.json
index 19ce6b020..6129807de 100644
--- a/l10n/tk.json
+++ b/l10n/tk.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Settings" : "Sazlamalar",
     "Favorites" : "Halanýanlar",
     "Videos" : "Wideo",
     "Tags" : "Bellikler",
-    "Settings" : "Sazlamalar",
     "Edit" : "Redaktirläň",
     "Cancel" : "ýatyrmak",
     "Delete" : "Pozmak",
diff --git a/l10n/tr.js b/l10n/tr.js
index edf7be50c..b14fe8cc1 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Anılar",
     "Yet another photo management app" : "Başka bir fotoğraf yönetimi uygulaması daha",
+    "Settings" : "Ayarlar",
     "Timeline" : "Zaman tüneli",
     "Folders" : "Klasörler",
     "Favorites" : "Sık kullanılanlar",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "Bugün",
     "Tags" : "Etiketler",
     "Maps" : "Haritalar",
-    "Settings" : "Ayarlar",
     "A better photos experience awaits you" : "Daha iyi bir fotoğraf deneyimi sizi bekliyor",
     "Choose the root folder of your timeline to begin" : "Zaman tünelinizin başlangıç kök klasörünü seçin",
     "If you just installed Memories, run:" : "Anılar uygulamasını yeni kurduysanız şunu çalıştırın:",
diff --git a/l10n/tr.json b/l10n/tr.json
index cb49553cf..496d462f9 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Anılar",
     "Yet another photo management app" : "Başka bir fotoğraf yönetimi uygulaması daha",
+    "Settings" : "Ayarlar",
     "Timeline" : "Zaman tüneli",
     "Folders" : "Klasörler",
     "Favorites" : "Sık kullanılanlar",
@@ -11,7 +12,6 @@
     "On this day" : "Bugün",
     "Tags" : "Etiketler",
     "Maps" : "Haritalar",
-    "Settings" : "Ayarlar",
     "A better photos experience awaits you" : "Daha iyi bir fotoğraf deneyimi sizi bekliyor",
     "Choose the root folder of your timeline to begin" : "Zaman tünelinizin başlangıç kök klasörünü seçin",
     "If you just installed Memories, run:" : "Anılar uygulamasını yeni kurduysanız şunu çalıştırın:",
diff --git a/l10n/ug.js b/l10n/ug.js
index c8d866586..308dfdbcc 100644
--- a/l10n/ug.js
+++ b/l10n/ug.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "تەڭشەكلەر",
     "Favorites" : "يىغقۇچ",
     "Tags" : "بەلگەلەر",
-    "Settings" : "تەڭشەكلەر",
     "Edit" : "تەھرىر",
     "Cancel" : "ۋاز كەچ",
     "Delete" : "ئۆچۈر",
diff --git a/l10n/ug.json b/l10n/ug.json
index f419e75bf..43c4c0f05 100644
--- a/l10n/ug.json
+++ b/l10n/ug.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Settings" : "تەڭشەكلەر",
     "Favorites" : "يىغقۇچ",
     "Tags" : "بەلگەلەر",
-    "Settings" : "تەڭشەكلەر",
     "Edit" : "تەھرىر",
     "Cancel" : "ۋاز كەچ",
     "Delete" : "ئۆچۈر",
diff --git a/l10n/uk.js b/l10n/uk.js
index 77474d089..e83c0e778 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Спогади",
     "Yet another photo management app" : "Іще один застосунок для роботи зі світлинами",
+    "Settings" : "Налаштування",
     "Timeline" : "Дії",
     "Folders" : "Каталоги",
     "Favorites" : "Із зірочкою",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "On this day" : "Цього дня",
     "Tags" : "Мітки",
     "Maps" : "Мапи",
-    "Settings" : "Налаштування",
     "A better photos experience awaits you" : "На вас чекає краща якість фотографій",
     "Choose the root folder of your timeline to begin" : "Виберіть кореневу папку вашої шкали часу для початку ",
     "Error saving image" : "Помилка збереження зображення",
diff --git a/l10n/uk.json b/l10n/uk.json
index 62ddfd8a7..64c2a1754 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Спогади",
     "Yet another photo management app" : "Іще один застосунок для роботи зі світлинами",
+    "Settings" : "Налаштування",
     "Timeline" : "Дії",
     "Folders" : "Каталоги",
     "Favorites" : "Із зірочкою",
@@ -11,7 +12,6 @@
     "On this day" : "Цього дня",
     "Tags" : "Мітки",
     "Maps" : "Мапи",
-    "Settings" : "Налаштування",
     "A better photos experience awaits you" : "На вас чекає краща якість фотографій",
     "Choose the root folder of your timeline to begin" : "Виберіть кореневу папку вашої шкали часу для початку ",
     "Error saving image" : "Помилка збереження зображення",
diff --git a/l10n/ur_PK.js b/l10n/ur_PK.js
index 43a3cd9e0..dc549f79a 100644
--- a/l10n/ur_PK.js
+++ b/l10n/ur_PK.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "memories",
     {
-    "Favorites" : "Favorites",
     "Settings" : "سیٹینگز",
+    "Favorites" : "Favorites",
     "Edit" : "تدوین کریں",
     "Cancel" : "منسوخ کریں",
     "Delete" : "حذف کریں",
diff --git a/l10n/ur_PK.json b/l10n/ur_PK.json
index a195c24b7..98578560e 100644
--- a/l10n/ur_PK.json
+++ b/l10n/ur_PK.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Favorites" : "Favorites",
     "Settings" : "سیٹینگز",
+    "Favorites" : "Favorites",
     "Edit" : "تدوین کریں",
     "Cancel" : "منسوخ کریں",
     "Delete" : "حذف کریں",
diff --git a/l10n/uz.js b/l10n/uz.js
index 746e6572c..d4ef44d2a 100644
--- a/l10n/uz.js
+++ b/l10n/uz.js
@@ -1,11 +1,11 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Sozlamalar",
     "Favorites" : "Favorites",
     "Videos" : "Videos",
     "Tags" : "Tags",
     "Maps" : "Maps",
-    "Settings" : "Sozlamalar",
     "Cancel" : "Cancel",
     "Delete" : "Delete",
     "Download" : "Download",
diff --git a/l10n/uz.json b/l10n/uz.json
index 37afbb162..f0ec91810 100644
--- a/l10n/uz.json
+++ b/l10n/uz.json
@@ -1,9 +1,9 @@
 { "translations": {
+    "Settings" : "Sozlamalar",
     "Favorites" : "Favorites",
     "Videos" : "Videos",
     "Tags" : "Tags",
     "Maps" : "Maps",
-    "Settings" : "Sozlamalar",
     "Cancel" : "Cancel",
     "Delete" : "Delete",
     "Download" : "Download",
diff --git a/l10n/vi.js b/l10n/vi.js
index 86da8b547..718999266 100644
--- a/l10n/vi.js
+++ b/l10n/vi.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Cài đặt",
     "Folders" : "Thư mục",
     "Favorites" : "Ưa thích",
     "Videos" : "Phim",
     "Archive" : "Lưu trữ",
     "Tags" : "Nhãn",
     "Maps" : "Bản đồ",
-    "Settings" : "Cài đặt",
     "Unsaved changes" : "Thay đổi chưa được lưu",
     "Edit" : "Chỉnh sửa",
     "Loading …" : "Đang tải …",
diff --git a/l10n/vi.json b/l10n/vi.json
index 4fa4a2234..c15003c52 100644
--- a/l10n/vi.json
+++ b/l10n/vi.json
@@ -1,11 +1,11 @@
 { "translations": {
+    "Settings" : "Cài đặt",
     "Folders" : "Thư mục",
     "Favorites" : "Ưa thích",
     "Videos" : "Phim",
     "Archive" : "Lưu trữ",
     "Tags" : "Nhãn",
     "Maps" : "Bản đồ",
-    "Settings" : "Cài đặt",
     "Unsaved changes" : "Thay đổi chưa được lưu",
     "Edit" : "Chỉnh sửa",
     "Loading …" : "Đang tải …",
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 9a1cf35cb..9fbf27f2f 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "设置",
     "Timeline" : "时间线",
     "Folders" : "文件夹",
     "Favorites" : "收藏",
@@ -11,7 +12,6 @@ OC.L10N.register(
     "On this day" : "当年今日",
     "Tags" : "标签",
     "Maps" : "地图",
-    "Settings" : "设置",
     "Unsaved changes" : "未保存的更改",
     "Edit" : "编辑",
     "Loading …" : "正在加载 …",
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 0b4713ef0..a24b060d0 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Settings" : "设置",
     "Timeline" : "时间线",
     "Folders" : "文件夹",
     "Favorites" : "收藏",
@@ -9,7 +10,6 @@
     "On this day" : "当年今日",
     "Tags" : "标签",
     "Maps" : "地图",
-    "Settings" : "设置",
     "Unsaved changes" : "未保存的更改",
     "Edit" : "编辑",
     "Loading …" : "正在加载 …",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 959372c5a..4c562e6dc 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Memories" : "回憶",
     "Yet another photo management app" : "又一個照片管理應用程式",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Memories\n\nMemories 是一個有進階功能的相片管理 Nextcloud 應用程式，包含了以下功能：\n\n- **📸 時間軸**：從 Exif 資料中按拍攝日期對照片與影片進行排序。\n- **⏪ 倒帶**：立刻跳回過去的任何時間，重溫您的回憶。\n- **🤖 AI 標記**：使用 [recognize](https://github.com/nextcloud/recognize) 應用程式提供的 AI 功能按人物與物體對照片進行分組。\n- **🖼️ 相簿**：建立相簿以將照片與影片分組。然後將這些相簿與其他人分享。\n- **🫱🏻‍🫲🏻 外部分享**：與您 Nextcloud 站台以外的人們分享照片與影片。\n- **📱 行動裝置支援**：透過網路應用程式在任何形狀與大小的裝置上運作。\n- **✏️ 編輯詮釋資料**：快速輕鬆地編輯照片上的 Exif 日期。\n- **📦 封存**：將您不想在時間軸中看到的照片儲存在單獨的資料夾中。\n- **📹 視頻轉碼**：Memories 對視頻進行轉碼並使用 HLS 以獲得最佳性能。\n- **⚡️ 效能**：本應用程式超快。\n\n## 🌐 線上展示\n\n- 想看看本應用程式的外觀與感覺，請見[公開展示](https://memories-demo.radialapps.com/apps/memories/).\n- 展示站是唯讀的，可能會有點慢（來自 [Oracle Cloud](https://www.oracle.com/cloud/free/) 的免費層級虛擬機器）。\n- 照片則歸功於 [Unsplash](https://unsplash.com/)（若要檢視單獨的署名，請參見每個資料夾中的資訊）。\n\n\n## 🚀 安裝\n1. 從 Nextcloud 應用程式商店安裝應用程式\n1. 執行建議的[設定步驟](https://github.com/pulsejet/memories/wiki/Extra-Configuration)。\n1. 執行 `php ./occ memories:index` 以產生既有照片的詮釋資料索引。\n1. 在 Nextcloud 開啟 📷 回憶應用程式並設定包含您照片的目錄。",
+    "Settings" : "設定",
     "Timeline" : "時間線",
     "Folders" : "資料夾",
     "Favorites" : "最愛",
@@ -13,7 +15,6 @@ OC.L10N.register(
     "On this day" : "當年今日",
     "Tags" : "標籤",
     "Maps" : "地圖",
-    "Settings" : "設定",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "更好的照片體驗正等著您",
     "Choose the root folder of your timeline to begin" : "選擇您時間軸的根資料夾以開始",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index b6111dc25..69b8d8547 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Memories" : "回憶",
     "Yet another photo management app" : "又一個照片管理應用程式",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Memories\n\nMemories 是一個有進階功能的相片管理 Nextcloud 應用程式，包含了以下功能：\n\n- **📸 時間軸**：從 Exif 資料中按拍攝日期對照片與影片進行排序。\n- **⏪ 倒帶**：立刻跳回過去的任何時間，重溫您的回憶。\n- **🤖 AI 標記**：使用 [recognize](https://github.com/nextcloud/recognize) 應用程式提供的 AI 功能按人物與物體對照片進行分組。\n- **🖼️ 相簿**：建立相簿以將照片與影片分組。然後將這些相簿與其他人分享。\n- **🫱🏻‍🫲🏻 外部分享**：與您 Nextcloud 站台以外的人們分享照片與影片。\n- **📱 行動裝置支援**：透過網路應用程式在任何形狀與大小的裝置上運作。\n- **✏️ 編輯詮釋資料**：快速輕鬆地編輯照片上的 Exif 日期。\n- **📦 封存**：將您不想在時間軸中看到的照片儲存在單獨的資料夾中。\n- **📹 視頻轉碼**：Memories 對視頻進行轉碼並使用 HLS 以獲得最佳性能。\n- **⚡️ 效能**：本應用程式超快。\n\n## 🌐 線上展示\n\n- 想看看本應用程式的外觀與感覺，請見[公開展示](https://memories-demo.radialapps.com/apps/memories/).\n- 展示站是唯讀的，可能會有點慢（來自 [Oracle Cloud](https://www.oracle.com/cloud/free/) 的免費層級虛擬機器）。\n- 照片則歸功於 [Unsplash](https://unsplash.com/)（若要檢視單獨的署名，請參見每個資料夾中的資訊）。\n\n\n## 🚀 安裝\n1. 從 Nextcloud 應用程式商店安裝應用程式\n1. 執行建議的[設定步驟](https://github.com/pulsejet/memories/wiki/Extra-Configuration)。\n1. 執行 `php ./occ memories:index` 以產生既有照片的詮釋資料索引。\n1. 在 Nextcloud 開啟 📷 回憶應用程式並設定包含您照片的目錄。",
+    "Settings" : "設定",
     "Timeline" : "時間線",
     "Folders" : "資料夾",
     "Favorites" : "最愛",
@@ -11,7 +13,6 @@
     "On this day" : "當年今日",
     "Tags" : "標籤",
     "Maps" : "地圖",
-    "Settings" : "設定",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "更好的照片體驗正等著您",
     "Choose the root folder of your timeline to begin" : "選擇您時間軸的根資料夾以開始",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 86a74a52a..e7c859073 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Memories" : "回憶",
     "Yet another photo management app" : "又一個照片管理應用程式",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# 回憶\n\n回憶是一個有進階功能的 *超強* Nextcloud 相片管理解決方案，包含了以下功能：\n\n- **📸 時間軸**：從 Exif 資料中按拍攝日期對照片與影片進行排序。\n- **⏪ 倒帶**：立刻跳回過去的任何時間，重溫您的回憶。\n- **🤖 AI 標記**：使用 [recognize](https://github.com/nextcloud/recognize) 應用程式提供的 AI 功能按人物與物體對照片進行分組。\n- **🖼️ 相簿**：建立相簿以將照片與影片分組。然後將這些相簿與其他人分享。\n- **🫱🏻‍🫲🏻 外部分享**：與您 Nextcloud 站台以外的人們分享照片與影片。\n- **📱 行動裝置支援**：透過網路應用程式在任何形狀與大小的裝置上運作。\n- **✏️ 編輯詮釋資料**：快速輕鬆地編輯照片上的 Exif 日期。\n- **📦 封存**：將您不想在時間軸中看到的照片儲存在單獨的資料夾中。\n- **📹 視訊轉換編碼**：回憶可以轉換視訊編碼並使用 HLS 來取得最大效能。\n- **⚡️ 效能**：本應用程式超快。\n\n## 🌐 線上展示\n\n- 想看看本應用程式的外觀與感覺，請見[公開展示](https://memories-demo.radialapps.com/apps/memories/).\n- 展示站是唯讀的，可能會有點慢（來自 [Oracle Cloud](https://www.oracle.com/cloud/free/) 的免費層級虛擬機器）。\n- 照片則歸功於 [Unsplash](https://unsplash.com/)（若要檢視單獨的署名，請參見每個資料夾中的資訊）。\n\n\n## 🚀 安裝\n1. 從 Nextcloud 應用程式商店安裝應用程式\n1. 執行建議的[設定步驟](https://github.com/pulsejet/memories/wiki/Extra-Configuration)。\n1. 執行 `php ./occ memories:index` 以產生既有照片的詮釋資料索引。\n1. 在 Nextcloud 開啟 📷 回憶應用程式並設定包含您照片的目錄。",
+    "Settings" : "設定",
     "Timeline" : "時間軸",
     "Folders" : "資料夾",
     "Favorites" : "最愛",
@@ -13,7 +15,6 @@ OC.L10N.register(
     "On this day" : "在這天",
     "Tags" : "標籤",
     "Maps" : "地圖",
-    "Settings" : "設定",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "更好的照片體驗正等著您",
     "Choose the root folder of your timeline to begin" : "選擇您時間軸的根資料夾以開始",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index af1047a6b..19c782978 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Memories" : "回憶",
     "Yet another photo management app" : "又一個照片管理應用程式",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# 回憶\n\n回憶是一個有進階功能的 *超強* Nextcloud 相片管理解決方案，包含了以下功能：\n\n- **📸 時間軸**：從 Exif 資料中按拍攝日期對照片與影片進行排序。\n- **⏪ 倒帶**：立刻跳回過去的任何時間，重溫您的回憶。\n- **🤖 AI 標記**：使用 [recognize](https://github.com/nextcloud/recognize) 應用程式提供的 AI 功能按人物與物體對照片進行分組。\n- **🖼️ 相簿**：建立相簿以將照片與影片分組。然後將這些相簿與其他人分享。\n- **🫱🏻‍🫲🏻 外部分享**：與您 Nextcloud 站台以外的人們分享照片與影片。\n- **📱 行動裝置支援**：透過網路應用程式在任何形狀與大小的裝置上運作。\n- **✏️ 編輯詮釋資料**：快速輕鬆地編輯照片上的 Exif 日期。\n- **📦 封存**：將您不想在時間軸中看到的照片儲存在單獨的資料夾中。\n- **📹 視訊轉換編碼**：回憶可以轉換視訊編碼並使用 HLS 來取得最大效能。\n- **⚡️ 效能**：本應用程式超快。\n\n## 🌐 線上展示\n\n- 想看看本應用程式的外觀與感覺，請見[公開展示](https://memories-demo.radialapps.com/apps/memories/).\n- 展示站是唯讀的，可能會有點慢（來自 [Oracle Cloud](https://www.oracle.com/cloud/free/) 的免費層級虛擬機器）。\n- 照片則歸功於 [Unsplash](https://unsplash.com/)（若要檢視單獨的署名，請參見每個資料夾中的資訊）。\n\n\n## 🚀 安裝\n1. 從 Nextcloud 應用程式商店安裝應用程式\n1. 執行建議的[設定步驟](https://github.com/pulsejet/memories/wiki/Extra-Configuration)。\n1. 執行 `php ./occ memories:index` 以產生既有照片的詮釋資料索引。\n1. 在 Nextcloud 開啟 📷 回憶應用程式並設定包含您照片的目錄。",
+    "Settings" : "設定",
     "Timeline" : "時間軸",
     "Folders" : "資料夾",
     "Favorites" : "最愛",
@@ -11,7 +13,6 @@
     "On this day" : "在這天",
     "Tags" : "標籤",
     "Maps" : "地圖",
-    "Settings" : "設定",
     "EXIF" : "EXIF",
     "A better photos experience awaits you" : "更好的照片體驗正等著您",
     "Choose the root folder of your timeline to begin" : "選擇您時間軸的根資料夾以開始",

From 391772aa39d8b56bf82a1ddf87fbce1d0fe86da3 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 19:53:33 -0800
Subject: [PATCH 077/163] Add forward shift-select (#28)

---
 src/components/SelectionManager.vue | 72 ++++++++++++++++++++++++++++-
 src/components/Timeline.vue         | 22 +++++----
 2 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
index 532c5a885..684a3347f 100644
--- a/src/components/SelectionManager.vue
+++ b/src/components/SelectionManager.vue
@@ -52,10 +52,16 @@ import GlobalMixin from "../mixins/GlobalMixin";
 import UserConfig from "../mixins/UserConfig";
 
 import { showError } from "@nextcloud/dialogs";
-import { generateUrl } from "@nextcloud/router";
 import { NcActions, NcActionButton } from "@nextcloud/vue";
 import { translate as t, translatePlural as n } from "@nextcloud/l10n";
-import { IDay, IHeadRow, IPhoto, ISelectionAction } from "../types";
+import {
+  IDay,
+  IHeadRow,
+  IPhoto,
+  IRow,
+  IRowType,
+  ISelectionAction,
+} from "../types";
 import { getCurrentUser } from "@nextcloud/auth";
 
 import * as dav from "../services/DavRequests";
@@ -91,6 +97,9 @@ type Selection = Map<number, IPhoto>;
 export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   @Prop() public heads: { [dayid: number]: IHeadRow };
 
+  /** Rows are in ascending order (desc is normal) */
+  @Prop() public isreverse: boolean;
+
   private show = false;
   private size = 0;
   private readonly selection!: Selection;
@@ -328,6 +337,65 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     }
   }
 
+  /** Multi-select */
+  public selectMulti(photo: IPhoto, rows: IRow[], rowIdx: number) {
+    console.log("selectMulti", photo, rows, rowIdx);
+    const pRow = rows[rowIdx];
+    const pIdx = pRow.photos.indexOf(photo);
+    if (pIdx === -1) return;
+
+    const updateDaySet = new Set<number>();
+    let behind = [];
+    let behindFound = false;
+
+    // Look behind
+    for (let i = rowIdx; i > rowIdx - 100; i--) {
+      if (i < 0) break;
+      if (rows[i].type !== IRowType.PHOTOS) continue;
+      if (!rows[i].photos?.length) break;
+
+      const sj = i === rowIdx ? pIdx : rows[i].photos.length - 1;
+      for (let j = sj; j >= 0; j--) {
+        const p = rows[i].photos[j];
+        if (p.flag & this.c.FLAG_PLACEHOLDER || !p.fileid) continue;
+        if (p.flag & this.c.FLAG_SELECTED) {
+          behindFound = true;
+          break;
+        }
+        behind.push(p);
+        updateDaySet.add(p.d.dayid);
+      }
+
+      if (behindFound) break;
+    }
+
+    // Select everything behind
+    if (behindFound) {
+      // Clear everything in front in this day
+      const pdIdx = photo.d.detail.indexOf(photo);
+      for (let i = pdIdx + 1; i < photo.d.detail.length; i++) {
+        const p = photo.d.detail[i];
+        if (p.flag & this.c.FLAG_SELECTED) this.selectPhoto(p, false, true);
+      }
+
+      // Clear everything else in front
+      Array.from(this.selection.values())
+        .filter((p) => {
+          return this.isreverse
+            ? p.d.dayid > photo.d.dayid
+            : p.d.dayid < photo.d.dayid;
+        })
+        .forEach((photo: IPhoto) => {
+          this.selectPhoto(photo, false, true);
+          updateDaySet.add(photo.d.dayid);
+        });
+
+      behind.forEach((p) => this.selectPhoto(p, true, true));
+      updateDaySet.forEach((d) => this.updateHeadSelected(this.heads[d]));
+      this.$forceUpdate();
+    }
+  }
+
   /** Select or deselect all photos in a head */
   public selectHead(head: IHeadRow) {
     head.selected = !head.selected;
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index e19bbc573..6e4323bc9 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -52,7 +52,7 @@
         </div>
       </template>
 
-      <template v-slot="{ item }">
+      <template v-slot="{ item, index }">
         <div
           v-if="item.type === 0"
           class="head-row"
@@ -98,7 +98,7 @@
               :day="item.day"
               :key="photo.fileid"
               @select="selectionManager.selectPhoto"
-              @click="clickPhoto(photo)"
+              @click="clickPhoto(photo, $event, index)"
             />
           </div>
         </template>
@@ -117,6 +117,7 @@
     <SelectionManager
       ref="selectionManager"
       :heads="heads"
+      :isreverse="isMonthView"
       @refresh="softRefresh"
       @delete="deleteFromViewWithAnimation"
       @updateLoading="updateLoading"
@@ -312,7 +313,7 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
     return window.innerWidth <= 600;
   }
 
-  isMonthView() {
+  get isMonthView() {
     return this.$route.name === "albums";
   }
 
@@ -595,7 +596,7 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
     }
 
     // Month view
-    if (this.isMonthView()) {
+    if (this.isMonthView) {
       query.set("monthView", "1");
       query.set("reverse", "1");
     }
@@ -649,7 +650,7 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
     // because this call is terribly slow even on desktop
     const dateTaken = utils.dayIdToDate(head.dayId);
     let name: string;
-    if (this.isMonthView()) {
+    if (this.isMonthView) {
       name = utils.getMonthDateStr(dateTaken);
     } else {
       name = utils.getLongDateStr(dateTaken, true);
@@ -855,7 +856,7 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
     this.fetchDayQueue.push(dayId);
 
     // Only single queries allowed for month vie
-    if (now || this.isMonthView()) {
+    if (now || this.isMonthView) {
       return this.fetchDayExpire();
     }
 
@@ -1193,12 +1194,15 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
   }
 
   /** Clicking on photo */
-  clickPhoto(photo: IPhoto) {
+  clickPhoto(photo: IPhoto, event: any, rowIdx: number) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
 
     if (this.selectionManager.has()) {
-      // selection mode
-      this.selectionManager.selectPhoto(photo);
+      if (event.shiftKey) {
+        this.selectionManager.selectMulti(photo, this.list, rowIdx);
+      } else {
+        this.selectionManager.selectPhoto(photo);
+      }
     } else {
       this.$router.push({
         ...this.$route,

From 60501b5d58979dd7077f764e2468f940df8a9cf3 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 19:57:23 -0800
Subject: [PATCH 078/163] folder: make name smaller on mobile

---
 src/components/frame/Folder.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/frame/Folder.vue b/src/components/frame/Folder.vue
index 47a827634..2d49e2919 100644
--- a/src/components/frame/Folder.vue
+++ b/src/components/frame/Folder.vue
@@ -135,6 +135,10 @@ export default class Folder extends Mixins(GlobalMixin, UserConfig) {
     line-height: 1em;
     position: absolute;
     top: 65%;
+
+    @media (max-width: 768px) {
+      font-size: 0.95em;
+    }
   }
 
   // Make it white if there is a preview

From 604b5e54b7002cbaa5b2358e782275b6e0425f92 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Fri, 11 Nov 2022 22:28:58 -0800
Subject: [PATCH 079/163] Implement drag selection (#28)

---
 src/components/SelectionManager.vue | 321 +++++++++++++++++++++-------
 src/components/Timeline.vue         |  26 +--
 src/components/frame/Photo.vue      |  19 +-
 3 files changed, 256 insertions(+), 110 deletions(-)

diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
index 684a3347f..474ed6d2a 100644
--- a/src/components/SelectionManager.vue
+++ b/src/components/SelectionManager.vue
@@ -65,6 +65,8 @@ import {
 import { getCurrentUser } from "@nextcloud/auth";
 
 import * as dav from "../services/DavRequests";
+import * as utils from "../services/Utils";
+
 import EditDate from "./modal/EditDate.vue";
 import FaceMoveModal from "./modal/FaceMoveModal.vue";
 import AddToAlbumModal from "./modal/AddToAlbumModal.vue";
@@ -97,6 +99,9 @@ type Selection = Map<number, IPhoto>;
 export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   @Prop() public heads: { [dayid: number]: IHeadRow };
 
+  /** List of rows for multi selection */
+  @Prop() public rows: IRow[];
+
   /** Rows are in ascending order (desc is normal) */
   @Prop() public isreverse: boolean;
 
@@ -105,6 +110,11 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   private readonly selection!: Selection;
   private readonly defaultActions: ISelectionAction[];
 
+  private touchAnchor: IPhoto = null;
+  private touchTimer: number = 0;
+  private touchPrevSel!: Selection;
+  private prevOver!: IPhoto;
+
   @Emit("refresh")
   refresh() {}
 
@@ -197,6 +207,26 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     };
   }
 
+  /** Archive is not allowed only on folder routes */
+  private allowArchive() {
+    return this.$route.name !== "folders";
+  }
+
+  /** Is archive route */
+  private routeIsArchive() {
+    return this.$route.name === "archive";
+  }
+
+  /** Is album route */
+  private routeIsAlbum() {
+    return this.config_albumsEnabled && this.$route.name === "albums";
+  }
+
+  /** Public route that can't modify anything */
+  private routeIsPublic() {
+    return this.$route.name === "folder-share";
+  }
+
   @Watch("show")
   onShowChange() {
     const klass = "has-top-bar";
@@ -207,6 +237,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     }
   }
 
+  /** Trigger to update props from selection set */
   private selectionChanged() {
     this.show = this.selection.size > 0;
     this.size = this.selection.size;
@@ -220,37 +251,11 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     return this.selection.has(fileid);
   }
 
-  /** Restore selections from new day object */
-  public restoreDay(day: IDay) {
-    if (!this.has()) {
-      return;
-    }
-
-    // FileID => Photo for new day
-    const dayMap = new Map<number, IPhoto>();
-    day.detail.forEach((photo) => {
-      dayMap.set(photo.fileid, photo);
-    });
-
-    this.selection.forEach((photo, fileid) => {
-      // Process this day only
-      if (photo.dayid !== day.dayid) {
-        return;
-      }
-
-      // Remove all selections that are not in the new day
-      if (!dayMap.has(fileid)) {
-        this.selection.delete(fileid);
-        return;
-      }
-
-      // Update the photo object
-      const newPhoto = dayMap.get(fileid);
-      this.selection.set(fileid, newPhoto);
-      newPhoto.flag |= this.c.FLAG_SELECTED;
-    });
-
-    this.selectionChanged();
+  /** Get the actions list */
+  private getActions(): ISelectionAction[] {
+    return this.defaultActions.filter(
+      (a) => (!a.if || a.if(this)) && (!this.routeIsPublic() || a.allowPublic)
+    );
   }
 
   /** Click on an action */
@@ -265,43 +270,145 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     }
   }
 
-  /** Get the actions list */
-  private getActions(): ISelectionAction[] {
-    return this.defaultActions.filter(
-      (a) => (!a.if || a.if(this)) && (!this.routeIsPublic() || a.allowPublic)
-    );
+  /** Clicking on photo */
+  public clickPhoto(photo: IPhoto, event: any, rowIdx: number) {
+    if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
+
+    if (this.has()) {
+      if (event.shiftKey) {
+        this.selectMulti(photo, this.rows, rowIdx);
+      } else {
+        this.selectPhoto(photo);
+      }
+    } else {
+      this.openViewer(photo);
+    }
   }
 
-  /** Clear all selected photos */
-  public clearSelection(only?: IPhoto[]) {
-    const heads = new Set<IHeadRow>();
-    const toClear = only || this.selection.values();
-    Array.from(toClear).forEach((photo: IPhoto) => {
-      photo.flag &= ~this.c.FLAG_SELECTED;
-      heads.add(this.heads[photo.d.dayid]);
-      this.selection.delete(photo.fileid);
-      this.selectionChanged();
-    });
-    heads.forEach(this.updateHeadSelected);
-    this.$forceUpdate();
+  /** Tap on */
+  public touchstartPhoto(photo: IPhoto, event: any, rowIdx: number) {
+    if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
+
+    this.touchAnchor = photo;
+    this.prevOver = photo;
+    this.touchPrevSel = new Map(this.selection);
+    this.touchTimer = window.setTimeout(() => {
+      if (this.touchAnchor === photo) {
+        this.selectPhoto(photo, true);
+      }
+      this.touchTimer = 0;
+    }, 600);
   }
 
-  /** Check if the day for a photo is selected entirely */
-  private updateHeadSelected(head: IHeadRow) {
-    let selected = true;
+  /** Tap off */
+  public touchendPhoto(photo: IPhoto, event: any, rowIdx: number) {
+    if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
+    window.clearTimeout(this.touchTimer);
+    this.touchTimer = 0;
+    this.touchAnchor = null;
+    this.prevOver = undefined;
+  }
 
-    // Check if all photos are selected
-    for (const row of head.day.rows) {
-      for (const photo of row.photos) {
-        if (!(photo.flag & this.c.FLAG_SELECTED)) {
-          selected = false;
-          break;
+  /**
+   * Tap over
+   * photo and rowIdx are that of the *anchor*
+   */
+  public touchmovePhoto(anchor: IPhoto, event: any, rowIdx: number) {
+    if (anchor.flag & this.c.FLAG_PLACEHOLDER) return;
+
+    if (this.touchTimer) {
+      // Touch is not held, just cancel
+      window.clearTimeout(this.touchTimer);
+      this.touchTimer = 0;
+      this.touchAnchor = null;
+      return;
+    } else if (!this.touchAnchor) {
+      // Touch was previously cancelled
+      return;
+    }
+
+    // Prevent scrolling
+    event.preventDefault();
+
+    // Use first touch -- can't do much better yet
+    const touch: Touch = event.touches[0];
+    if (!touch) return;
+
+    // Which photo is the cursor over, if any
+    const elems = document.elementsFromPoint(touch.clientX, touch.clientY);
+    const photoComp: any = elems.find((e) => e.classList.contains("p-outer"));
+    let overPhoto: IPhoto = photoComp?.__vue__?.data;
+    if (overPhoto && overPhoto.flag & this.c.FLAG_PLACEHOLDER) overPhoto = null;
+
+    // Do multi-selection "till" overPhoto "from" anchor
+    // This logic is completely different from the desktop because of the
+    // existence of a definitive "anchor" element. We just need to find
+    // rverything between the anchor and the current photo
+    if (overPhoto && this.prevOver !== overPhoto) {
+      this.prevOver = overPhoto;
+
+      // days reverse XOR rows reverse
+      let reverse: boolean;
+      if (overPhoto.dayid === this.touchAnchor.dayid) {
+        const l = overPhoto.d.detail;
+        const ai = l.indexOf(this.touchAnchor);
+        const oi = l.indexOf(overPhoto);
+        if (ai === -1 || oi === -1) return; // Shouldn't happen
+        reverse = ai > oi;
+      } else {
+        reverse = overPhoto.dayid > this.touchAnchor.dayid != this.isreverse;
+      }
+
+      const newSelection = new Map(this.touchPrevSel);
+      const updatedDays = new Set<number>();
+
+      // Walk over rows
+      let i = rowIdx;
+      let j = this.rows[i].photos.indexOf(this.touchAnchor);
+      while (true) {
+        let p = this.rows[i]?.photos?.[j];
+        if (!p) break; // shouldn't happen, ever
+
+        j += reverse ? -1 : 1;
+        if (j < 0) {
+          while (!this.rows[--i].photos);
+          j = this.rows[i].photos.length - 1;
+        } else if (j >= this.rows[i].photos.length) {
+          while (!this.rows[++i].photos);
+          j = 0;
         }
+
+        // This is there now
+        newSelection.set(p.fileid, p);
+
+        // Perf: only update heads if not selected
+        if (!(p.flag & this.c.FLAG_SELECTED)) {
+          this.selectPhoto(p, true, true);
+          updatedDays.add(p.dayid);
+        }
+
+        // We're trying to update too much -- something went wrong
+        if (newSelection.size - this.selection.size > 50) break;
+
+        // Check goal
+        if (p === overPhoto) break;
       }
-    }
 
-    // Update head
-    head.selected = selected;
+      // Remove unselected
+      for (const [fileid, p] of this.selection) {
+        if (!newSelection.has(fileid)) {
+          this.selectPhoto(p, false, true);
+          updatedDays.add(p.dayid);
+        }
+      }
+
+      // Update heads
+      for (const dayid of updatedDays) {
+        this.updateHeadSelected(this.heads[dayid]);
+      }
+
+      this.$forceUpdate();
+    }
   }
 
   /** Add a photo to selection list */
@@ -339,7 +446,6 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
 
   /** Multi-select */
   public selectMulti(photo: IPhoto, rows: IRow[], rowIdx: number) {
-    console.log("selectMulti", photo, rows, rowIdx);
     const pRow = rows[rowIdx];
     const pIdx = pRow.photos.indexOf(photo);
     if (pIdx === -1) return;
@@ -407,6 +513,71 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     this.$forceUpdate();
   }
 
+  /** Check if the day for a photo is selected entirely */
+  private updateHeadSelected(head: IHeadRow) {
+    let selected = true;
+
+    // Check if all photos are selected
+    for (const row of head.day.rows) {
+      for (const photo of row.photos) {
+        if (!(photo.flag & this.c.FLAG_SELECTED)) {
+          selected = false;
+          break;
+        }
+      }
+    }
+
+    // Update head
+    head.selected = selected;
+  }
+
+  /** Clear all selected photos */
+  public clearSelection(only?: IPhoto[]) {
+    const heads = new Set<IHeadRow>();
+    const toClear = only || this.selection.values();
+    Array.from(toClear).forEach((photo: IPhoto) => {
+      photo.flag &= ~this.c.FLAG_SELECTED;
+      heads.add(this.heads[photo.d.dayid]);
+      this.selection.delete(photo.fileid);
+      this.selectionChanged();
+    });
+    heads.forEach(this.updateHeadSelected);
+    this.$forceUpdate();
+  }
+
+  /** Restore selections from new day object */
+  public restoreDay(day: IDay) {
+    if (!this.has()) {
+      return;
+    }
+
+    // FileID => Photo for new day
+    const dayMap = new Map<number, IPhoto>();
+    day.detail.forEach((photo) => {
+      dayMap.set(photo.fileid, photo);
+    });
+
+    this.selection.forEach((photo, fileid) => {
+      // Process this day only
+      if (photo.dayid !== day.dayid) {
+        return;
+      }
+
+      // Remove all selections that are not in the new day
+      if (!dayMap.has(fileid)) {
+        this.selection.delete(fileid);
+        return;
+      }
+
+      // Update the photo object
+      const newPhoto = dayMap.get(fileid);
+      this.selection.set(fileid, newPhoto);
+      newPhoto.flag |= this.c.FLAG_SELECTED;
+    });
+
+    this.selectionChanged();
+  }
+
   /**
    * Download the currently selected files
    */
@@ -521,26 +692,6 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     }
   }
 
-  /** Archive is not allowed only on folder routes */
-  private allowArchive() {
-    return this.$route.name !== "folders";
-  }
-
-  /** Is archive route */
-  private routeIsArchive() {
-    return this.$route.name === "archive";
-  }
-
-  /** Is album route */
-  private routeIsAlbum() {
-    return this.config_albumsEnabled && this.$route.name === "albums";
-  }
-
-  /** Public route that can't modify anything */
-  private routeIsPublic() {
-    return this.$route.name === "folder-share";
-  }
-
   /**
    * Move selected photos to album
    */
@@ -623,6 +774,14 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
       this.deletePhotos(delPhotos);
     }
   }
+
+  /** Open viewer with given photo */
+  private openViewer(photo: IPhoto) {
+    this.$router.push({
+      ...this.$route,
+      hash: utils.getViewerHash(photo),
+    });
+  }
 }
 </script>
 
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index 6e4323bc9..fabe4ac56 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -98,7 +98,12 @@
               :day="item.day"
               :key="photo.fileid"
               @select="selectionManager.selectPhoto"
-              @click="clickPhoto(photo, $event, index)"
+              @mousedown="selectionManager.clickPhoto(photo, $event, index)"
+              @touchstart="
+                selectionManager.touchstartPhoto(photo, $event, index)
+              "
+              @touchend="selectionManager.touchendPhoto(photo, $event, index)"
+              @touchmove="selectionManager.touchmovePhoto(photo, $event, index)"
             />
           </div>
         </template>
@@ -117,6 +122,7 @@
     <SelectionManager
       ref="selectionManager"
       :heads="heads"
+      :rows="list"
       :isreverse="isMonthView"
       @refresh="softRefresh"
       @delete="deleteFromViewWithAnimation"
@@ -1193,24 +1199,6 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
     return row;
   }
 
-  /** Clicking on photo */
-  clickPhoto(photo: IPhoto, event: any, rowIdx: number) {
-    if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
-
-    if (this.selectionManager.has()) {
-      if (event.shiftKey) {
-        this.selectionManager.selectMulti(photo, this.list, rowIdx);
-      } else {
-        this.selectionManager.selectPhoto(photo);
-      }
-    } else {
-      this.$router.push({
-        ...this.$route,
-        hash: utils.getViewerHash(photo),
-      });
-    }
-  }
-
   /**
    * Delete elements from main view with some animation
    *
diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
index e819317be..74294acc8 100644
--- a/src/components/frame/Photo.vue
+++ b/src/components/frame/Photo.vue
@@ -28,11 +28,11 @@
     <div
       class="img-outer fill-block"
       @contextmenu="contextmenu"
-      @mousedown.passive="emitClick"
-      @touchstart.passive="touchstart"
-      @touchmove.passive="touchend"
-      @touchend.passive="touchend"
-      @touchcancel.passive="touchend"
+      @mousedown="$emit('mousedown', $event)"
+      @touchstart.passive="$emit('touchstart', $event)"
+      @touchmove="$emit('touchmove', $event)"
+      @touchend.passive="$emit('touchend', $event)"
+      @touchcancel.passive="$emit('touchend', $event)"
     >
       <img
         ref="img"
@@ -78,7 +78,6 @@ export default class Photo extends Mixins(GlobalMixin) {
   @Prop() day: IDay;
 
   @Emit("select") emitSelect(data: IPhoto) {}
-  @Emit("click") emitClick() {}
 
   @Watch("data")
   onDataChange(newData: IPhoto, oldData: IPhoto) {
@@ -210,10 +209,10 @@ export default class Photo extends Mixins(GlobalMixin) {
 
   contextmenu(e: Event) {
     // on mobile only
-    if (this.hasTouch) {
-      e.preventDefault();
-      e.stopPropagation();
-    }
+    // if (this.hasTouch) {
+    e.preventDefault();
+    e.stopPropagation();
+    // }
   }
 
   touchend() {

From e4662d5f41562e3c5bd14ddb9c7ed708c2cb8044 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 00:20:12 -0800
Subject: [PATCH 080/163] Complete drag selection (close #28)

---
 src/components/SelectionManager.vue | 75 +++++++++++++++++++++++++----
 src/components/Timeline.vue         |  1 +
 src/types.ts                        |  3 ++
 3 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
index 474ed6d2a..fd3c4861b 100644
--- a/src/components/SelectionManager.vue
+++ b/src/components/SelectionManager.vue
@@ -105,6 +105,9 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   /** Rows are in ascending order (desc is normal) */
   @Prop() public isreverse: boolean;
 
+  /** Recycler element to scroll during touch multi-select */
+  @Prop() public recycler: any;
+
   private show = false;
   private size = 0;
   private readonly selection!: Selection;
@@ -114,6 +117,9 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   private touchTimer: number = 0;
   private touchPrevSel!: Selection;
   private prevOver!: IPhoto;
+  private touchScrollInterval: number = 0;
+  private touchScrollDelta: number = 0;
+  private prevTouch: Touch = null;
 
   @Emit("refresh")
   refresh() {}
@@ -286,8 +292,11 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   }
 
   /** Tap on */
-  public touchstartPhoto(photo: IPhoto, event: any, rowIdx: number) {
+  protected touchstartPhoto(photo: IPhoto, event: any, rowIdx: number) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
+    this.rows[rowIdx].virtualSticky = true;
+
+    this.resetTouchParams();
 
     this.touchAnchor = photo;
     this.prevOver = photo;
@@ -301,19 +310,29 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   }
 
   /** Tap off */
-  public touchendPhoto(photo: IPhoto, event: any, rowIdx: number) {
+  protected touchendPhoto(photo: IPhoto, event: any, rowIdx: number) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
+    delete this.rows[rowIdx].virtualSticky;
+    this.resetTouchParams();
+  }
+
+  private resetTouchParams() {
     window.clearTimeout(this.touchTimer);
     this.touchTimer = 0;
     this.touchAnchor = null;
     this.prevOver = undefined;
+
+    window.cancelAnimationFrame(this.touchScrollInterval);
+    this.touchScrollInterval = 0;
+
+    this.prevTouch = null;
   }
 
   /**
    * Tap over
    * photo and rowIdx are that of the *anchor*
    */
-  public touchmovePhoto(anchor: IPhoto, event: any, rowIdx: number) {
+  protected touchmovePhoto(anchor: IPhoto, event: any, rowIdx: number) {
     if (anchor.flag & this.c.FLAG_PLACEHOLDER) return;
 
     if (this.touchTimer) {
@@ -330,10 +349,42 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     // Prevent scrolling
     event.preventDefault();
 
-    // Use first touch -- can't do much better yet
+    // Use first touch -- can't do much
     const touch: Touch = event.touches[0];
     if (!touch) return;
+    this.prevTouch = touch;
+
+    // Scroll if at top or bottom
+    const scrollUp = touch.clientY > 50 && touch.clientY < 110; // 50 topbar
+    const scrollDown = touch.clientY > window.innerHeight - 60;
+    if (scrollUp || scrollDown) {
+      if (scrollUp) {
+        this.touchScrollDelta = (-1 * (110 - touch.clientY)) / 3;
+      } else {
+        this.touchScrollDelta = (touch.clientY - window.innerHeight + 60) / 3;
+      }
+
+      if (this.touchAnchor && !this.touchScrollInterval) {
+        const fun = () => {
+          this.recycler.$el.scrollTop += this.touchScrollDelta;
+          this.touchMoveSelect(this.prevTouch, rowIdx);
 
+          if (this.touchScrollInterval) {
+            this.touchScrollInterval = window.requestAnimationFrame(fun);
+          }
+        };
+        this.touchScrollInterval = window.requestAnimationFrame(fun);
+      }
+    } else {
+      window.cancelAnimationFrame(this.touchScrollInterval);
+      this.touchScrollInterval = 0;
+    }
+
+    this.touchMoveSelect(touch, rowIdx);
+  }
+
+  /** Multi-select triggered by touchmove */
+  private touchMoveSelect(touch: Touch, rowIdx: number) {
     // Which photo is the cursor over, if any
     const elems = document.elementsFromPoint(touch.clientX, touch.clientY);
     const photoComp: any = elems.find((e) => e.classList.contains("p-outer"));
@@ -366,18 +417,21 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
       let i = rowIdx;
       let j = this.rows[i].photos.indexOf(this.touchAnchor);
       while (true) {
-        let p = this.rows[i]?.photos?.[j];
-        if (!p) break; // shouldn't happen, ever
-
-        j += reverse ? -1 : 1;
         if (j < 0) {
-          while (!this.rows[--i].photos);
+          while (i > 0 && !this.rows[--i].photos);
+          if (!this.rows[i].photos) break;
           j = this.rows[i].photos.length - 1;
+          continue;
         } else if (j >= this.rows[i].photos.length) {
-          while (!this.rows[++i].photos);
+          while (i < this.rows.length - 1 && !this.rows[++i].photos);
+          if (!this.rows[i].photos) break;
           j = 0;
+          continue;
         }
 
+        let p = this.rows[i]?.photos?.[j];
+        if (!p) break; // shouldn't happen, ever
+
         // This is there now
         newSelection.set(p.fileid, p);
 
@@ -392,6 +446,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
 
         // Check goal
         if (p === overPhoto) break;
+        j += reverse ? -1 : 1;
       }
 
       // Remove unselected
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index fabe4ac56..9af33a523 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -124,6 +124,7 @@
       :heads="heads"
       :rows="list"
       :isreverse="isMonthView"
+      :recycler="$refs.recycler"
       @refresh="softRefresh"
       @delete="deleteFromViewWithAnimation"
       @updateLoading="updateLoading"
diff --git a/src/types.ts b/src/types.ts
index 87a46901f..c01964574 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -150,10 +150,13 @@ export type IRow = {
   selected?: boolean;
   /** Main list of photo items */
   photos?: IPhoto[];
+
   /** Height in px of the row */
   size?: number;
   /** Count of placeholders to create */
   pct?: number;
+  /** Don't remove dom element */
+  virtualSticky?: boolean;
 };
 export type IHeadRow = IRow & {
   type: IRowType.HEAD;

From cbdcedb91d85a9d4c4d7c579f9af14712f783a1a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 00:39:13 -0800
Subject: [PATCH 081/163] Fix context menu on touch

---
 src/components/SelectionManager.vue |  5 +++++
 src/components/frame/Photo.vue      | 29 ++++++-----------------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
index fd3c4861b..f4ae6646b 100644
--- a/src/components/SelectionManager.vue
+++ b/src/components/SelectionManager.vue
@@ -297,6 +297,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     this.rows[rowIdx].virtualSticky = true;
 
     this.resetTouchParams();
+    document.body.classList.add("vue-touching");
 
     this.touchAnchor = photo;
     this.prevOver = photo;
@@ -314,6 +315,10 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
     delete this.rows[rowIdx].virtualSticky;
     this.resetTouchParams();
+
+    window.setTimeout(() => {
+      if (!this.touchAnchor) document.body.classList.remove("vue-touching");
+    }, 1000);
   }
 
   private resetTouchParams() {
diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
index 74294acc8..ab4a7dd21 100644
--- a/src/components/frame/Photo.vue
+++ b/src/components/frame/Photo.vue
@@ -6,7 +6,6 @@
       placeholder: data.flag & c.FLAG_PLACEHOLDER,
       leaving: data.flag & c.FLAG_LEAVING,
       error: data.flag & c.FLAG_LOAD_FAIL,
-      hasTouch: hasTouch,
     }"
   >
     <CheckCircle
@@ -72,7 +71,6 @@ export default class Photo extends Mixins(GlobalMixin) {
   private touchTimer = 0;
   private src = null;
   private hasFaceRect = false;
-  private hasTouch = false;
 
   @Prop() data: IPhoto;
   @Prop() day: IDay;
@@ -199,26 +197,11 @@ export default class Photo extends Mixins(GlobalMixin) {
     this.emitSelect(this.data);
   }
 
-  touchstart() {
-    this.hasTouch = true;
-    this.touchTimer = window.setTimeout(() => {
-      this.toggleSelect();
-      this.touchTimer = 0;
-    }, 600);
-  }
-
   contextmenu(e: Event) {
-    // on mobile only
-    // if (this.hasTouch) {
-    e.preventDefault();
-    e.stopPropagation();
-    // }
-  }
-
-  touchend() {
-    if (this.touchTimer) {
-      clearTimeout(this.touchTimer);
-      this.touchTimer = 0;
+    // user is trying to select the photo
+    if (document.body.classList.contains("vue-touching")) {
+      e.preventDefault();
+      e.stopPropagation();
     }
   }
 }
@@ -265,7 +248,7 @@ $icon-size: $icon-half-size * 2;
   cursor: pointer;
 
   display: none;
-  .p-outer:not(.hasTouch):hover > & {
+  body:not(.vue-touching) .p-outer:hover > & {
     display: flex;
   }
 
@@ -367,7 +350,7 @@ div.img-outer {
 
     display: none;
     transition: border-radius 0.1s ease-in;
-    .p-outer:not(.hasTouch):not(.selected):hover > & {
+    body:not(.vue-touching) .p-outer:not(.selected):hover > & {
       display: block;
     }
   }

From 258e62e4aa4a8215e2e43c147249a13602569644 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 00:42:48 -0800
Subject: [PATCH 082/163] Fix context menu on desktop

---
 src/components/SelectionManager.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
index f4ae6646b..76ddd483e 100644
--- a/src/components/SelectionManager.vue
+++ b/src/components/SelectionManager.vue
@@ -278,7 +278,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
 
   /** Clicking on photo */
   public clickPhoto(photo: IPhoto, event: any, rowIdx: number) {
-    if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
+    if (photo.flag & this.c.FLAG_PLACEHOLDER || event?.button !== 0) return;
 
     if (this.has()) {
       if (event.shiftKey) {

From 25621959d777d6b15cd9ff5c9cc46bfc06814f7c Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 00:51:45 -0800
Subject: [PATCH 083/163] Add scroller patch

---
 CHANGELOG.md                                    |  1 +
 Makefile                                        |  3 ++-
 patches/{scroller.patch => scroller-perf.patch} |  0
 patches/scroller-sticky.patch                   | 11 +++++++++++
 4 files changed, 14 insertions(+), 1 deletion(-)
 rename patches/{scroller.patch => scroller-perf.patch} (100%)
 create mode 100644 patches/scroller-sticky.patch

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dd04e71e..707f38d3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This file is manually updated. Please file an issue if something is missing.
   - Memories now comes with a dedicated transcoding server with HLS support.
   - Read the documentation [here](https://github.com/pulsejet/memories/wiki/Configuration#video-transcoding) carefully for more details.
 - **Feature**: Show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
+- **Feature**: Multi-selection with drag (mobile) and shift+click ([#28](https://github.com/pulsejet/memories/issues/28))
 - **Feature**: Show duration on video tiles
 - **Feature**: Allow editing all image formats (HEIC etc.)
 - Fix stretched images in viewer ([#176](https://github.com/pulsejet/memories/issues/176))
diff --git a/Makefile b/Makefile
index 8df363fa7..d3d9e4d4f 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ build-js-production:
 	rm -f js/* && npm run build
 
 patch-external:
-	patch -p1 < patches/scroller.patch
+	patch -p1 < patches/scroller-perf.patch
+	patch -p1 < patches/scroller-sticky.patch
 
 watch-js:
 	npm run watch
diff --git a/patches/scroller.patch b/patches/scroller-perf.patch
similarity index 100%
rename from patches/scroller.patch
rename to patches/scroller-perf.patch
diff --git a/patches/scroller-sticky.patch b/patches/scroller-sticky.patch
new file mode 100644
index 000000000..79a8a649a
--- /dev/null
+++ b/patches/scroller-sticky.patch
@@ -0,0 +1,11 @@
+--- ./node_modules/vue-virtual-scroller/dist/vue-virtual-scroller.esm.js	2022-11-12 00:44:05.303602165 -0800
++++ ./node_modules/vue-virtual-scroller/dist/vue-virtual-scroller.esm.js	2022-11-12 00:43:40.030571395 -0800
+@@ -425,7 +425,7 @@
+             }
+
+             // Check if index is still in visible range
+-            if (view.nr.index === -1 || view.nr.index < startIndex || view.nr.index >= endIndex) {
++            if (!view.item.virtualSticky && (view.nr.index === -1 || view.nr.index < startIndex || view.nr.index >= endIndex)) {
+               this.unuseView(view);
+             }
+           }

From 7a2fbe59685f51b7749bfe618668bfd07cd6a8b0 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 00:53:30 -0800
Subject: [PATCH 084/163] release: v4.7.0-beta.1

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index cc7979309..c103d9564 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-alpha.7</version>
+    <version>4.7.0-beta.1</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From b4b21540886ac7021cfbbcc3da1d014567a7f32a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 03:12:38 -0800
Subject: [PATCH 085/163] Bump up go-vod

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index fd522ddac..1b1226598 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.4"
+govod="0.0.5"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From ca5e85cabd40dcb6641ca5673a0c11d0db5bebf3 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 03:12:51 -0800
Subject: [PATCH 086/163] release: v4.7.0-beta.2

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index c103d9564..a2f5e041e 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-beta.1</version>
+    <version>4.7.0-beta.2</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From fe4d8b366a09e2153d66a747178bbc3dfb6c75cd Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 03:16:05 -0800
Subject: [PATCH 087/163] Add funding.yml

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..88cbf05cb
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [pulsejet]

From cfe06ff8cd2ea2becc24d30f067fa9ff8f9e9f1e Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 03:20:20 -0800
Subject: [PATCH 088/163] Add GH sponsors link (#182)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4d5574c85..c17e36fc0 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ Memories is a _batteries-included_ photo management solution for Nextcloud with
 1. **🌟 Star this repository**: This is the easiest way to support the project and costs nothing.
 1. **🪲 Report bugs**: If you find a bug, please report it on the issue tracker.
 1. **📝 Contribute**: If you want to contribute, please read file / comment on an issue and ask for guidance.
+1. **🪙 Sponsorship**: If you want to support the project financially, you can donate to the project on [GitHub](https://github.com/sponsors/pulsejet).
 
 ## Special Thanks
 

From 0c8bea99c9c7db1c8dfe36a317893f25ac3a966e Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 03:30:37 -0800
Subject: [PATCH 089/163] video: no pause on touch

---
 src/components/PsVideo.ts | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 973704ee0..05e1aec80 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -141,22 +141,6 @@ class VideoContentSetup {
     }
     content.element.appendChild(content.videoElement);
 
-    // Pause / play on click on mobile
-    let touchAt = 0;
-    content.videoElement.addEventListener("touchstart", (e) => {
-      touchAt = e.timeStamp;
-    });
-    content.videoElement.addEventListener("touchend", (e) => {
-      if (touchAt && e.timeStamp - touchAt < 200) {
-        if (content.videojs.paused()) {
-          content.videojs.play();
-        } else {
-          content.videojs.pause();
-        }
-      }
-      touchAt = 0;
-    });
-
     const fileid = content.data.photo.fileid;
 
     // Create hls sources if enabled

From f2c4ce3d9f5ef53f3eba8748d6c54d40ee69b6d2 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 03:41:28 -0800
Subject: [PATCH 090/163] Change mouse to pointerdown for iOS

---
 src/components/SelectionManager.vue | 2 +-
 src/components/Timeline.vue         | 2 +-
 src/components/frame/Photo.vue      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
index 76ddd483e..f4ae6646b 100644
--- a/src/components/SelectionManager.vue
+++ b/src/components/SelectionManager.vue
@@ -278,7 +278,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
 
   /** Clicking on photo */
   public clickPhoto(photo: IPhoto, event: any, rowIdx: number) {
-    if (photo.flag & this.c.FLAG_PLACEHOLDER || event?.button !== 0) return;
+    if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
 
     if (this.has()) {
       if (event.shiftKey) {
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index 9af33a523..419ef280a 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -98,7 +98,7 @@
               :day="item.day"
               :key="photo.fileid"
               @select="selectionManager.selectPhoto"
-              @mousedown="selectionManager.clickPhoto(photo, $event, index)"
+              @pointerdown="selectionManager.clickPhoto(photo, $event, index)"
               @touchstart="
                 selectionManager.touchstartPhoto(photo, $event, index)
               "
diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
index ab4a7dd21..190381c92 100644
--- a/src/components/frame/Photo.vue
+++ b/src/components/frame/Photo.vue
@@ -27,7 +27,7 @@
     <div
       class="img-outer fill-block"
       @contextmenu="contextmenu"
-      @mousedown="$emit('mousedown', $event)"
+      @pointerdown="$emit('pointerdown', $event)"
       @touchstart.passive="$emit('touchstart', $event)"
       @touchmove="$emit('touchmove', $event)"
       @touchend.passive="$emit('touchend', $event)"

From d1aad8e7870b4836bf89461201fb051f7a05bad3 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 03:44:27 -0800
Subject: [PATCH 091/163] Make pointerdown passive

---
 src/components/frame/Photo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
index 190381c92..f0dec6707 100644
--- a/src/components/frame/Photo.vue
+++ b/src/components/frame/Photo.vue
@@ -27,7 +27,7 @@
     <div
       class="img-outer fill-block"
       @contextmenu="contextmenu"
-      @pointerdown="$emit('pointerdown', $event)"
+      @pointerdown.passive="$emit('pointerdown', $event)"
       @touchstart.passive="$emit('touchstart', $event)"
       @touchmove="$emit('touchmove', $event)"
       @touchend.passive="$emit('touchend', $event)"

From d5309942acb3b92091ef1ac5c94e2a8eae88ae05 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 04:01:38 -0800
Subject: [PATCH 092/163] video: restore thumb anim

---
 src/components/PsVideo.ts | 11 ++++++++++-
 src/components/Viewer.vue |  3 +--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 05e1aec80..1d9111831 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -214,6 +214,12 @@ class VideoContentSetup {
       content.videojs.play();
     }, 500);
 
+    let canPlay = false;
+    content.videojs.on("canplay", () => {
+      canPlay = true;
+      this.updateRotation(content);
+    });
+
     // Get correct orientation
     axios
       .get<any>(
@@ -223,7 +229,10 @@ class VideoContentSetup {
       )
       .then((response) => {
         content.data.exif = response.data?.exif;
-        this.updateRotation(content);
+
+        // Update only after video is ready
+        // Otherwise the poster image is rotated
+        if (canPlay) this.updateRotation(content);
       });
   }
 
diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 001e2d269..5d657c098 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -469,8 +469,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
     // Get the thumbnail image
     this.photoswipe.addFilter("thumbEl", (thumbEl, data, index) => {
       const photo = this.list[index - this.globalAnchor];
-      if (!photo || !photo.w || !photo.h || photo.flag & this.c.FLAG_IS_VIDEO)
-        return thumbEl;
+      if (!photo || !photo.w || !photo.h) return thumbEl;
       return this.thumbElem(photo) || thumbEl;
     });
 

From 3139f3a2cac1d2df09d11ed124178ef2ddcf5b5b Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 04:35:33 -0800
Subject: [PATCH 093/163] Update go-vod

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 1b1226598..2081f8eb6 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.5"
+govod="0.0.6"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From 7ee2a0be55eefcc5cfeacf855f0c7a9fd3e37c22 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 05:23:44 -0800
Subject: [PATCH 094/163] release: v4.7.0-beta.3

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index a2f5e041e..3f4078521 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-beta.2</version>
+    <version>4.7.0-beta.3</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From 00622078b9d6618507cbcb6fa1dc927968a80d0c Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 05:59:33 -0800
Subject: [PATCH 095/163] select: fix for ios click

---
 src/components/SelectionManager.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
index f4ae6646b..20f97fa89 100644
--- a/src/components/SelectionManager.vue
+++ b/src/components/SelectionManager.vue
@@ -277,8 +277,9 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   }
 
   /** Clicking on photo */
-  public clickPhoto(photo: IPhoto, event: any, rowIdx: number) {
+  public clickPhoto(photo: IPhoto, event: PointerEvent, rowIdx: number) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
+    if (event.pointerType === "touch") return; // let touch events handle this
 
     if (this.has()) {
       if (event.shiftKey) {
@@ -292,7 +293,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   }
 
   /** Tap on */
-  protected touchstartPhoto(photo: IPhoto, event: any, rowIdx: number) {
+  protected touchstartPhoto(photo: IPhoto, event: TouchEvent, rowIdx: number) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
     this.rows[rowIdx].virtualSticky = true;
 
@@ -311,9 +312,11 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   }
 
   /** Tap off */
-  protected touchendPhoto(photo: IPhoto, event: any, rowIdx: number) {
+  protected touchendPhoto(photo: IPhoto, event: TouchEvent, rowIdx: number) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
     delete this.rows[rowIdx].virtualSticky;
+
+    if (this.touchTimer) this.clickPhoto(photo, {} as any, rowIdx);
     this.resetTouchParams();
 
     window.setTimeout(() => {
@@ -337,7 +340,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
    * Tap over
    * photo and rowIdx are that of the *anchor*
    */
-  protected touchmovePhoto(anchor: IPhoto, event: any, rowIdx: number) {
+  protected touchmovePhoto(anchor: IPhoto, event: TouchEvent, rowIdx: number) {
     if (anchor.flag & this.c.FLAG_PLACEHOLDER) return;
 
     if (this.touchTimer) {

From caccd7120a1e6bcab9bf640f776fc0398fc90d11 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 06:35:14 -0800
Subject: [PATCH 096/163] Remove old viewer styles

---
 src/App.vue | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 839a7102d..5e1653d4d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -331,23 +331,6 @@ body.has-viewer header {
   z-index: 0 !important;
 }
 
-// Patch viewer to remove the title and
-// make the image fill the entire screen
-.viewer {
-  .modal-title {
-    display: none;
-  }
-  .modal-wrapper .modal-container {
-    top: 0 !important;
-    bottom: 0 !important;
-
-    .viewer__image-editor {
-      top: 0 !important;
-      bottom: 0 !important;
-    }
-  }
-}
-
 // Hide horizontal scrollbar on mobile
 // For the padding removal above
 #app-content-vue {

From a272ef0d6fb36e5c2d8b3020c57898c54b031b55 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 06:35:28 -0800
Subject: [PATCH 097/163] Fix viewer bar on webkit

---
 src/App.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5e1653d4d..da1cc0270 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -310,15 +310,21 @@ body {
 // Nextcloud 25+: get rid of gap and border radius at right
 #content-vue.remove-gap {
   // was var(--body-container-radius)
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-
+  // now set on #app-navigation-vue
+  border-radius: 0;
   width: calc(100% - var(--body-container-margin) * 1); // was *2
 }
 
 // Prevent content overflow on NC <25
 #content-vue {
   max-height: 100vh;
+
+  // https://bugs.webkit.org/show_bug.cgi?id=160953
+  overflow: visible;
+  #app-navigation-vue {
+    border-top-left-radius: var(--body-container-radius);
+    border-bottom-left-radius: var(--body-container-radius);
+  }
 }
 
 // Top bar is above everything else on mobile

From 420367698ed9f9db5c8d8973061cab56a25a72e4 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 06:36:29 -0800
Subject: [PATCH 098/163] release: v4.7.0-beta.4

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 3f4078521..a39e001bf 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-beta.3</version>
+    <version>4.7.0-beta.4</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From 94141d939116aa04bd433307957f3ca106184f1e Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 08:58:55 -0800
Subject: [PATCH 099/163] Improve non-transcoded video

---
 src/components/PsVideo.ts    | 1 +
 src/services/dav/download.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 1d9111831..bd7740bf1 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -191,6 +191,7 @@ class VideoContentSetup {
 
           content.videojs.src({
             src: content.data.src,
+            type: "video/mp4",
           });
           this.updateRotation(content, 0);
         }
diff --git a/src/services/dav/download.ts b/src/services/dav/download.ts
index 48d0d7c77..5cf166a9c 100644
--- a/src/services/dav/download.ts
+++ b/src/services/dav/download.ts
@@ -102,5 +102,10 @@ export function getDownloadLink(photo: IPhoto) {
     }
   }
 
-  return `/remote.php/dav${photo.filename}`; // normal route
+  try {
+    const file = "/" + photo.filename.split("/").slice(3).join("/");
+    return `/apps/files/ajax/download.php?files=${file}`; // normal route
+  } catch {
+    return `/remote.php/dav${photo.filename}`; // fallback
+  }
 }

From ddca8f235557269002362cdc1f4ce1ce1aa91974 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 09:51:04 -0800
Subject: [PATCH 100/163] Update go-vod

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 2081f8eb6..ff5a572ac 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.6"
+govod="0.0.7"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From a1b93253cd1e9a6b46a3cd6600166719c49c988c Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 12 Nov 2022 09:51:28 -0800
Subject: [PATCH 101/163] release: v4.7.0-beta.5

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index a39e001bf..a68ba3aed 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-beta.4</version>
+    <version>4.7.0-beta.5</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From 662a9a235b368cb3435e8e5faff0fac7537166b9 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Sun, 13 Nov 2022 03:13:27 +0000
Subject: [PATCH 102/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/cs.js      |  3 +++
 l10n/cs.json    |  3 +++
 l10n/fr.js      | 11 +++++++++++
 l10n/fr.json    | 11 +++++++++++
 l10n/zh_HK.js   |  3 +++
 l10n/zh_HK.json |  3 +++
 6 files changed, 34 insertions(+)

diff --git a/l10n/cs.js b/l10n/cs.js
index c1cfff613..e2ac7f0e1 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -26,6 +26,8 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Zvolte kořen vaší časové osy",
     "The selected folder does not seem to be valid. Try again." : "Vybraná složka se nezdá být platná. Zkuste to znovu.",
     "Found {total} photos in {path}" : "V {path} nalezeno {total} fotek",
+    "Failed to get Exif data. Metadata may be lost!" : "Nepodařilo se získat Exif metadata – může dojít k jejich ztrátě!",
+    "No Exif data found! Continue?" : "Nenalezena žádná Exif data – pokračovat?",
     "Image saved successfully" : "Obrázek úspěšně uložen",
     "Error saving image" : "Chyb při ukládání obrázku",
     "Unsaved changes" : "Neuložené změny",
@@ -218,6 +220,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Pozn.: označená oblast ořezu je menší než použitá změna rozlišení, což může způsobit snížení kvality",
     "Actual size (100%)" : "Skutečná velikost (100%)",
     "Fit size" : "Přizpůsobit velikost",
+    "Transcoding failed." : "Překódování se nezdařilo.",
     "Shared Folder" : "Sdílená složka",
     "Failed to create {albumName}." : "Nepodařilo se vytvořit {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepodařilo přejmenovat {currentAlbumName} to {newAlbumName}.",
diff --git a/l10n/cs.json b/l10n/cs.json
index 4a1882440..e4f506b7d 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -24,6 +24,8 @@
     "Choose the root of your timeline" : "Zvolte kořen vaší časové osy",
     "The selected folder does not seem to be valid. Try again." : "Vybraná složka se nezdá být platná. Zkuste to znovu.",
     "Found {total} photos in {path}" : "V {path} nalezeno {total} fotek",
+    "Failed to get Exif data. Metadata may be lost!" : "Nepodařilo se získat Exif metadata – může dojít k jejich ztrátě!",
+    "No Exif data found! Continue?" : "Nenalezena žádná Exif data – pokračovat?",
     "Image saved successfully" : "Obrázek úspěšně uložen",
     "Error saving image" : "Chyb při ukládání obrázku",
     "Unsaved changes" : "Neuložené změny",
@@ -216,6 +218,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Pozn.: označená oblast ořezu je menší než použitá změna rozlišení, což může způsobit snížení kvality",
     "Actual size (100%)" : "Skutečná velikost (100%)",
     "Fit size" : "Přizpůsobit velikost",
+    "Transcoding failed." : "Překódování se nezdařilo.",
     "Shared Folder" : "Sdílená složka",
     "Failed to create {albumName}." : "Nepodařilo se vytvořit {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepodařilo přejmenovat {currentAlbumName} to {newAlbumName}.",
diff --git a/l10n/fr.js b/l10n/fr.js
index 76b6c00cf..e15a9c917 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "On this day" : "Ce même jour",
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
+    "If you just installed Memories, run:" : "Si vous venez d'installer Souvenirs, exécuter :",
+    "Image saved successfully" : "Image enregistrée avec succès",
     "Error saving image" : "Erreur lors de l'enregistrement de l'image",
     "Unsaved changes" : "Modifications non enregistrées",
     "Drop changes" : "Abandonner les changements",
@@ -27,6 +29,7 @@ OC.L10N.register(
     "Edit Date/Time" : "Éditer la Date/Heure",
     "View in folder" : "Afficher dans le dossier",
     "Add to album" : "Ajouter à l'album",
+    "Move to another person" : "Déplacer vers une autre personne",
     "Remove from person" : "Retirer de la personne",
     "You are about to download a large number of files. Are you sure?" : "Vous êtes sur le point de télécharger un grand nombre de fichiers. Êtes-vous certain de vouloir le faire ?",
     "You are about to delete a large number of files. Are you sure?" : "Vous êtes sur le point de supprimer un grand nombre de fichiers. Êtes-vous certain⋅e de vouloir le faire ?",
@@ -34,9 +37,13 @@ OC.L10N.register(
     "_{n} selected_::_{n} selected_" : ["{n} sélectionné","{n} sélectionnés","{n} sélectionnés"],
     "Timeline Path" : "Emplacement du Fil chronologique",
     "Show hidden folders" : "Afficher les dossiers cachés",
+    "Your Timeline" : "Votre fil chronologique",
     "Failed to load some photos" : "Échec du chargement de certaines photos",
     "Share" : "Partage",
     "Sidebar" : "Panneau latéral",
+    "Video sharing not supported yet" : "Le partage de vidéo n'est pas encore disponible",
+    "Cannot share this type of data" : "Impossible de partager ce type de données",
+    "Processing … {n}/{m}" : "En cours de traitement … {n}/{m}",
     "Search for collaborators" : "Rechercher des collaborateurs",
     "Search people or groups" : "Recherche des personnes ou des groupes",
     "Add {collaboratorLabel} to the collaborators list" : "Ajouter {collaboratorLabel} à la liste des collaborateurs",
@@ -81,6 +88,7 @@ OC.L10N.register(
     "Exercise caution and make sure you have backups." : "Faites preuve de prudence et assurez-vous que vous disposez de sauvegardes.",
     "Loading data … {n}/{m}" : "Chargement des données… {n}/{m}",
     "Remove person" : "Retirer la personne",
+    "Are you sure you want to remove {name}?" : "Êtes-vous sûr de vouloir retirer {name}?",
     "Name" : "Nom",
     "Rename person" : "Renommer la personne",
     "Update" : "Mise à jour",
@@ -173,13 +181,16 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Notez que la zone de recadrage sélectionnée est inférieure au redimensionnement appliqué, ce qui peut entraîner une baisse de qualité.",
     "Actual size (100%)" : "Taille actuelle (100%)",
     "Fit size" : "Adapter à la taille",
+    "Transcoding failed." : "Échec du transcodage.",
     "Failed to create {albumName}." : "Échec de la création de {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Échec du renommage de {currentAlbumName} en {newAlbumName}.",
     "General Failure" : "Échec général",
     "Error: {msg}" : "Erreur : {msg}",
     "Failed to delete files." : "Échec de la suppression des fichiers.",
     "Failed to delete {fileName}." : "Échec de la suppression de {fileName}.",
+    "Failed to download some files." : "Échec du téléchargement de certains fichiers.",
     "Failed to favorite files." : "Échec de la mise en favoris des fichiers.",
+    "Failed to favorite some files." : "Échec de l'ajout en favoris de certains fichiers.",
     "Failed to favorite {fileName}." : "Échec de l'ajout aux favoris de {fileName}."
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/fr.json b/l10n/fr.json
index 621332650..09e9e8d81 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -12,6 +12,8 @@
     "On this day" : "Ce même jour",
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
+    "If you just installed Memories, run:" : "Si vous venez d'installer Souvenirs, exécuter :",
+    "Image saved successfully" : "Image enregistrée avec succès",
     "Error saving image" : "Erreur lors de l'enregistrement de l'image",
     "Unsaved changes" : "Modifications non enregistrées",
     "Drop changes" : "Abandonner les changements",
@@ -25,6 +27,7 @@
     "Edit Date/Time" : "Éditer la Date/Heure",
     "View in folder" : "Afficher dans le dossier",
     "Add to album" : "Ajouter à l'album",
+    "Move to another person" : "Déplacer vers une autre personne",
     "Remove from person" : "Retirer de la personne",
     "You are about to download a large number of files. Are you sure?" : "Vous êtes sur le point de télécharger un grand nombre de fichiers. Êtes-vous certain de vouloir le faire ?",
     "You are about to delete a large number of files. Are you sure?" : "Vous êtes sur le point de supprimer un grand nombre de fichiers. Êtes-vous certain⋅e de vouloir le faire ?",
@@ -32,9 +35,13 @@
     "_{n} selected_::_{n} selected_" : ["{n} sélectionné","{n} sélectionnés","{n} sélectionnés"],
     "Timeline Path" : "Emplacement du Fil chronologique",
     "Show hidden folders" : "Afficher les dossiers cachés",
+    "Your Timeline" : "Votre fil chronologique",
     "Failed to load some photos" : "Échec du chargement de certaines photos",
     "Share" : "Partage",
     "Sidebar" : "Panneau latéral",
+    "Video sharing not supported yet" : "Le partage de vidéo n'est pas encore disponible",
+    "Cannot share this type of data" : "Impossible de partager ce type de données",
+    "Processing … {n}/{m}" : "En cours de traitement … {n}/{m}",
     "Search for collaborators" : "Rechercher des collaborateurs",
     "Search people or groups" : "Recherche des personnes ou des groupes",
     "Add {collaboratorLabel} to the collaborators list" : "Ajouter {collaboratorLabel} à la liste des collaborateurs",
@@ -79,6 +86,7 @@
     "Exercise caution and make sure you have backups." : "Faites preuve de prudence et assurez-vous que vous disposez de sauvegardes.",
     "Loading data … {n}/{m}" : "Chargement des données… {n}/{m}",
     "Remove person" : "Retirer la personne",
+    "Are you sure you want to remove {name}?" : "Êtes-vous sûr de vouloir retirer {name}?",
     "Name" : "Nom",
     "Rename person" : "Renommer la personne",
     "Update" : "Mise à jour",
@@ -171,13 +179,16 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Notez que la zone de recadrage sélectionnée est inférieure au redimensionnement appliqué, ce qui peut entraîner une baisse de qualité.",
     "Actual size (100%)" : "Taille actuelle (100%)",
     "Fit size" : "Adapter à la taille",
+    "Transcoding failed." : "Échec du transcodage.",
     "Failed to create {albumName}." : "Échec de la création de {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Échec du renommage de {currentAlbumName} en {newAlbumName}.",
     "General Failure" : "Échec général",
     "Error: {msg}" : "Erreur : {msg}",
     "Failed to delete files." : "Échec de la suppression des fichiers.",
     "Failed to delete {fileName}." : "Échec de la suppression de {fileName}.",
+    "Failed to download some files." : "Échec du téléchargement de certains fichiers.",
     "Failed to favorite files." : "Échec de la mise en favoris des fichiers.",
+    "Failed to favorite some files." : "Échec de l'ajout en favoris de certains fichiers.",
     "Failed to favorite {fileName}." : "Échec de l'ajout aux favoris de {fileName}."
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 4c562e6dc..0b56cba33 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -26,6 +26,8 @@ OC.L10N.register(
     "Choose the root of your timeline" : "選擇您時間線的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Failed to get Exif data. Metadata may be lost!" : "獲取 Exif 數據失敗。元數據可能會丟失！",
+    "No Exif data found! Continue?" : "未找到 Exif 數據！繼續？",
     "Image saved successfully" : "圖像保存成功",
     "Error saving image" : "儲存圖像時發生錯誤",
     "Unsaved changes" : "未儲存變更",
@@ -218,6 +220,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "請注意，選定的裁剪區域低於套用的調整大小，這可能會導致品質下降",
     "Actual size (100%)" : "實際大小 (100%)",
     "Fit size" : "調整大小",
+    "Transcoding failed." : "轉碼失敗。",
     "Shared Folder" : "分享資料夾",
     "Failed to create {albumName}." : "創建 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index 69b8d8547..5baa0c970 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -24,6 +24,8 @@
     "Choose the root of your timeline" : "選擇您時間線的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Failed to get Exif data. Metadata may be lost!" : "獲取 Exif 數據失敗。元數據可能會丟失！",
+    "No Exif data found! Continue?" : "未找到 Exif 數據！繼續？",
     "Image saved successfully" : "圖像保存成功",
     "Error saving image" : "儲存圖像時發生錯誤",
     "Unsaved changes" : "未儲存變更",
@@ -216,6 +218,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "請注意，選定的裁剪區域低於套用的調整大小，這可能會導致品質下降",
     "Actual size (100%)" : "實際大小 (100%)",
     "Fit size" : "調整大小",
+    "Transcoding failed." : "轉碼失敗。",
     "Shared Folder" : "分享資料夾",
     "Failed to create {albumName}." : "創建 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",

From fceaebaff5874101bf5869f7c34b38aadf15aebf Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 02:44:36 -0800
Subject: [PATCH 103/163] Bump up go-vod (close #190)

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index ff5a572ac..d36335679 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.7"
+govod="0.0.8"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From 139136d3c04190b6dc795a8e15d789e1f3400cbd Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 18:28:43 -0800
Subject: [PATCH 104/163] folder-share: use public template (fix #192)

---
 lib/Controller/PublicController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/PublicController.php b/lib/Controller/PublicController.php
index e546742a5..4fe47bee8 100644
--- a/lib/Controller/PublicController.php
+++ b/lib/Controller/PublicController.php
@@ -6,6 +6,7 @@
 use OCP\App\IAppManager;
 use OCP\AppFramework\AuthPublicShareController;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
+use OCP\AppFramework\Http\Template\PublicTemplateResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -121,7 +122,7 @@ public function showShare(): TemplateResponse
         $policy->addAllowedConnectDomain('nominatim.openstreetmap.org');
         $policy->addAllowedFrameDomain('www.openstreetmap.org');
 
-        $response = new TemplateResponse($this->appName, 'main');
+        $response = new PublicTemplateResponse($this->appName, 'main');
         $response->setContentSecurityPolicy($policy);
 
         return $response;

From 2dc38dee2665e95aba6c9a39abaa3345c4debffe Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 18:37:19 -0800
Subject: [PATCH 105/163] viewer: hide controls on public share

---
 src/components/Viewer.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 5d657c098..834dbcc4f 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -20,15 +20,16 @@
           container=".memories_viewer .pswp"
         >
           <NcActionButton
+            v-if="canShare"
             :aria-label="t('memories', 'Share')"
             @click="shareCurrent"
             :close-after-click="true"
-            v-if="canShare"
           >
             {{ t("memories", "Share") }}
             <template #icon> <ShareIcon :size="24" /> </template>
           </NcActionButton>
           <NcActionButton
+            v-if="!routeIsPublic"
             :aria-label="t('memories', 'Delete')"
             @click="deleteCurrent"
             :close-after-click="true"
@@ -37,6 +38,7 @@
             <template #icon> <DeleteIcon :size="24" /> </template>
           </NcActionButton>
           <NcActionButton
+            v-if="!routeIsPublic"
             :aria-label="t('memories', 'Favorite')"
             @click="favoriteCurrent"
             :close-after-click="true"
@@ -48,6 +50,7 @@
             </template>
           </NcActionButton>
           <NcActionButton
+            v-if="!routeIsPublic"
             :aria-label="t('memories', 'Sidebar')"
             @click="toggleSidebar"
             :close-after-click="true"
@@ -58,8 +61,8 @@
             </template>
           </NcActionButton>
           <NcActionButton
+            v-if="canEdit && !routeIsPublic"
             :aria-label="t('memories', 'Edit')"
-            v-if="canEdit"
             @click="openEditor"
             :close-after-click="true"
           >
@@ -79,6 +82,7 @@
             </template>
           </NcActionButton>
           <NcActionButton
+            v-if="!routeIsPublic"
             :aria-label="t('memories', 'View in folder')"
             @click="viewInFolder"
             :close-after-click="true"
@@ -195,6 +199,11 @@ export default class Viewer extends Mixins(GlobalMixin) {
     }
   }
 
+  /** Route is public */
+  get routeIsPublic() {
+    return this.$route.name === "folder-share";
+  }
+
   /** Update the document title */
   private updateTitle(photo: IPhoto | undefined) {
     if (!this.originalTitle) {

From 9890a9f9623302cb9e016c964b0581a400c114eb Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Mon, 14 Nov 2022 03:14:53 +0000
Subject: [PATCH 106/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/de_DE.js   | 3 +++
 l10n/de_DE.json | 3 +++
 l10n/tr.js      | 9 ++++++++-
 l10n/tr.json    | 9 ++++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 90ed2fd8d..9bb6cb4ac 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -26,6 +26,8 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Start Ihrer Zeitleiste auswählen",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuchen Sie es nochmal.",
     "Found {total} photos in {path}" : "{total} Fotos gefunden in {path}",
+    "Failed to get Exif data. Metadata may be lost!" : "Exif-Daten konnten nicht abgerufen werden. Metadaten können verloren gehen!",
+    "No Exif data found! Continue?" : "Keine Exif-Daten gefunden! Fortsetzen?",
     "Image saved successfully" : "Bild erfolgreich gespeichert",
     "Error saving image" : "Fehler beim Speichern des Bildes",
     "Unsaved changes" : "Ungespeicherte Änderungen",
@@ -218,6 +220,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachten Sie, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann",
     "Actual size (100%)" : "Tatsächliche Größe (100%)",
     "Fit size" : "Größe anpassen",
+    "Transcoding failed." : "Transkodierung fehlgeschlagen.",
     "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index e0b5fbc56..b4a902b8e 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -24,6 +24,8 @@
     "Choose the root of your timeline" : "Start Ihrer Zeitleiste auswählen",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuchen Sie es nochmal.",
     "Found {total} photos in {path}" : "{total} Fotos gefunden in {path}",
+    "Failed to get Exif data. Metadata may be lost!" : "Exif-Daten konnten nicht abgerufen werden. Metadaten können verloren gehen!",
+    "No Exif data found! Continue?" : "Keine Exif-Daten gefunden! Fortsetzen?",
     "Image saved successfully" : "Bild erfolgreich gespeichert",
     "Error saving image" : "Fehler beim Speichern des Bildes",
     "Unsaved changes" : "Ungespeicherte Änderungen",
@@ -216,6 +218,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachten Sie, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann",
     "Actual size (100%)" : "Tatsächliche Größe (100%)",
     "Fit size" : "Größe anpassen",
+    "Transcoding failed." : "Transkodierung fehlgeschlagen.",
     "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
diff --git a/l10n/tr.js b/l10n/tr.js
index b14fe8cc1..e89e1778b 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "On this day" : "Bugün",
     "Tags" : "Etiketler",
     "Maps" : "Haritalar",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Daha iyi bir fotoğraf deneyimi sizi bekliyor",
     "Choose the root folder of your timeline to begin" : "Zaman tünelinizin başlangıç kök klasörünü seçin",
     "If you just installed Memories, run:" : "Anılar uygulamasını yeni kurduysanız şunu çalıştırın:",
@@ -24,6 +25,9 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Zaman tünelinizin kök klasörünü seçin",
     "The selected folder does not seem to be valid. Try again." : "Seçilmiş klasör geçersiz gibi görünüyor. Yeniden deneyin.",
     "Found {total} photos in {path}" : "{path} yolunda {total} fotoğraf bulundu",
+    "Failed to get Exif data. Metadata may be lost!" : "EXIF verileri alınamadı. Üst veriler kaybolmuş olabilir!",
+    "No Exif data found! Continue?" : "Herhangi bir EXIF verisi bulunamadı. İlerlensin mi?",
+    "Image saved successfully" : "Görsel kaydedildi",
     "Error saving image" : "Görsel kaydedilirken sorun çıktı",
     "Unsaved changes" : "Kaydedilmemiş değişiklikler",
     "Drop changes" : "Değişiklikleri yok say",
@@ -54,6 +58,8 @@ OC.L10N.register(
     "Failed to load some photos" : "Bazı fotoğraflar yüklenemedi",
     "Share" : "Paylaş",
     "Sidebar" : "Yan çubuk",
+    "Video sharing not supported yet" : "Görüntü paylaşımı henüz desteklenmiyor",
+    "Cannot share this type of data" : "Bu türdeki verileri paylaşamazsınız",
     "Processing … {n}/{m}" : "İşleniyor… {n}/{m}",
     "{n} photos added to album" : "{n} fotoğraf albüme eklendi",
     "Search for collaborators" : "Katılımcı arama",
@@ -148,7 +154,7 @@ OC.L10N.register(
     "Resize" : "Yeniden boyutlandır",
     "Invalid image." : "Görsel geçersiz.",
     "Error while uploading the image." : "Görsel yüklenirken sorun çıktı.",
-    "are not images" : "görsel değil",
+    "are not images" : "görseller değil",
     "is not an image" : "bir görsel değil",
     "to be uploaded" : "yüklenecek",
     "Crop" : "Kırp",
@@ -213,6 +219,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Seçilmiş kırpma alanı uygulanan yeniden boyutlandırma alanından küçük. Bu durum görsel kalitesinin düşmesine neden olabilir.",
     "Actual size (100%)" : "Gerçek boyut (%100)",
     "Fit size" : "Boyutu sığdır",
+    "Transcoding failed." : "Kod dönüştürülemedi.",
     "Shared Folder" : "Paylaşılmış klasör",
     "Failed to create {albumName}." : "{albumName} albümü oluşturulamadı.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} albümünün adı {newAlbumName} olarak değiştirilemedi.",
diff --git a/l10n/tr.json b/l10n/tr.json
index 496d462f9..249f1da48 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -12,6 +12,7 @@
     "On this day" : "Bugün",
     "Tags" : "Etiketler",
     "Maps" : "Haritalar",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Daha iyi bir fotoğraf deneyimi sizi bekliyor",
     "Choose the root folder of your timeline to begin" : "Zaman tünelinizin başlangıç kök klasörünü seçin",
     "If you just installed Memories, run:" : "Anılar uygulamasını yeni kurduysanız şunu çalıştırın:",
@@ -22,6 +23,9 @@
     "Choose the root of your timeline" : "Zaman tünelinizin kök klasörünü seçin",
     "The selected folder does not seem to be valid. Try again." : "Seçilmiş klasör geçersiz gibi görünüyor. Yeniden deneyin.",
     "Found {total} photos in {path}" : "{path} yolunda {total} fotoğraf bulundu",
+    "Failed to get Exif data. Metadata may be lost!" : "EXIF verileri alınamadı. Üst veriler kaybolmuş olabilir!",
+    "No Exif data found! Continue?" : "Herhangi bir EXIF verisi bulunamadı. İlerlensin mi?",
+    "Image saved successfully" : "Görsel kaydedildi",
     "Error saving image" : "Görsel kaydedilirken sorun çıktı",
     "Unsaved changes" : "Kaydedilmemiş değişiklikler",
     "Drop changes" : "Değişiklikleri yok say",
@@ -52,6 +56,8 @@
     "Failed to load some photos" : "Bazı fotoğraflar yüklenemedi",
     "Share" : "Paylaş",
     "Sidebar" : "Yan çubuk",
+    "Video sharing not supported yet" : "Görüntü paylaşımı henüz desteklenmiyor",
+    "Cannot share this type of data" : "Bu türdeki verileri paylaşamazsınız",
     "Processing … {n}/{m}" : "İşleniyor… {n}/{m}",
     "{n} photos added to album" : "{n} fotoğraf albüme eklendi",
     "Search for collaborators" : "Katılımcı arama",
@@ -146,7 +152,7 @@
     "Resize" : "Yeniden boyutlandır",
     "Invalid image." : "Görsel geçersiz.",
     "Error while uploading the image." : "Görsel yüklenirken sorun çıktı.",
-    "are not images" : "görsel değil",
+    "are not images" : "görseller değil",
     "is not an image" : "bir görsel değil",
     "to be uploaded" : "yüklenecek",
     "Crop" : "Kırp",
@@ -211,6 +217,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Seçilmiş kırpma alanı uygulanan yeniden boyutlandırma alanından küçük. Bu durum görsel kalitesinin düşmesine neden olabilir.",
     "Actual size (100%)" : "Gerçek boyut (%100)",
     "Fit size" : "Boyutu sığdır",
+    "Transcoding failed." : "Kod dönüştürülemedi.",
     "Shared Folder" : "Paylaşılmış klasör",
     "Failed to create {albumName}." : "{albumName} albümü oluşturulamadı.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} albümünün adı {newAlbumName} olarak değiştirilemedi.",

From e9d3b80f0a264c1bfbfac609e301ef4b29f71277 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 21:21:46 -0800
Subject: [PATCH 107/163] Add plyr

---
 package-lock.json         | 333 ++++++++++++--------------------------
 package.json              |   2 +-
 src/assets/plyr.svg       |   1 +
 src/components/PsVideo.ts |  89 +++++++++-
 4 files changed, 185 insertions(+), 240 deletions(-)
 create mode 100644 src/assets/plyr.svg

diff --git a/package-lock.json b/package-lock.json
index ae8cce8f8..961679c65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,10 +19,10 @@
         "moment": "^2.29.4",
         "path-posix": "^1.0.0",
         "photoswipe": "^5.3.3",
+        "plyr": "^3.7.2",
         "reflect-metadata": "^0.1.13",
         "video.js": "^7.20.3",
         "videojs-contrib-quality-levels": "^2.2.0",
-        "videojs-hls-quality-selector": "^1.1.4",
         "vue": "^2.7.10",
         "vue-class-component": "^7.2.6",
         "vue-material-design-icons": "^5.1.2",
@@ -2877,11 +2877,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
-    },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -3673,7 +3668,8 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
     },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
@@ -3989,6 +3985,11 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
       "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
     },
+    "node_modules/custom-event-polyfill": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz",
+      "integrity": "sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w=="
+    },
     "node_modules/date-format-parse": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/date-format-parse/-/date-format-parse-0.2.7.tgz",
@@ -4891,53 +4892,11 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/fs-promise": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-0.5.0.tgz",
-      "integrity": "sha512-Y+4F4ujhEcayCJt6JmzcOun9MYGQwz+bVUiuBmTkJImhBHKpBvmVPZR9wtfiF7k3ffwAOAuurygQe+cPLSFQhw==",
-      "deprecated": "Use mz or fs-extra^3.0 with Promise Support",
-      "dependencies": {
-        "any-promise": "^1.0.0",
-        "fs-extra": "^0.26.5",
-        "mz": "^2.3.1",
-        "thenify-all": "^1.6.0"
-      }
-    },
-    "node_modules/fs-promise/node_modules/fs-extra": {
-      "version": "0.26.7",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-      "integrity": "sha512-waKu+1KumRhYv8D8gMRCKJGAMI9pRnPuEb1mvgYD0f7wBscg+h6bW4FDTmEZhB9VKxvoTtxW+Y7bnIlB7zja6Q==",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^2.1.0",
-        "klaw": "^1.0.0",
-        "path-is-absolute": "^1.0.0",
-        "rimraf": "^2.2.8"
-      }
-    },
-    "node_modules/fs-promise/node_modules/jsonfile": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-      "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/fs-promise/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
     },
     "node_modules/function-bind": {
       "version": "1.1.1",
@@ -5034,6 +4993,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -5073,6 +5033,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -5082,6 +5043,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -5109,7 +5071,8 @@
     "node_modules/graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
     },
     "node_modules/hammerjs": {
       "version": "2.0.8",
@@ -5516,6 +5479,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -5524,7 +5488,8 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
     },
     "node_modules/internal-slot": {
       "version": "1.0.3",
@@ -6189,18 +6154,6 @@
       "resolved": "https://registry.npmjs.org/justified-layout/-/justified-layout-4.1.0.tgz",
       "integrity": "sha512-M5FimNMXgiOYerVRGsXZ2YK9YNCaTtwtYp7Hb2308U1Q9TXXHx5G0p08mcVR5O53qf8bWY4NJcPBxE6zuayXSg=="
     },
-    "node_modules/karma-safaritechpreview-launcher": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz",
-      "integrity": "sha512-2QMxAGXPQ37H3KoR9SCdh0OoktQZ5MyrxkvBiZ+VVOQfYVrcyOQXGrPea0/DKvf8qoQvrvP2FHcP/BxsuxuyHw==",
-      "dependencies": {
-        "fs-promise": "^0.5.0",
-        "marcosc-async": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/keycode": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
@@ -6216,14 +6169,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
     "node_modules/klona": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
@@ -6307,6 +6252,11 @@
         "node": ">=8.9.0"
       }
     },
+    "node_modules/loadjs": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/loadjs/-/loadjs-4.2.0.tgz",
+      "integrity": "sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA=="
+    },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -6410,12 +6360,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/marcosc-async": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/marcosc-async/-/marcosc-async-3.0.5.tgz",
-      "integrity": "sha512-CCDofAatyNlbCCE1aIERplqT8r4S3LLc72pg3Bg/RilWPFqdXYO/FiDfzZ9ijf7K1P0j5mUZYCQ6eWXNuAxNBg==",
-      "engines": ">=4"
-    },
     "node_modules/material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
@@ -6675,16 +6619,6 @@
         "npm": ">=5"
       }
     },
-    "node_modules/mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dependencies": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
-      }
-    },
     "node_modules/nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
@@ -6809,6 +6743,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6900,6 +6835,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -7050,6 +6986,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7175,6 +7112,18 @@
         "node": ">=14"
       }
     },
+    "node_modules/plyr": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/plyr/-/plyr-3.7.2.tgz",
+      "integrity": "sha512-I0ZC/OI4oJ0iWG9s2rrnO0YFO6aLyrPiQBq9kum0FqITYljwTPBbYL3TZZu8UJQJUq7tUWN18Q7ACwNCkGKABQ==",
+      "dependencies": {
+        "core-js": "^3.22.0",
+        "custom-event-polyfill": "^1.0.7",
+        "loadjs": "^4.2.0",
+        "rangetouch": "^2.0.1",
+        "url-polyfill": "^1.1.12"
+      }
+    },
     "node_modules/polished": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/polished/-/polished-3.7.2.tgz",
@@ -7487,6 +7436,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/rangetouch": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/rangetouch/-/rangetouch-2.0.1.tgz",
+      "integrity": "sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA=="
+    },
     "node_modules/raw-body": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
@@ -8881,25 +8835,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/thenify": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-      "dependencies": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "node_modules/thenify-all": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-      "dependencies": {
-        "thenify": ">= 3.1.0 < 4"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -9307,6 +9242,11 @@
         "requires-port": "^1.0.0"
       }
     },
+    "node_modules/url-polyfill": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.12.tgz",
+      "integrity": "sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A=="
+    },
     "node_modules/url-toolkit": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz",
@@ -9457,17 +9397,6 @@
       "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
       "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
     },
-    "node_modules/videojs-hls-quality-selector": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/videojs-hls-quality-selector/-/videojs-hls-quality-selector-1.1.4.tgz",
-      "integrity": "sha512-wWAjlLQui02gp//t9KHGd3XnbYO7wdOptskh3ZYCrbl/5Lbkveqb9yBVjH4e0zIQBPvGdWPMcOeDukf8iuYeBw==",
-      "dependencies": {
-        "global": "^4.3.2",
-        "karma-safaritechpreview-launcher": "0.0.6",
-        "video.js": "^7.5.5",
-        "videojs-contrib-quality-levels": "^2.0.9"
-      }
-    },
     "node_modules/videojs-vtt.js": {
       "version": "0.15.4",
       "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
@@ -10471,7 +10400,8 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
     },
     "node_modules/ws": {
       "version": "8.10.0",
@@ -12650,11 +12580,6 @@
         "color-convert": "^1.9.0"
       }
     },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
-    },
     "anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -13291,7 +13216,8 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
     },
     "connect-history-api-fallback": {
       "version": "2.0.0",
@@ -13547,6 +13473,11 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
       "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
     },
+    "custom-event-polyfill": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz",
+      "integrity": "sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w=="
+    },
     "date-format-parse": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/date-format-parse/-/date-format-parse-0.2.7.tgz",
@@ -14265,51 +14196,11 @@
       "dev": true,
       "peer": true
     },
-    "fs-promise": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-0.5.0.tgz",
-      "integrity": "sha512-Y+4F4ujhEcayCJt6JmzcOun9MYGQwz+bVUiuBmTkJImhBHKpBvmVPZR9wtfiF7k3ffwAOAuurygQe+cPLSFQhw==",
-      "requires": {
-        "any-promise": "^1.0.0",
-        "fs-extra": "^0.26.5",
-        "mz": "^2.3.1",
-        "thenify-all": "^1.6.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "0.26.7",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-          "integrity": "sha512-waKu+1KumRhYv8D8gMRCKJGAMI9pRnPuEb1mvgYD0f7wBscg+h6bW4FDTmEZhB9VKxvoTtxW+Y7bnIlB7zja6Q==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0",
-            "path-is-absolute": "^1.0.0",
-            "rimraf": "^2.2.8"
-          }
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
     },
     "function-bind": {
       "version": "1.1.1",
@@ -14379,6 +14270,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -14392,6 +14284,7 @@
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "dev": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -14401,6 +14294,7 @@
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
           "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -14441,7 +14335,8 @@
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
     },
     "hammerjs": {
       "version": "2.0.8",
@@ -14767,6 +14662,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -14775,7 +14671,8 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
     },
     "internal-slot": {
       "version": "1.0.3",
@@ -15244,15 +15141,6 @@
       "resolved": "https://registry.npmjs.org/justified-layout/-/justified-layout-4.1.0.tgz",
       "integrity": "sha512-M5FimNMXgiOYerVRGsXZ2YK9YNCaTtwtYp7Hb2308U1Q9TXXHx5G0p08mcVR5O53qf8bWY4NJcPBxE6zuayXSg=="
     },
-    "karma-safaritechpreview-launcher": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz",
-      "integrity": "sha512-2QMxAGXPQ37H3KoR9SCdh0OoktQZ5MyrxkvBiZ+VVOQfYVrcyOQXGrPea0/DKvf8qoQvrvP2FHcP/BxsuxuyHw==",
-      "requires": {
-        "fs-promise": "^0.5.0",
-        "marcosc-async": "^3.0.4"
-      }
-    },
     "keycode": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
@@ -15265,14 +15153,6 @@
       "dev": true,
       "peer": true
     },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==",
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
     "klona": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
@@ -15328,6 +15208,11 @@
         "json5": "^2.1.2"
       }
     },
+    "loadjs": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/loadjs/-/loadjs-4.2.0.tgz",
+      "integrity": "sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA=="
+    },
     "locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -15419,11 +15304,6 @@
         "semver": "^6.0.0"
       }
     },
-    "marcosc-async": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/marcosc-async/-/marcosc-async-3.0.5.tgz",
-      "integrity": "sha512-CCDofAatyNlbCCE1aIERplqT8r4S3LLc72pg3Bg/RilWPFqdXYO/FiDfzZ9ijf7K1P0j5mUZYCQ6eWXNuAxNBg=="
-    },
     "material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
@@ -15633,16 +15513,6 @@
         "global": "^4.4.0"
       }
     },
-    "mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "requires": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
-      }
-    },
     "nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
@@ -15742,7 +15612,8 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "peer": true
     },
     "object-inspect": {
       "version": "1.12.2",
@@ -15807,6 +15678,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -15923,7 +15795,8 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true
     },
     "path-key": {
       "version": "3.1.1",
@@ -16012,6 +15885,18 @@
       "integrity": "sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q==",
       "dev": true
     },
+    "plyr": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/plyr/-/plyr-3.7.2.tgz",
+      "integrity": "sha512-I0ZC/OI4oJ0iWG9s2rrnO0YFO6aLyrPiQBq9kum0FqITYljwTPBbYL3TZZu8UJQJUq7tUWN18Q7ACwNCkGKABQ==",
+      "requires": {
+        "core-js": "^3.22.0",
+        "custom-event-polyfill": "^1.0.7",
+        "loadjs": "^4.2.0",
+        "rangetouch": "^2.0.1",
+        "url-polyfill": "^1.1.12"
+      }
+    },
     "polished": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/polished/-/polished-3.7.2.tgz",
@@ -16245,6 +16130,11 @@
       "dev": true,
       "peer": true
     },
+    "rangetouch": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/rangetouch/-/rangetouch-2.0.1.tgz",
+      "integrity": "sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA=="
+    },
     "raw-body": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
@@ -17311,22 +17201,6 @@
         }
       }
     },
-    "thenify": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-      "requires": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "thenify-all": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-      "requires": {
-        "thenify": ">= 3.1.0 < 4"
-      }
-    },
     "thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -17633,6 +17507,11 @@
         "requires-port": "^1.0.0"
       }
     },
+    "url-polyfill": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.12.tgz",
+      "integrity": "sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A=="
+    },
     "url-toolkit": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz",
@@ -17737,17 +17616,6 @@
       "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
       "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
     },
-    "videojs-hls-quality-selector": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/videojs-hls-quality-selector/-/videojs-hls-quality-selector-1.1.4.tgz",
-      "integrity": "sha512-wWAjlLQui02gp//t9KHGd3XnbYO7wdOptskh3ZYCrbl/5Lbkveqb9yBVjH4e0zIQBPvGdWPMcOeDukf8iuYeBw==",
-      "requires": {
-        "global": "^4.3.2",
-        "karma-safaritechpreview-launcher": "0.0.6",
-        "video.js": "^7.5.5",
-        "videojs-contrib-quality-levels": "^2.0.9"
-      }
-    },
     "videojs-vtt.js": {
       "version": "0.15.4",
       "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
@@ -18562,7 +18430,8 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
     },
     "ws": {
       "version": "8.10.0",
diff --git a/package.json b/package.json
index aae83758c..aa91e4af3 100644
--- a/package.json
+++ b/package.json
@@ -39,10 +39,10 @@
     "moment": "^2.29.4",
     "path-posix": "^1.0.0",
     "photoswipe": "^5.3.3",
+    "plyr": "^3.7.2",
     "reflect-metadata": "^0.1.13",
     "video.js": "^7.20.3",
     "videojs-contrib-quality-levels": "^2.2.0",
-    "videojs-hls-quality-selector": "^1.1.4",
     "vue": "^2.7.10",
     "vue-class-component": "^7.2.6",
     "vue-material-design-icons": "^5.1.2",
diff --git a/src/assets/plyr.svg b/src/assets/plyr.svg
new file mode 100644
index 000000000..62ab2579b
--- /dev/null
+++ b/src/assets/plyr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><symbol id="plyr-airplay" viewBox="0 0 18 18"><path d="M16 1H2a1 1 0 00-1 1v10a1 1 0 001 1h3v-2H3V3h12v8h-2v2h3a1 1 0 001-1V2a1 1 0 00-1-1z"/><path d="M4 17h10l-5-6z"/></symbol><symbol id="plyr-captions-off" viewBox="0 0 18 18"><path d="M1 1c-.6 0-1 .4-1 1v11c0 .6.4 1 1 1h4.6l2.7 2.7c.2.2.4.3.7.3.3 0 .5-.1.7-.3l2.7-2.7H17c.6 0 1-.4 1-1V2c0-.6-.4-1-1-1H1zm4.52 10.15c1.99 0 3.01-1.32 3.28-2.41l-1.29-.39c-.19.66-.78 1.45-1.99 1.45-1.14 0-2.2-.83-2.2-2.34 0-1.61 1.12-2.37 2.18-2.37 1.23 0 1.78.75 1.95 1.43l1.3-.41C8.47 4.96 7.46 3.76 5.5 3.76c-1.9 0-3.61 1.44-3.61 3.7 0 2.26 1.65 3.69 3.63 3.69zm7.57 0c1.99 0 3.01-1.32 3.28-2.41l-1.29-.39c-.19.66-.78 1.45-1.99 1.45-1.14 0-2.2-.83-2.2-2.34 0-1.61 1.12-2.37 2.18-2.37 1.23 0 1.78.75 1.95 1.43l1.3-.41c-.28-1.15-1.29-2.35-3.25-2.35-1.9 0-3.61 1.44-3.61 3.7 0 2.26 1.65 3.69 3.63 3.69z" fill-rule="evenodd" fill-opacity=".5"/></symbol><symbol id="plyr-captions-on" viewBox="0 0 18 18"><path d="M1 1c-.6 0-1 .4-1 1v11c0 .6.4 1 1 1h4.6l2.7 2.7c.2.2.4.3.7.3.3 0 .5-.1.7-.3l2.7-2.7H17c.6 0 1-.4 1-1V2c0-.6-.4-1-1-1H1zm4.52 10.15c1.99 0 3.01-1.32 3.28-2.41l-1.29-.39c-.19.66-.78 1.45-1.99 1.45-1.14 0-2.2-.83-2.2-2.34 0-1.61 1.12-2.37 2.18-2.37 1.23 0 1.78.75 1.95 1.43l1.3-.41C8.47 4.96 7.46 3.76 5.5 3.76c-1.9 0-3.61 1.44-3.61 3.7 0 2.26 1.65 3.69 3.63 3.69zm7.57 0c1.99 0 3.01-1.32 3.28-2.41l-1.29-.39c-.19.66-.78 1.45-1.99 1.45-1.14 0-2.2-.83-2.2-2.34 0-1.61 1.12-2.37 2.18-2.37 1.23 0 1.78.75 1.95 1.43l1.3-.41c-.28-1.15-1.29-2.35-3.25-2.35-1.9 0-3.61 1.44-3.61 3.7 0 2.26 1.65 3.69 3.63 3.69z" fill-rule="evenodd"/></symbol><symbol id="plyr-download" viewBox="0 0 18 18"><path d="M9 13c.3 0 .5-.1.7-.3L15.4 7 14 5.6l-4 4V1H8v8.6l-4-4L2.6 7l5.7 5.7c.2.2.4.3.7.3zm-7 2h14v2H2z"/></symbol><symbol id="plyr-enter-fullscreen" viewBox="0 0 18 18"><path d="M10 3h3.6l-4 4L11 8.4l4-4V8h2V1h-7zM7 9.6l-4 4V10H1v7h7v-2H4.4l4-4z"/></symbol><symbol id="plyr-exit-fullscreen" viewBox="0 0 18 18"><path d="M1 12h3.6l-4 4L2 17.4l4-4V17h2v-7H1zM16 .6l-4 4V1h-2v7h7V6h-3.6l4-4z"/></symbol><symbol id="plyr-fast-forward" viewBox="0 0 18 18"><path d="M7.875 7.171L0 1v16l7.875-6.171V17L18 9 7.875 1z"/></symbol><symbol id="plyr-logo-vimeo" viewBox="0 0 18 18"><path d="M17 5.3c-.1 1.6-1.2 3.7-3.3 6.4-2.2 2.8-4 4.2-5.5 4.2-.9 0-1.7-.9-2.4-2.6C5 10.9 4.4 6 3 6c-.1 0-.5.3-1.2.8l-.8-1c.8-.7 3.5-3.4 4.7-3.5 1.2-.1 2 .7 2.3 2.5.3 2 .8 6.1 1.8 6.1.9 0 2.5-3.4 2.6-4 .1-.9-.3-1.9-2.3-1.1.8-2.6 2.3-3.8 4.5-3.8 1.7.1 2.5 1.2 2.4 3.3z"/></symbol><symbol id="plyr-logo-youtube" viewBox="0 0 18 18"><path d="M16.8 5.8c-.2-1.3-.8-2.2-2.2-2.4C12.4 3 9 3 9 3s-3.4 0-5.6.4C2 3.6 1.3 4.5 1.2 5.8 1 7.1 1 9 1 9s0 1.9.2 3.2c.2 1.3.8 2.2 2.2 2.4C5.6 15 9 15 9 15s3.4 0 5.6-.4c1.4-.3 2-1.1 2.2-2.4.2-1.3.2-3.2.2-3.2s0-1.9-.2-3.2zM7 12V6l5 3-5 3z"/></symbol><symbol id="plyr-muted" viewBox="0 0 18 18"><path d="M12.4 12.5l2.1-2.1 2.1 2.1 1.4-1.4L15.9 9 18 6.9l-1.4-1.4-2.1 2.1-2.1-2.1L11 6.9 13.1 9 11 11.1zM3.786 6.008H.714C.286 6.008 0 6.31 0 6.76v4.512c0 .452.286.752.714.752h3.072l4.071 3.858c.5.3 1.143 0 1.143-.602V2.752c0-.601-.643-.977-1.143-.601L3.786 6.008z"/></symbol><symbol id="plyr-pause" viewBox="0 0 18 18"><path d="M6 1H3c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h3c.6 0 1-.4 1-1V2c0-.6-.4-1-1-1zm6 0c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h3c.6 0 1-.4 1-1V2c0-.6-.4-1-1-1h-3z"/></symbol><symbol id="plyr-pip" viewBox="0 0 18 18"><path d="M13.293 3.293L7.022 9.564l1.414 1.414 6.271-6.271L17 7V1h-6z"/><path d="M13 15H3V5h5V3H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1v-6h-2v5z"/></symbol><symbol id="plyr-play" viewBox="0 0 18 18"><path d="M15.562 8.1L3.87.225c-.818-.562-1.87 0-1.87.9v15.75c0 .9 1.052 1.462 1.87.9L15.563 9.9c.584-.45.584-1.35 0-1.8z"/></symbol><symbol id="plyr-restart" viewBox="0 0 18 18"><path d="M9.7 1.2l.7 6.4 2.1-2.1c1.9 1.9 1.9 5.1 0 7-.9 1-2.2 1.5-3.5 1.5-1.3 0-2.6-.5-3.5-1.5-1.9-1.9-1.9-5.1 0-7 .6-.6 1.4-1.1 2.3-1.3l-.6-1.9C6 2.6 4.9 3.2 4 4.1 1.3 6.8 1.3 11.2 4 14c1.3 1.3 3.1 2 4.9 2 1.9 0 3.6-.7 4.9-2 2.7-2.7 2.7-7.1 0-9.9L16 1.9l-6.3-.7z"/></symbol><symbol id="plyr-rewind" viewBox="0 0 18 18"><path d="M10.125 1L0 9l10.125 8v-6.171L18 17V1l-7.875 6.171z"/></symbol><symbol id="plyr-settings" viewBox="0 0 18 18"><path d="M16.135 7.784a2 2 0 01-1.23-2.969c.322-.536.225-.998-.094-1.316l-.31-.31c-.318-.318-.78-.415-1.316-.094a2 2 0 01-2.969-1.23C10.065 1.258 9.669 1 9.219 1h-.438c-.45 0-.845.258-.997.865a2 2 0 01-2.969 1.23c-.536-.322-.999-.225-1.317.093l-.31.31c-.318.318-.415.781-.093 1.317a2 2 0 01-1.23 2.969C1.26 7.935 1 8.33 1 8.781v.438c0 .45.258.845.865.997a2 2 0 011.23 2.969c-.322.536-.225.998.094 1.316l.31.31c.319.319.782.415 1.316.094a2 2 0 012.969 1.23c.151.607.547.865.997.865h.438c.45 0 .845-.258.997-.865a2 2 0 012.969-1.23c.535.321.997.225 1.316-.094l.31-.31c.318-.318.415-.781.094-1.316a2 2 0 011.23-2.969c.607-.151.865-.547.865-.997v-.438c0-.451-.26-.846-.865-.997zM9 12a3 3 0 110-6 3 3 0 010 6z"/></symbol><symbol id="plyr-volume" viewBox="0 0 18 18"><path d="M15.6 3.3c-.4-.4-1-.4-1.4 0-.4.4-.4 1 0 1.4C15.4 5.9 16 7.4 16 9c0 1.6-.6 3.1-1.8 4.3-.4.4-.4 1 0 1.4.2.2.5.3.7.3.3 0 .5-.1.7-.3C17.1 13.2 18 11.2 18 9s-.9-4.2-2.4-5.7z"/><path d="M11.282 5.282a.909.909 0 000 1.316c.735.735.995 1.458.995 2.402 0 .936-.425 1.917-.995 2.487a.909.909 0 000 1.316c.145.145.636.262 1.018.156a.725.725 0 00.298-.156C13.773 11.733 14.13 10.16 14.13 9c0-.17-.002-.34-.011-.51-.053-.992-.319-2.005-1.522-3.208a.909.909 0 00-1.316 0zm-7.496.726H.714C.286 6.008 0 6.31 0 6.76v4.512c0 .452.286.752.714.752h3.072l4.071 3.858c.5.3 1.143 0 1.143-.602V2.752c0-.601-.643-.977-1.143-.601L3.786 6.008z"/></symbol></svg>
\ No newline at end of file
diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index bd7740bf1..6b4212467 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -6,10 +6,13 @@ import { showError } from "@nextcloud/dialogs";
 import { translate as t } from "@nextcloud/l10n";
 import { getCurrentUser } from "@nextcloud/auth";
 
+import Plyr from "plyr";
+import "plyr/dist/plyr.css";
+import plyrsvg from "../assets/plyr.svg";
+
 import videojs from "video.js";
 import "video.js/dist/video-js.min.css";
 import "videojs-contrib-quality-levels";
-import "videojs-hls-quality-selector";
 
 const config_noTranscode = loadState(
   "memories",
@@ -139,8 +142,11 @@ class VideoContentSetup {
         );
       }
     }
+
+    // Add the video element to the actual container
     content.element.appendChild(content.videoElement);
 
+    // Get file id
     const fileid = content.data.photo.fileid;
 
     // Create hls sources if enabled
@@ -164,7 +170,7 @@ class VideoContentSetup {
     content.videojs = videojs(content.videoElement, {
       fill: true,
       autoplay: true,
-      controls: true,
+      controls: false,
       sources: sources,
       preload: "metadata",
       playbackRates: [0.5, 1, 1.5, 2],
@@ -198,11 +204,6 @@ class VideoContentSetup {
       }
     });
 
-    content.videojs.qualityLevels();
-    content.videojs.hlsQualitySelector({
-      displayCurrentQuality: true,
-    });
-
     setTimeout(() => {
       content.videojs
         .contentEl()
@@ -220,6 +221,9 @@ class VideoContentSetup {
       canPlay = true;
       this.updateRotation(content);
     });
+    content.videojs.on("loadedmetadata", () => {
+      this.initPlyr(content);
+    });
 
     // Get correct orientation
     axios
@@ -242,6 +246,10 @@ class VideoContentSetup {
       content.videojs.dispose();
       content.videojs = null;
 
+      content.plyr.elements.container.remove();
+      content.plyr.destroy();
+      content.plyr = null;
+
       const elem: HTMLDivElement = content.element;
       while (elem.lastElementChild) {
         elem.removeChild(elem.lastElementChild);
@@ -250,6 +258,73 @@ class VideoContentSetup {
     }
   }
 
+  initPlyr(content: any) {
+    if (content.plyr) return;
+
+    // Retain original parent for video element
+    const origParent = content.videoElement.parentElement;
+
+    // Populate quality list
+    const qualityList = content.videojs?.qualityLevels();
+    let qualityNums: number[];
+    if (qualityList && qualityList.length > 1) {
+      const s = new Set<number>();
+      for (let i = 0; i < qualityList?.length; i++) {
+        const { width, height } = qualityList[i];
+        s.add(Math.min(width, height));
+      }
+      qualityNums = Array.from(s).sort((a, b) => b - a);
+      qualityNums.unshift(0);
+    }
+
+    // Create a second container element to append the video
+    // temporarily, so we can put the plyr controls there. This is
+    // required because controls have to fill the entire space
+    // const pc = document.createElement("div");
+    // pc.appendChild(content.videoElement);
+    const plyr = new Plyr(content.videoElement, {
+      iconUrl: <any>plyrsvg,
+      quality: !qualityNums
+        ? undefined
+        : {
+            default: 0,
+            options: qualityNums,
+            forced: true,
+            onChange: (quality: number) => {
+              if (!qualityList || !content.videojs) return;
+              for (let i = 0; i < qualityList.length; ++i) {
+                const { width, height } = qualityList[i];
+                const pixels = Math.min(width, height);
+                qualityList[i].enabled = pixels === quality || !quality;
+              }
+            },
+          },
+      i18n: {
+        qualityLabel: {
+          0: t("memories", "Auto"),
+        },
+      },
+    });
+    plyr.elements.container.style.height = "100%";
+    plyr.elements.container.style.width = "100%";
+    plyr.elements.container
+      .querySelectorAll("button")
+      .forEach((el) => el.classList.add("button-vue"));
+    plyr.elements.container
+      .querySelectorAll("progress")
+      .forEach((el) => el.classList.add("vue"));
+    plyr.elements.container.style.backgroundColor = "transparent";
+    plyr.elements.wrapper.style.backgroundColor = "transparent";
+
+    content.plyr = plyr;
+    globalThis.plyr = plyr;
+
+    // Restore original parent of video element
+    origParent.appendChild(content.videoElement);
+    // Move plyr to the slide container
+    content.slide.holderElement.appendChild(plyr.elements.container);
+  }
+
   updateRotation(content, val?: number) {
     if (!content.videojs || !content.videoElement) {
       return;

From 80ac6355d634f83e9d702b0d7904dfadf972f0e2 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 21:33:11 -0800
Subject: [PATCH 108/163] Fix fullscreen

---
 src/components/PsVideo.ts | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 6b4212467..3016d36e3 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -205,16 +205,8 @@ class VideoContentSetup {
     });
 
     setTimeout(() => {
-      content.videojs
-        .contentEl()
-        .querySelectorAll("button")
-        .forEach((b: HTMLButtonElement) => {
-          b.classList.add("button-vue");
-        });
-
-      // iOS needs this
-      content.videojs.play();
-    }, 500);
+      content.videojs.play(); // iOS needs this
+    }, 200);
 
     let canPlay = false;
     content.videojs.on("canplay", () => {
@@ -280,8 +272,6 @@ class VideoContentSetup {
     // Create a second container element to append the video
     // temporarily, so we can put the plyr controls there. This is
     // required because controls have to fill the entire space
-    // const pc = document.createElement("div");
-    // pc.appendChild(content.videoElement);
     const plyr = new Plyr(content.videoElement, {
       iconUrl: <any>plyrsvg,
       quality: !qualityNums
@@ -304,6 +294,10 @@ class VideoContentSetup {
           0: t("memories", "Auto"),
         },
       },
+      fullscreen: {
+        enabled: true,
+        container: ".pswp__item",
+      },
     });
     plyr.elements.container.style.height = "100%";
     plyr.elements.container.style.width = "100%";
@@ -317,7 +311,6 @@ class VideoContentSetup {
     plyr.elements.wrapper.style.backgroundColor = "transparent";
 
     content.plyr = plyr;
-    globalThis.plyr = plyr;
 
     // Restore original parent of video element
     origParent.appendChild(content.videoElement);

From 0bcc0fda342e442f4a1c28fda62f2ac1a50040e1 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 21:41:04 -0800
Subject: [PATCH 109/163] plyr: more fixes

---
 src/components/PsVideo.ts | 42 ++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 3016d36e3..5fd2a7dbc 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -269,26 +269,10 @@ class VideoContentSetup {
       qualityNums.unshift(0);
     }
 
-    // Create a second container element to append the video
-    // temporarily, so we can put the plyr controls there. This is
-    // required because controls have to fill the entire space
-    const plyr = new Plyr(content.videoElement, {
+    // Create the plyr instance
+    const opts: Plyr.Options = {
       iconUrl: <any>plyrsvg,
-      quality: !qualityNums
-        ? undefined
-        : {
-            default: 0,
-            options: qualityNums,
-            forced: true,
-            onChange: (quality: number) => {
-              if (!qualityList || !content.videojs) return;
-              for (let i = 0; i < qualityList.length; ++i) {
-                const { width, height } = qualityList[i];
-                const pixels = Math.min(width, height);
-                qualityList[i].enabled = pixels === quality || !quality;
-              }
-            },
-          },
+      blankVideo: "",
       i18n: {
         qualityLabel: {
           0: t("memories", "Auto"),
@@ -298,7 +282,25 @@ class VideoContentSetup {
         enabled: true,
         container: ".pswp__item",
       },
-    });
+    };
+
+    if (qualityNums) {
+      opts.quality = {
+        default: 0,
+        options: qualityNums,
+        forced: true,
+        onChange: (quality: number) => {
+          if (!qualityList || !content.videojs) return;
+          for (let i = 0; i < qualityList.length; ++i) {
+            const { width, height } = qualityList[i];
+            const pixels = Math.min(width, height);
+            qualityList[i].enabled = pixels === quality || !quality;
+          }
+        },
+      };
+    }
+
+    const plyr = new Plyr(content.videoElement, opts);
     plyr.elements.container.style.height = "100%";
     plyr.elements.container.style.width = "100%";
     plyr.elements.container

From 478f884a213f2dcbc62c58aa5a165a04729d786a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 21:43:43 -0800
Subject: [PATCH 110/163] Fix plyr color

---
 src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.vue b/src/App.vue
index da1cc0270..9d1c07313 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -199,6 +199,7 @@ export default class App extends Mixins(GlobalMixin, UserConfig) {
     const colorPrimary =
       getComputedStyle(root).getPropertyValue("--color-primary");
     root.style.setProperty("--color-primary-select-light", `${colorPrimary}40`);
+    root.style.setProperty("--plyr-color-main", colorPrimary);
 
     // Register sidebar metadata tab
     const OCA = globalThis.OCA;

From 8a0da692766b6386eebe9b5a138b2802eb277dca Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 21:45:18 -0800
Subject: [PATCH 111/163] plyr: fix seeking

---
 src/components/PsVideo.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 5fd2a7dbc..740828a9c 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -78,7 +78,7 @@ class VideoContentSetup {
             origEvent.clientX,
             origEvent.clientY
           );
-          if (elems.some((el) => el.classList.contains("vjs-control-bar"))) {
+          if (elems.some((el) => el.classList.contains("plyr__controls"))) {
             e.preventDefault();
             return;
           }

From ba00ddd9c2a9159e9a49582595727847ebe98f8f Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 21:54:03 -0800
Subject: [PATCH 112/163] plyr: hide volume on mobile

---
 src/components/Viewer.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 834dbcc4f..3b268ddba 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -843,6 +843,13 @@ export default class Viewer extends Mixins(GlobalMixin) {
   display: none;
 }
 
+:deep .plyr__volume {
+  // Cannot be vertical yet :(
+  @media (max-width: 768px) {
+    display: none;
+  }
+}
+
 :deep .pswp {
   .pswp__zoom-wrap {
     width: 100%;

From 09c62f32b95f49bae84dfb3024b2daf5b9801925 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 22:58:59 -0800
Subject: [PATCH 113/163] Fix rotation and controls on ios

---
 src/components/PsVideo.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 740828a9c..6cbddbb55 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -209,11 +209,9 @@ class VideoContentSetup {
     }, 200);
 
     let canPlay = false;
-    content.videojs.on("canplay", () => {
-      canPlay = true;
-      this.updateRotation(content);
-    });
     content.videojs.on("loadedmetadata", () => {
+      canPlay = true;
+      this.updateRotation(content); // also gets the correct video elem as a side effect
       this.initPlyr(content);
     });
 
@@ -238,8 +236,8 @@ class VideoContentSetup {
       content.videojs.dispose();
       content.videojs = null;
 
-      content.plyr.elements.container.remove();
-      content.plyr.destroy();
+      content.plyr?.elements?.container?.remove();
+      content.plyr?.destroy();
       content.plyr = null;
 
       const elem: HTMLDivElement = content.element;
@@ -321,9 +319,10 @@ class VideoContentSetup {
   }
 
   updateRotation(content, val?: number) {
-    if (!content.videojs || !content.videoElement) {
-      return;
-    }
+    if (!content.videojs) return;
+
+    content.videoElement = content.videojs.el()?.querySelector("video");
+    if (!content.videoElement) return;
 
     const rotation = val ?? Number(content.data.exif?.Rotation);
     const shouldRotate = content.videojs?.src().includes("m3u8");

From 6eb4327730802b9315c487b292ab1e7ff86941dc Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 23:06:40 -0800
Subject: [PATCH 114/163] Bump up go-vod

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index d36335679..af50615c4 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.8"
+govod="0.0.9"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From 0bc61df92240958bee557a2ce25cd6e4e0742c99 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 23:07:34 -0800
Subject: [PATCH 115/163] release: v4.7.0

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index a68ba3aed..e875b8633 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-beta.5</version>
+    <version>4.7.0</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From eb9aed441b0e32ada256baabea906f8bd18a7c4f Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 23:35:01 -0800
Subject: [PATCH 116/163] Make video fill up space

---
 src/components/Viewer.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 3b268ddba..df06ffd47 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -534,10 +534,21 @@ export default class Viewer extends Mixins(GlobalMixin) {
       previewUrl = generateUrl(getDownloadLink(photo));
     }
 
+    // Get height and width
+    let w = photo.w;
+    let h = photo.h;
+
+    if (isvideo && w && h) {
+      // For videos, make sure the screen is filled up,
+      // by scaling up the video by a maximum of 4x
+      w *= 4;
+      h *= 4;
+    }
+
     return {
       src: previewUrl,
-      width: photo.w || undefined,
-      height: photo.h || undefined,
+      width: w || undefined,
+      height: h || undefined,
       thumbCropped: true,
       photo: photo,
       type: isvideo ? "video" : "image",

From ed898cdd8d84e2b42353b35eedb669650a8033a5 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 13 Nov 2022 23:48:44 -0800
Subject: [PATCH 117/163] Update sponsorship in readme

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c17e36fc0..0ee99595a 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
 [![Demo](https://img.shields.io/badge/demo-online-blue)](https://memories-demo.radialapps.com/apps/memories/)
 [![Gitter](https://img.shields.io/gitter/room/pulsejet/memories)](https://gitter.im/pulsejet/memories)
 [![GitHub issues](https://img.shields.io/github/issues/pulsejet/memories)](https://github.com/pulsejet/memories/issues)
+![GitHub Sponsor](https://img.shields.io/github/sponsors/pulsejet?logo=GitHub)
 
 Memories is a _batteries-included_ photo management solution for Nextcloud with advanced features including:
 
@@ -42,12 +43,12 @@ Memories is a _batteries-included_ photo management solution for Nextcloud with
 1. ✅ Enable the app through the app management of your Nextcloud.
 1. ⚒️ (Strongly recommended) use VS Code and install Vetur and Prettier.
 
-## How to support development
+## Support the project
 
-1. **🌟 Star this repository**: This is the easiest way to support the project and costs nothing.
-1. **🪲 Report bugs**: If you find a bug, please report it on the issue tracker.
-1. **📝 Contribute**: If you want to contribute, please read file / comment on an issue and ask for guidance.
-1. **🪙 Sponsorship**: If you want to support the project financially, you can donate to the project on [GitHub](https://github.com/sponsors/pulsejet).
+1. **🌟 Star this repository**: This is the easiest way to support Memories and costs nothing.
+1. **🪲 Report bugs**: Report any bugs you find on the issue tracker.
+1. **📝 Contribute**: Read and file or comment on an issue and ask for guidance.
+1. **🪙 Sponsorship**: You can support the project financially at [GitHub Sponsors](https://github.com/sponsors/pulsejet).
 
 ## Special Thanks
 

From bd8a8c15797f24ed868afd0afa2d69c44b435a7b Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 00:03:46 -0800
Subject: [PATCH 118/163] readme: thank you @mpodshivalin!

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 0ee99595a..c7febf293 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,10 @@ Memories is a _batteries-included_ photo management solution for Nextcloud with
 1. **📝 Contribute**: Read and file or comment on an issue and ask for guidance.
 1. **🪙 Sponsorship**: You can support the project financially at [GitHub Sponsors](https://github.com/sponsors/pulsejet).
 
+A shout out to the current and past financial backers of Memories! See the sponsors page for a full list.
+
+[<img src="https://github.com/mpodshivalin.png" width="42" />](https://github.com/mpodshivalin)
+
 ## Special Thanks
 
 Nextcloud team. A lot of this work is based on [Photos](https://github.com/nextcloud/photos).

From 649c0659c73cdf709bce36f2a30ec72ace970225 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 00:05:29 -0800
Subject: [PATCH 119/163] readme: make sponsors badge a link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c7febf293..0cc2aa369 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 [![Demo](https://img.shields.io/badge/demo-online-blue)](https://memories-demo.radialapps.com/apps/memories/)
 [![Gitter](https://img.shields.io/gitter/room/pulsejet/memories)](https://gitter.im/pulsejet/memories)
 [![GitHub issues](https://img.shields.io/github/issues/pulsejet/memories)](https://github.com/pulsejet/memories/issues)
-![GitHub Sponsor](https://img.shields.io/github/sponsors/pulsejet?logo=GitHub)
+[![GitHub Sponsor](https://img.shields.io/github/sponsors/pulsejet?logo=GitHub)](https://github.com/sponsors/pulsejet)
 
 Memories is a _batteries-included_ photo management solution for Nextcloud with advanced features including:
 

From 39daae1cb765dc9ed26bdace3aa22351d168121a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 00:24:23 -0800
Subject: [PATCH 120/163] Make sure transcoder is executable (fix #193)

---
 lib/Controller/VideoController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 66f14345d..bf8d531f5 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -90,6 +90,11 @@ public function transcode(string $client, string $fileid, string $profile): Http
                 return new JSONResponse(['message' => 'Transcoder not configured'], Http::STATUS_INTERNAL_SERVER_ERROR);
             }
 
+            // Make transcoder executable
+            if (!is_executable($transcoder)) {
+                chmod($transcoder, 0755);
+            }
+
             // Check for environment variables
             $vaapi = $this->config->getSystemValue('memories.qsv', false);
             $env = '';

From d9e3d3e0c1c117daf1dea66a285642f404b521c4 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 01:02:14 -0800
Subject: [PATCH 121/163] Update go-vod

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index af50615c4..980f0095c 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.9"
+govod="0.0.10"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From 103cce1a353b3569a1b956ba77da8a11ef29c51a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 01:10:43 -0800
Subject: [PATCH 122/163] video: fix initial quality switch

---
 src/components/PsVideo.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 6cbddbb55..1d35a6786 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -215,6 +215,12 @@ class VideoContentSetup {
       this.initPlyr(content);
     });
 
+    content.videojs.qualityLevels()?.on("addqualitylevel", (e) => {
+      window.setTimeout(() => {
+        this.initPlyr(content);
+      }, 0);
+    });
+
     // Get correct orientation
     axios
       .get<any>(
@@ -251,6 +257,9 @@ class VideoContentSetup {
   initPlyr(content: any) {
     if (content.plyr) return;
 
+    content.videoElement = content.videojs?.el()?.querySelector("video");
+    if (!content.videoElement) return;
+
     // Retain original parent for video element
     const origParent = content.videoElement.parentElement;
 

From c237d27e8226248ea44ae5b5f7541a8471e1cfab Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 01:26:21 -0800
Subject: [PATCH 123/163] Bump go-vod

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 980f0095c..6f78f136f 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.10"
+govod="0.0.11"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From 36a809149b696e4362902815a1853fbb7cad82d7 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 01:27:04 -0800
Subject: [PATCH 124/163] release: v4.7.1

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index e875b8633..e52824146 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0</version>
+    <version>4.7.1</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From 63990e524043b5048abcf2ec421b97322c038491 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Mon, 14 Nov 2022 10:39:02 +0000
Subject: [PATCH 125/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/bg.js      | 1 +
 l10n/bg.json    | 1 +
 l10n/ca.js      | 3 ++-
 l10n/ca.json    | 3 ++-
 l10n/cs.js      | 1 +
 l10n/cs.json    | 1 +
 l10n/cy_GB.js   | 3 ++-
 l10n/cy_GB.json | 3 ++-
 l10n/da.js      | 1 +
 l10n/da.json    | 1 +
 l10n/de.js      | 1 +
 l10n/de.json    | 1 +
 l10n/de_DE.js   | 1 +
 l10n/de_DE.json | 1 +
 l10n/el.js      | 3 ++-
 l10n/el.json    | 3 ++-
 l10n/eo.js      | 3 ++-
 l10n/eo.json    | 3 ++-
 l10n/es.js      | 1 +
 l10n/es.json    | 1 +
 l10n/es_GT.js   | 3 ++-
 l10n/es_GT.json | 3 ++-
 l10n/eu.js      | 1 +
 l10n/eu.json    | 1 +
 l10n/fa.js      | 3 ++-
 l10n/fa.json    | 3 ++-
 l10n/fi.js      | 1 +
 l10n/fi.json    | 1 +
 l10n/fr.js      | 1 +
 l10n/fr.json    | 1 +
 l10n/gl.js      | 3 ++-
 l10n/gl.json    | 3 ++-
 l10n/he.js      | 3 ++-
 l10n/he.json    | 3 ++-
 l10n/hr.js      | 3 ++-
 l10n/hr.json    | 3 ++-
 l10n/hu.js      | 2 ++
 l10n/hu.json    | 2 ++
 l10n/is.js      | 3 ++-
 l10n/is.json    | 3 ++-
 l10n/it.js      | 3 ++-
 l10n/it.json    | 3 ++-
 l10n/ja.js      | 3 ++-
 l10n/ja.json    | 3 ++-
 l10n/ko.js      | 3 ++-
 l10n/ko.json    | 3 ++-
 l10n/lt_LT.js   | 1 +
 l10n/lt_LT.json | 1 +
 l10n/lv.js      | 1 +
 l10n/lv.json    | 1 +
 l10n/mk.js      | 1 +
 l10n/mk.json    | 1 +
 l10n/nb.js      | 3 ++-
 l10n/nb.json    | 3 ++-
 l10n/nl.js      | 3 ++-
 l10n/nl.json    | 3 ++-
 l10n/pl.js      | 1 +
 l10n/pl.json    | 1 +
 l10n/pt_BR.js   | 1 +
 l10n/pt_BR.json | 1 +
 l10n/pt_PT.js   | 1 +
 l10n/pt_PT.json | 1 +
 l10n/ro.js      | 3 ++-
 l10n/ro.json    | 3 ++-
 l10n/ru.js      | 1 +
 l10n/ru.json    | 1 +
 l10n/sc.js      | 3 ++-
 l10n/sc.json    | 3 ++-
 l10n/sk.js      | 1 +
 l10n/sk.json    | 1 +
 l10n/sl.js      | 3 ++-
 l10n/sl.json    | 3 ++-
 l10n/sr.js      | 3 ++-
 l10n/sr.json    | 3 ++-
 l10n/sv.js      | 1 +
 l10n/sv.json    | 1 +
 l10n/tr.js      | 2 ++
 l10n/tr.json    | 2 ++
 l10n/uk.js      | 1 +
 l10n/uk.json    | 1 +
 l10n/vi.js      | 3 ++-
 l10n/vi.json    | 3 ++-
 l10n/zh_CN.js   | 1 +
 l10n/zh_CN.json | 1 +
 l10n/zh_HK.js   | 1 +
 l10n/zh_HK.json | 1 +
 l10n/zh_TW.js   | 4 ++++
 l10n/zh_TW.json | 4 ++++
 88 files changed, 138 insertions(+), 40 deletions(-)

diff --git a/l10n/bg.js b/l10n/bg.js
index 42f08eb42..996ca0565 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -217,6 +217,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Обърнете внимание, че избраната област за изрязване е по-ниска от приложеното преоразмеряване, което може да доведе до влошаване на качеството",
     "Actual size (100%)" : "Действителен размер (100%)",
     "Fit size" : "Подходящ размер",
+    "Auto" : "Автоматично",
     "Shared Folder" : "Споделена папка",
     "Failed to create {albumName}." : "Неуспешно създаване на {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименуване от {currentAlbumName} на {newAlbumName}.",
diff --git a/l10n/bg.json b/l10n/bg.json
index 628e79d0c..d97c266ff 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -215,6 +215,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Обърнете внимание, че избраната област за изрязване е по-ниска от приложеното преоразмеряване, което може да доведе до влошаване на качеството",
     "Actual size (100%)" : "Действителен размер (100%)",
     "Fit size" : "Подходящ размер",
+    "Auto" : "Автоматично",
     "Shared Folder" : "Споделена папка",
     "Failed to create {albumName}." : "Неуспешно създаване на {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименуване от {currentAlbumName} на {newAlbumName}.",
diff --git a/l10n/ca.js b/l10n/ca.js
index c2418d1a1..65d42078f 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -121,6 +121,7 @@ OC.L10N.register(
     "Saved image size (width x height)" : "Mida de la imatge desada (amplada x alçada)",
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tingueu en compte que l'àrea de retall seleccionada és inferior al canvi de mida aplicat, cosa que pot provocar una disminució de la qualitat",
     "Actual size (100%)" : "Mida real (100%)",
-    "Fit size" : "Talla ajustada"
+    "Fit size" : "Talla ajustada",
+    "Auto" : "Automàtic"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ca.json b/l10n/ca.json
index dfb91d27c..6aa4f2c20 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -119,6 +119,7 @@
     "Saved image size (width x height)" : "Mida de la imatge desada (amplada x alçada)",
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tingueu en compte que l'àrea de retall seleccionada és inferior al canvi de mida aplicat, cosa que pot provocar una disminució de la qualitat",
     "Actual size (100%)" : "Mida real (100%)",
-    "Fit size" : "Talla ajustada"
+    "Fit size" : "Talla ajustada",
+    "Auto" : "Automàtic"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/cs.js b/l10n/cs.js
index e2ac7f0e1..3a6c5c72d 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -221,6 +221,7 @@ OC.L10N.register(
     "Actual size (100%)" : "Skutečná velikost (100%)",
     "Fit size" : "Přizpůsobit velikost",
     "Transcoding failed." : "Překódování se nezdařilo.",
+    "Auto" : "Automaticky",
     "Shared Folder" : "Sdílená složka",
     "Failed to create {albumName}." : "Nepodařilo se vytvořit {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepodařilo přejmenovat {currentAlbumName} to {newAlbumName}.",
diff --git a/l10n/cs.json b/l10n/cs.json
index e4f506b7d..637949601 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -219,6 +219,7 @@
     "Actual size (100%)" : "Skutečná velikost (100%)",
     "Fit size" : "Přizpůsobit velikost",
     "Transcoding failed." : "Překódování se nezdařilo.",
+    "Auto" : "Automaticky",
     "Shared Folder" : "Sdílená složka",
     "Failed to create {albumName}." : "Nepodařilo se vytvořit {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepodařilo přejmenovat {currentAlbumName} to {newAlbumName}.",
diff --git a/l10n/cy_GB.js b/l10n/cy_GB.js
index 92805fea1..2e81565b4 100644
--- a/l10n/cy_GB.js
+++ b/l10n/cy_GB.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Refresh" : "Ail-lwytho",
     "Undo" : "Dadwneud",
     "Custom" : "Cyfaddas",
-    "Size" : "Maint"
+    "Size" : "Maint",
+    "Auto" : "Awto"
 },
 "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/l10n/cy_GB.json b/l10n/cy_GB.json
index 715bffd21..503832cde 100644
--- a/l10n/cy_GB.json
+++ b/l10n/cy_GB.json
@@ -23,6 +23,7 @@
     "Refresh" : "Ail-lwytho",
     "Undo" : "Dadwneud",
     "Custom" : "Cyfaddas",
-    "Size" : "Maint"
+    "Size" : "Maint",
+    "Auto" : "Awto"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/da.js b/l10n/da.js
index af60c4335..f3a40e01f 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Position" : "Position",
     "Extension" : "Filtype",
     "Name is required." : "Navn er påkrævet.",
+    "Auto" : "Auto",
     "Failed to delete files." : "Kunne ikke slette filer.",
     "Failed to delete {fileName}." : "Kunne ikke slette {fileName}.",
     "Failed to favorite files." : "Kunne ikke vælge favorit filer.",
diff --git a/l10n/da.json b/l10n/da.json
index 8ee94fcf2..b63c3b91c 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -64,6 +64,7 @@
     "Position" : "Position",
     "Extension" : "Filtype",
     "Name is required." : "Navn er påkrævet.",
+    "Auto" : "Auto",
     "Failed to delete files." : "Kunne ikke slette filer.",
     "Failed to delete {fileName}." : "Kunne ikke slette {fileName}.",
     "Failed to favorite files." : "Kunne ikke vælge favorit filer.",
diff --git a/l10n/de.js b/l10n/de.js
index 5b691a8e3..3369af5f0 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -196,6 +196,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachte, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann.",
     "Actual size (100%)" : "Tatsächliche Größe (100%)",
     "Fit size" : "Größe anpassen",
+    "Auto" : "Automatisch",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
     "General Failure" : "Allgemeiner Fehler",
diff --git a/l10n/de.json b/l10n/de.json
index 4b59a866a..2548d1f4c 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -194,6 +194,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachte, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann.",
     "Actual size (100%)" : "Tatsächliche Größe (100%)",
     "Fit size" : "Größe anpassen",
+    "Auto" : "Automatisch",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
     "General Failure" : "Allgemeiner Fehler",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 9bb6cb4ac..32d6ddca8 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -221,6 +221,7 @@ OC.L10N.register(
     "Actual size (100%)" : "Tatsächliche Größe (100%)",
     "Fit size" : "Größe anpassen",
     "Transcoding failed." : "Transkodierung fehlgeschlagen.",
+    "Auto" : "Automatisch",
     "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index b4a902b8e..e9dfac143 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -219,6 +219,7 @@
     "Actual size (100%)" : "Tatsächliche Größe (100%)",
     "Fit size" : "Größe anpassen",
     "Transcoding failed." : "Transkodierung fehlgeschlagen.",
+    "Auto" : "Automatisch",
     "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
diff --git a/l10n/el.js b/l10n/el.js
index c24d6f3a3..336c7cce1 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -50,6 +50,7 @@ OC.L10N.register(
     "Position" : "Θέση",
     "Extension" : "Επέκταση",
     "Name is required." : "Απαιτείται όνομα.",
-    "Quality" : "Ποιότητα"
+    "Quality" : "Ποιότητα",
+    "Auto" : "Αυτόματα"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/el.json b/l10n/el.json
index ae6e143f3..04095a2a3 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -48,6 +48,7 @@
     "Position" : "Θέση",
     "Extension" : "Επέκταση",
     "Name is required." : "Απαιτείται όνομα.",
-    "Quality" : "Ποιότητα"
+    "Quality" : "Ποιότητα",
+    "Auto" : "Αυτόματα"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/eo.js b/l10n/eo.js
index 2ce109096..d66be4036 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "Text" : "Teksto",
     "Size" : "Grando",
     "Position" : "Loko",
-    "Extension" : "Dosiersufikso"
+    "Extension" : "Dosiersufikso",
+    "Auto" : "Aŭtomate"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/eo.json b/l10n/eo.json
index 2952bd625..f7ddbb267 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -34,6 +34,7 @@
     "Text" : "Teksto",
     "Size" : "Grando",
     "Position" : "Loko",
-    "Extension" : "Dosiersufikso"
+    "Extension" : "Dosiersufikso",
+    "Auto" : "Aŭtomate"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
index 690f4197c..0d35a9579 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -218,6 +218,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tenga en cuenta que el área a recortar es menor al redimensionamiento aplicado lo que puede causar pérdida de calidad",
     "Actual size (100%)" : "Tamaño actual (100%)",
     "Fit size" : "Ajustar tamaño",
+    "Auto" : "Auto",
     "Shared Folder" : "Carpeta compartida",
     "Failed to create {albumName}." : "Fallo al crear {albumName}",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Fallo al renombrar {currentAlbumName} a {newAlbumName}.",
diff --git a/l10n/es.json b/l10n/es.json
index 314546c85..b85bfb000 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -216,6 +216,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tenga en cuenta que el área a recortar es menor al redimensionamiento aplicado lo que puede causar pérdida de calidad",
     "Actual size (100%)" : "Tamaño actual (100%)",
     "Fit size" : "Ajustar tamaño",
+    "Auto" : "Auto",
     "Shared Folder" : "Carpeta compartida",
     "Failed to create {albumName}." : "Fallo al crear {albumName}",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Fallo al renombrar {currentAlbumName} a {newAlbumName}.",
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index 3a35c0f8e..eb02434f8 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -34,6 +34,7 @@ OC.L10N.register(
     "Value" : "Valor",
     "Text" : "Texto",
     "Size" : "Tamaño",
-    "Position" : "Posición"
+    "Position" : "Posición",
+    "Auto" : "Auto"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index f61b35380..b6b8b8125 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -32,6 +32,7 @@
     "Value" : "Valor",
     "Text" : "Texto",
     "Size" : "Tamaño",
-    "Position" : "Posición"
+    "Position" : "Posición",
+    "Auto" : "Auto"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/eu.js b/l10n/eu.js
index db4b7dcae..880b196ab 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -176,6 +176,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Kontuan izan hautatutako mozte-eremua aplikatutako tamaina baino txikiagoa dela eta horrek kalitatea gutxitzea eragin dezakeela",
     "Actual size (100%)" : "Benetako tamaina (% 100)",
     "Fit size" : "Egokitu tamaina",
+    "Auto" : "Auto",
     "Failed to create {albumName}." : "Ezin izan da {albumName} sortu.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Ezin izan da {currentAlbumName} berrizendatu {newAlbumName} gisa.",
     "General Failure" : "Hutsegite orokorra",
diff --git a/l10n/eu.json b/l10n/eu.json
index b69619e4a..fb2488de0 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -174,6 +174,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Kontuan izan hautatutako mozte-eremua aplikatutako tamaina baino txikiagoa dela eta horrek kalitatea gutxitzea eragin dezakeela",
     "Actual size (100%)" : "Benetako tamaina (% 100)",
     "Fit size" : "Egokitu tamaina",
+    "Auto" : "Auto",
     "Failed to create {albumName}." : "Ezin izan da {albumName} sortu.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Ezin izan da {currentAlbumName} berrizendatu {newAlbumName} gisa.",
     "General Failure" : "Hutsegite orokorra",
diff --git a/l10n/fa.js b/l10n/fa.js
index bb077fd4d..0a25b373e 100644
--- a/l10n/fa.js
+++ b/l10n/fa.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Value" : "مقدار",
     "Text" : "متن",
     "Size" : "اندازه",
-    "Extension" : "گسترش"
+    "Extension" : "گسترش",
+    "Auto" : "خودکار"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/fa.json b/l10n/fa.json
index 1ee4ebc70..328b30a83 100644
--- a/l10n/fa.json
+++ b/l10n/fa.json
@@ -35,6 +35,7 @@
     "Value" : "مقدار",
     "Text" : "متن",
     "Size" : "اندازه",
-    "Extension" : "گسترش"
+    "Extension" : "گسترش",
+    "Auto" : "خودکار"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/fi.js b/l10n/fi.js
index 18e07b66c..0d5e545a8 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -158,6 +158,7 @@ OC.L10N.register(
     "Quality" : "Laatu",
     "Actual size (100%)" : "Todellinen koko (100 %)",
     "Fit size" : "Sovita koko",
+    "Auto" : "Automaattinen",
     "Shared Folder" : "Jaa kansio",
     "Failed to create {albumName}." : "Albumin {albumName} luominen epäonnistui.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Albumin {currentAlbumName} nimen muuttaminen muotoon {newAlbumName} epäonnistui.",
diff --git a/l10n/fi.json b/l10n/fi.json
index d6b14a800..dbb630063 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -156,6 +156,7 @@
     "Quality" : "Laatu",
     "Actual size (100%)" : "Todellinen koko (100 %)",
     "Fit size" : "Sovita koko",
+    "Auto" : "Automaattinen",
     "Shared Folder" : "Jaa kansio",
     "Failed to create {albumName}." : "Albumin {albumName} luominen epäonnistui.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Albumin {currentAlbumName} nimen muuttaminen muotoon {newAlbumName} epäonnistui.",
diff --git a/l10n/fr.js b/l10n/fr.js
index e15a9c917..fa6dc40aa 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -182,6 +182,7 @@ OC.L10N.register(
     "Actual size (100%)" : "Taille actuelle (100%)",
     "Fit size" : "Adapter à la taille",
     "Transcoding failed." : "Échec du transcodage.",
+    "Auto" : "Auto",
     "Failed to create {albumName}." : "Échec de la création de {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Échec du renommage de {currentAlbumName} en {newAlbumName}.",
     "General Failure" : "Échec général",
diff --git a/l10n/fr.json b/l10n/fr.json
index 09e9e8d81..d0be5c330 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -180,6 +180,7 @@
     "Actual size (100%)" : "Taille actuelle (100%)",
     "Fit size" : "Adapter à la taille",
     "Transcoding failed." : "Échec du transcodage.",
+    "Auto" : "Auto",
     "Failed to create {albumName}." : "Échec de la création de {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Échec du renommage de {currentAlbumName} en {newAlbumName}.",
     "General Failure" : "Échec général",
diff --git a/l10n/gl.js b/l10n/gl.js
index 27cb2961d..4d9591c44 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Position" : "Posicion",
     "Extension" : "Extensión",
     "Name is required." : "É obrigatorio  o nome.",
-    "Quality" : "Calidade"
+    "Quality" : "Calidade",
+    "Auto" : "Automático"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/gl.json b/l10n/gl.json
index 440ff7c4f..b4ad77c8e 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -46,6 +46,7 @@
     "Position" : "Posicion",
     "Extension" : "Extensión",
     "Name is required." : "É obrigatorio  o nome.",
-    "Quality" : "Calidade"
+    "Quality" : "Calidade",
+    "Auto" : "Automático"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/he.js b/l10n/he.js
index 7e758f485..d23dd9865 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -45,6 +45,7 @@ OC.L10N.register(
     "Position" : "מיקום",
     "Extension" : "הרחבה",
     "Name is required." : "נדרש שם.",
-    "Quality" : "איכות"
+    "Quality" : "איכות",
+    "Auto" : "אוטומטי"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
diff --git a/l10n/he.json b/l10n/he.json
index 3fadedcb2..f093d2137 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -43,6 +43,7 @@
     "Position" : "מיקום",
     "Extension" : "הרחבה",
     "Name is required." : "נדרש שם.",
-    "Quality" : "איכות"
+    "Quality" : "איכות",
+    "Auto" : "אוטומטי"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/hr.js b/l10n/hr.js
index 6eb70fc94..6d0a94f8f 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Position" : "Položaj",
     "Extension" : "Proširenje",
     "Name is required." : "Ime je obavezno.",
-    "Quality" : "Kvaliteta"
+    "Quality" : "Kvaliteta",
+    "Auto" : "Auto"
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/l10n/hr.json b/l10n/hr.json
index 040aebfef..43f8a950f 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -46,6 +46,7 @@
     "Position" : "Položaj",
     "Extension" : "Proširenje",
     "Name is required." : "Ime je obavezno.",
-    "Quality" : "Kvaliteta"
+    "Quality" : "Kvaliteta",
+    "Auto" : "Auto"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/hu.js b/l10n/hu.js
index 44466a518..41c6cc3f0 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Tags" : "Címkék",
     "Maps" : "Térképek",
     "EXIF" : "EXIF",
+    "Error saving image" : "Hiba a kép mentése során",
     "Unsaved changes" : "Mentetlen változtatások",
     "Drop changes" : "Változtatások elvetése",
     "Edit" : "Szerkesztés",
@@ -171,6 +172,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Vegye figyelembe, hogy a kijelölt levágási terület kisebb mint az alkalmazott átméretezés, amely minőségcsökkenést okozhat",
     "Actual size (100%)" : "Tényleges méret (100%)",
     "Fit size" : "Illeszkedő méret",
+    "Auto" : "Automatikus",
     "Failed to create {albumName}." : "A(z) {albumName} létrehozása sikertelen.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "A(z) {currentAlbumName} átnevezése a következőre sikertelen: {newAlbumName}.",
     "Failed to delete files." : "A fájlok törlése sikertelen.",
diff --git a/l10n/hu.json b/l10n/hu.json
index 1b563d024..cd01eaa70 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -13,6 +13,7 @@
     "Tags" : "Címkék",
     "Maps" : "Térképek",
     "EXIF" : "EXIF",
+    "Error saving image" : "Hiba a kép mentése során",
     "Unsaved changes" : "Mentetlen változtatások",
     "Drop changes" : "Változtatások elvetése",
     "Edit" : "Szerkesztés",
@@ -169,6 +170,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Vegye figyelembe, hogy a kijelölt levágási terület kisebb mint az alkalmazott átméretezés, amely minőségcsökkenést okozhat",
     "Actual size (100%)" : "Tényleges méret (100%)",
     "Fit size" : "Illeszkedő méret",
+    "Auto" : "Automatikus",
     "Failed to create {albumName}." : "A(z) {albumName} létrehozása sikertelen.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "A(z) {currentAlbumName} átnevezése a következőre sikertelen: {newAlbumName}.",
     "Failed to delete files." : "A fájlok törlése sikertelen.",
diff --git a/l10n/is.js b/l10n/is.js
index a961b29aa..87bfe66df 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Position" : "Staða",
     "Extension" : "Skráarending",
     "Name is required." : "Nafn er nauðsynlegt.",
-    "Quality" : "Quality"
+    "Quality" : "Quality",
+    "Auto" : "Sjálfvirkt"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/l10n/is.json b/l10n/is.json
index cf39a1b5e..093244b02 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -46,6 +46,7 @@
     "Position" : "Staða",
     "Extension" : "Skráarending",
     "Name is required." : "Nafn er nauðsynlegt.",
-    "Quality" : "Quality"
+    "Quality" : "Quality",
+    "Auto" : "Sjálfvirkt"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/l10n/it.js b/l10n/it.js
index 53e4808e6..033b781a7 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -74,6 +74,7 @@ OC.L10N.register(
     "Position" : "Posizione",
     "Extension" : "Estensione",
     "Name is required." : "Il nome è richiesto.",
-    "Quality" : "Qualità"
+    "Quality" : "Qualità",
+    "Auto" : "Automatico"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/it.json b/l10n/it.json
index 807701358..cced2d391 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -72,6 +72,7 @@
     "Position" : "Posizione",
     "Extension" : "Estensione",
     "Name is required." : "Il nome è richiesto.",
-    "Quality" : "Qualità"
+    "Quality" : "Qualità",
+    "Auto" : "Automatico"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/l10n/ja.js b/l10n/ja.js
index 027425b93..90aa81372 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -73,6 +73,7 @@ OC.L10N.register(
     "Position" : "位置",
     "Extension" : "拡張",
     "Name is required." : "名前は必須です。",
-    "Quality" : "品質"
+    "Quality" : "品質",
+    "Auto" : "自動"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ja.json b/l10n/ja.json
index f8d063fe3..bff1fd3b5 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -71,6 +71,7 @@
     "Position" : "位置",
     "Extension" : "拡張",
     "Name is required." : "名前は必須です。",
-    "Quality" : "品質"
+    "Quality" : "品質",
+    "Auto" : "自動"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/ko.js b/l10n/ko.js
index 0432c5ecb..37b032996 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -43,6 +43,7 @@ OC.L10N.register(
     "Size" : "크기",
     "Position" : "위치",
     "Extension" : "확장자",
-    "Quality" : "품질"
+    "Quality" : "품질",
+    "Auto" : "자동"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ko.json b/l10n/ko.json
index 6246ea75c..783115f27 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -41,6 +41,7 @@
     "Size" : "크기",
     "Position" : "위치",
     "Extension" : "확장자",
-    "Quality" : "품질"
+    "Quality" : "품질",
+    "Auto" : "자동"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 0575ce7e0..668be9539 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -121,6 +121,7 @@ OC.L10N.register(
     "Position" : "Vieta",
     "Name is required." : "Vardas yra būtinas.",
     "Quality" : "Kokybė",
+    "Auto" : "Automatiškai",
     "Failed to create {albumName}." : "Nepavyko sukurti {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepavyko pervadinti {currentAlbumName} į {newAlbumName}.",
     "General Failure" : "Bendrinė nesėkmė",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index c70915553..c52589fa2 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -119,6 +119,7 @@
     "Position" : "Vieta",
     "Name is required." : "Vardas yra būtinas.",
     "Quality" : "Kokybė",
+    "Auto" : "Automatiškai",
     "Failed to create {albumName}." : "Nepavyko sukurti {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nepavyko pervadinti {currentAlbumName} į {newAlbumName}.",
     "General Failure" : "Bendrinė nesėkmė",
diff --git a/l10n/lv.js b/l10n/lv.js
index 567dbb0e7..6ef918855 100644
--- a/l10n/lv.js
+++ b/l10n/lv.js
@@ -51,6 +51,7 @@ OC.L10N.register(
     "Saved image size (width x height)" : "Saglabātā attēla izmērs (platums x augstums)",
     "Actual size (100%)" : "Faktiskais izmērs (100%)",
     "Fit size" : "Atbilst izmēram",
+    "Auto" : "Automātiski",
     "Shared Folder" : "Koplietotā mape"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/l10n/lv.json b/l10n/lv.json
index 361a07857..a7d13cb64 100644
--- a/l10n/lv.json
+++ b/l10n/lv.json
@@ -49,6 +49,7 @@
     "Saved image size (width x height)" : "Saglabātā attēla izmērs (platums x augstums)",
     "Actual size (100%)" : "Faktiskais izmērs (100%)",
     "Fit size" : "Atbilst izmēram",
+    "Auto" : "Automātiski",
     "Shared Folder" : "Koplietotā mape"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/mk.js b/l10n/mk.js
index 79992128b..a6545c465 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -94,6 +94,7 @@ OC.L10N.register(
     "Quality" : "Квалитет",
     "Actual size (100%)" : "Актуелна големина (100%)",
     "Fit size" : "Соодветна големина",
+    "Auto" : "Автоматски",
     "Failed to create {albumName}." : "Неуспешно креирање {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименување на {currentAlbumName} во {newAlbumName}.",
     "Failed to favorite {fileName}." : "Неуспешно додавање во омилени {fileName}."
diff --git a/l10n/mk.json b/l10n/mk.json
index 172da306d..61a34703f 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -92,6 +92,7 @@
     "Quality" : "Квалитет",
     "Actual size (100%)" : "Актуелна големина (100%)",
     "Fit size" : "Соодветна големина",
+    "Auto" : "Автоматски",
     "Failed to create {albumName}." : "Неуспешно креирање {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Неуспешно преименување на {currentAlbumName} во {newAlbumName}.",
     "Failed to favorite {fileName}." : "Неуспешно додавање во омилени {fileName}."
diff --git a/l10n/nb.js b/l10n/nb.js
index d52db292f..93c187d3d 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -74,6 +74,7 @@ OC.L10N.register(
     "Save image as" : "Lagre bilde som",
     "Extension" : "Filetternavn",
     "Name is required." : "Navn er påkrevd.",
-    "Quality" : "Kvalitet"
+    "Quality" : "Kvalitet",
+    "Auto" : "Auto"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/nb.json b/l10n/nb.json
index 6fb6ac3a2..382d4ac39 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -72,6 +72,7 @@
     "Save image as" : "Lagre bilde som",
     "Extension" : "Filetternavn",
     "Name is required." : "Navn er påkrevd.",
-    "Quality" : "Kvalitet"
+    "Quality" : "Kvalitet",
+    "Auto" : "Auto"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/nl.js b/l10n/nl.js
index 5d5f721b5..b52cc3b01 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Position" : "Positie",
     "Extension" : "Extensie",
     "Name is required." : "Naam is verplicht.",
-    "Quality" : "Kwaliteit"
+    "Quality" : "Kwaliteit",
+    "Auto" : "Automatisch"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/nl.json b/l10n/nl.json
index f09ec214f..d600ac9ff 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -51,6 +51,7 @@
     "Position" : "Positie",
     "Extension" : "Extensie",
     "Name is required." : "Naam is verplicht.",
-    "Quality" : "Kwaliteit"
+    "Quality" : "Kwaliteit",
+    "Auto" : "Automatisch"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/pl.js b/l10n/pl.js
index a90a50043..98539d306 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -169,6 +169,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Zwróć uwagę, że wybrany obszar kadrowania jest mniejszy niż zastosowana zmiana rozmiaru, co może spowodować spadek jakości",
     "Actual size (100%)" : "Rzeczywisty rozmiar (100%)",
     "Fit size" : "Dopasuj rozmiar",
+    "Auto" : "Automatycznie",
     "Failed to create {albumName}." : "Nie udało się utworzyć {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nie udało się zmienić nazwy {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Ogólna awaria",
diff --git a/l10n/pl.json b/l10n/pl.json
index 80baa5a32..a243670e5 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -167,6 +167,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Zwróć uwagę, że wybrany obszar kadrowania jest mniejszy niż zastosowana zmiana rozmiaru, co może spowodować spadek jakości",
     "Actual size (100%)" : "Rzeczywisty rozmiar (100%)",
     "Fit size" : "Dopasuj rozmiar",
+    "Auto" : "Automatycznie",
     "Failed to create {albumName}." : "Nie udało się utworzyć {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Nie udało się zmienić nazwy {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Ogólna awaria",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 2fa2d6883..b875cb43a 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -200,6 +200,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Observe que a área de corte selecionada é menor que o redimensionamento aplicado, o que pode causar diminuição da qualidade",
     "Actual size (100%)" : "Tamanho real (100%)",
     "Fit size" : "Encaixar tamanho",
+    "Auto" : "Automático",
     "Failed to create {albumName}." : "Falha ao criar {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Falha ao renomear {currentAlbumName} para {newAlbumName}.",
     "General Failure" : "Falha Geral",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index cd92140fc..cba3958f0 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -198,6 +198,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Observe que a área de corte selecionada é menor que o redimensionamento aplicado, o que pode causar diminuição da qualidade",
     "Actual size (100%)" : "Tamanho real (100%)",
     "Fit size" : "Encaixar tamanho",
+    "Auto" : "Automático",
     "Failed to create {albumName}." : "Falha ao criar {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Falha ao renomear {currentAlbumName} para {newAlbumName}.",
     "General Failure" : "Falha Geral",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index b043ecfd9..3d4aaca83 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Size" : "Altura",
     "Name is required." : "Nome é obrigatório.",
     "Quality" : "Qualidade",
+    "Auto" : "Auto",
     "Failed to delete files." : "Não foi possível eliminar os ficheiros.",
     "Failed to delete {fileName}." : "Não foi possível eliminar {fileName}.",
     "Failed to favorite files." : "Não foi possível colocar os ficheiros nos favoritos.",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index da72b5b98..f2212fdab 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -47,6 +47,7 @@
     "Size" : "Altura",
     "Name is required." : "Nome é obrigatório.",
     "Quality" : "Qualidade",
+    "Auto" : "Auto",
     "Failed to delete files." : "Não foi possível eliminar os ficheiros.",
     "Failed to delete {fileName}." : "Não foi possível eliminar {fileName}.",
     "Failed to favorite files." : "Não foi possível colocar os ficheiros nos favoritos.",
diff --git a/l10n/ro.js b/l10n/ro.js
index 51a99dfbb..0f690abff 100644
--- a/l10n/ro.js
+++ b/l10n/ro.js
@@ -35,6 +35,7 @@ OC.L10N.register(
     "Custom" : "Particularizat",
     "Text" : "Text",
     "Size" : "Mărime",
-    "Position" : "Poziție"
+    "Position" : "Poziție",
+    "Auto" : "Auto"
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/l10n/ro.json b/l10n/ro.json
index b571646a6..7c82c3e8e 100644
--- a/l10n/ro.json
+++ b/l10n/ro.json
@@ -33,6 +33,7 @@
     "Custom" : "Particularizat",
     "Text" : "Text",
     "Size" : "Mărime",
-    "Position" : "Poziție"
+    "Position" : "Poziție",
+    "Auto" : "Auto"
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
 }
\ No newline at end of file
diff --git a/l10n/ru.js b/l10n/ru.js
index 9e8d27a08..84d461f8a 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Extension" : "Расширение",
     "Name is required." : "Необходимо указать имя.",
     "Quality" : "Качество",
+    "Auto" : "Автоматически",
     "Failed to delete files." : "Ошибка удаления файлов.",
     "Failed to delete {fileName}." : "Ошибка удаления файла «{fileName}».",
     "Failed to favorite files." : "Не удалось добавить файлы в избранное.",
diff --git a/l10n/ru.json b/l10n/ru.json
index eddd830f7..2bf5d1b74 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -74,6 +74,7 @@
     "Extension" : "Расширение",
     "Name is required." : "Необходимо указать имя.",
     "Quality" : "Качество",
+    "Auto" : "Автоматически",
     "Failed to delete files." : "Ошибка удаления файлов.",
     "Failed to delete {fileName}." : "Ошибка удаления файла «{fileName}».",
     "Failed to favorite files." : "Не удалось добавить файлы в избранное.",
diff --git a/l10n/sc.js b/l10n/sc.js
index f12abe771..902b52f9a 100644
--- a/l10n/sc.js
+++ b/l10n/sc.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Position" : "Positzione",
     "Extension" : "Estensione",
     "Name is required." : "Su nùmene est rechertu: ",
-    "Quality" : "Calidade"
+    "Quality" : "Calidade",
+    "Auto" : "Auto"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/sc.json b/l10n/sc.json
index 33465d9b8..91b589ecf 100644
--- a/l10n/sc.json
+++ b/l10n/sc.json
@@ -46,6 +46,7 @@
     "Position" : "Positzione",
     "Extension" : "Estensione",
     "Name is required." : "Su nùmene est rechertu: ",
-    "Quality" : "Calidade"
+    "Quality" : "Calidade",
+    "Auto" : "Auto"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/sk.js b/l10n/sk.js
index c26b88010..8b9794487 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -180,6 +180,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Upozorňujeme, že vybratá oblasť orezania je menšia ako použitá zmena veľkosti, čo môže spôsobiť zníženie kvality",
     "Actual size (100%)" : "Aktuálna veľkosť (100%)",
     "Fit size" : "Prispôsobiť veľlkosť",
+    "Auto" : "Automaticky",
     "Failed to create {albumName}." : "Zlyhalo vytváranie {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Chyba pri premenovávaní {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Všeobecné zlyhanie",
diff --git a/l10n/sk.json b/l10n/sk.json
index f5d341e1a..e02db2e87 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -178,6 +178,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Upozorňujeme, že vybratá oblasť orezania je menšia ako použitá zmena veľkosti, čo môže spôsobiť zníženie kvality",
     "Actual size (100%)" : "Aktuálna veľkosť (100%)",
     "Fit size" : "Prispôsobiť veľlkosť",
+    "Auto" : "Automaticky",
     "Failed to create {albumName}." : "Zlyhalo vytváranie {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Chyba pri premenovávaní {currentAlbumName} na {newAlbumName}.",
     "General Failure" : "Všeobecné zlyhanie",
diff --git a/l10n/sl.js b/l10n/sl.js
index 8cc89ae94..19883da46 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -58,6 +58,7 @@ OC.L10N.register(
     "Position" : "Položaj",
     "Extension" : "Pripona",
     "Name is required." : "Ime mora biti vpisano.",
-    "Quality" : "Kakovost"
+    "Quality" : "Kakovost",
+    "Auto" : "Samodejno"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/l10n/sl.json b/l10n/sl.json
index ebd52d55a..0dadba3d3 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -56,6 +56,7 @@
     "Position" : "Položaj",
     "Extension" : "Pripona",
     "Name is required." : "Ime mora biti vpisano.",
-    "Quality" : "Kakovost"
+    "Quality" : "Kakovost",
+    "Auto" : "Samodejno"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/sr.js b/l10n/sr.js
index 26b34bb42..f5da664a9 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -45,6 +45,7 @@ OC.L10N.register(
     "Text" : "Текст",
     "Size" : "величина",
     "Position" : "Позиција",
-    "Extension" : "Екстензија"
+    "Extension" : "Екстензија",
+    "Auto" : "Аутоматски"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/sr.json b/l10n/sr.json
index df373dd04..04c2b5827 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -43,6 +43,7 @@
     "Text" : "Текст",
     "Size" : "величина",
     "Position" : "Позиција",
-    "Extension" : "Екстензија"
+    "Extension" : "Екстензија",
+    "Auto" : "Аутоматски"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/sv.js b/l10n/sv.js
index 754c9986f..267b3ee90 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -67,6 +67,7 @@ OC.L10N.register(
     "Position" : "Position",
     "Extension" : "Tillägg",
     "Name is required." : "Namn är obligatoriskt.",
+    "Auto" : "Auto",
     "Failed to delete files." : "Misslyckades att radera filer.",
     "Failed to delete {fileName}." : "Misslyckades att radera {fileName}.",
     "Failed to favorite files." : "Misslyckades att favorisera filer.",
diff --git a/l10n/sv.json b/l10n/sv.json
index 72d8ec351..1f5ad73b0 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -65,6 +65,7 @@
     "Position" : "Position",
     "Extension" : "Tillägg",
     "Name is required." : "Namn är obligatoriskt.",
+    "Auto" : "Auto",
     "Failed to delete files." : "Misslyckades att radera filer.",
     "Failed to delete {fileName}." : "Misslyckades att radera {fileName}.",
     "Failed to favorite files." : "Misslyckades att favorisera filer.",
diff --git a/l10n/tr.js b/l10n/tr.js
index e89e1778b..47085f8ef 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Anılar",
     "Yet another photo management app" : "Başka bir fotoğraf yönetimi uygulaması daha",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Anılar\n\nAnılar, Nextcloud için \"pilleriyle birlikte\" gelen ve aşağıdaki gibi gelişmiş özellikleri bulunan bir fotoğraf yönetimi uygulamasıdır:\n\n- **📸 Zaman tüneli**: Fotoğrafları ve görüntüleri çekildikleri tarihe göre sıralayabilir, Exif verilerine göre ayrıştırabilirsiniz.\n- **⏪ Geri sarma**: Geçmişte herhangi bir zamana atlayabilir ve anılarınızı yeniden yaşayabilirsiniz.\n- **🤖 Yapay zeka ile etiketleme**: [recognize](https://github.com/nextcloud/recognize) tarafından desteklenen yapay zeka ile fotoğrafları insanlara ve nesnelere göre gruplayabilirsiniz.\n- **🖼️ Albümler**: Fotoğrafları ve görüntüleri birlikte gruplandırmak için albümler oluşturabilirsiniz. Daha sonra bu albümleri başkalarıyla paylaşabilirsiniz.\n- **🫱🏻‍🫲🏻 Dış paylaşım**: Fotoğrafları ve görüntüleri Nextcloud bulut sunucunuzun dışındaki kişilerle paylaşabilirsiniz.\n- **📱 Mobil desteği**: Web uygulaması üzerinden farklı şekil ve boyuttaki aygıtlarda kullanabilirsiniz.\n- **✏️ Üst verileri düzenleme**: Fotoğraflardaki tarihleri ​​hızlı ve kolay bir şekilde düzenleyebilirsiniz.\n- **📦 Arşiv**: Zaman tünelinizde görmek istemediğiniz fotoğrafları ayrı bir klasörde saklayabilirsiniz.\n- **📹 Görüntü dönüştürme**: Anılar görüntüleri dönüştürebilir ve en iyi başarım için HLS kullanır.\n- **⚡️ Başarım**: Anılar uygulaması son derece hızlıdır.\n\n## 🌐 Çevrimiçi Deneme\n\n- Anılar uygulamasının nasıl göründüğü ve nasıl hissettirdiği hakkında bir fikir edinmek için [genel deneme](https://memories-demo.radialapps.com/apps/memories/) sitesine göz atın.\n- Deneme sitesi salt okunurdur ve yavaş olabilir ([Oracle Cloud üzerinde](https://www.oracle.com/cloud/free/) ücretsiz VM paketini kullanır).\n- Fotoğraf hakkında emeği geçenler için [Unsplash](https://unsplash.com/) adresine bakabilirsiniz (bireysel eeği geçenler için her klasöre bakın).\n\n## 🚀 Kurulum\n\n1. Uygulamayı Nextcloud uygulama mağazasından yükleyin.\n1. Önerilen [yapılandırma adımlarını](https://github.com/pulsejet/memories/wiki/Extra-Configuration) gerçekleştirin.\n1. var olan fotoğrafların üst veri dizinlerini oluşturmak için `php ./occ memory:index` komutunu yürütün.\n1. Nextcloud üzerinde 📷 Anılar uygulamasını açın ve fotoğraflarınızın bulunduğu klasörü ayarlayın.",
     "Settings" : "Ayarlar",
     "Timeline" : "Zaman tüneli",
     "Folders" : "Klasörler",
@@ -220,6 +221,7 @@ OC.L10N.register(
     "Actual size (100%)" : "Gerçek boyut (%100)",
     "Fit size" : "Boyutu sığdır",
     "Transcoding failed." : "Kod dönüştürülemedi.",
+    "Auto" : "Otomatik",
     "Shared Folder" : "Paylaşılmış klasör",
     "Failed to create {albumName}." : "{albumName} albümü oluşturulamadı.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} albümünün adı {newAlbumName} olarak değiştirilemedi.",
diff --git a/l10n/tr.json b/l10n/tr.json
index 249f1da48..041915c07 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Anılar",
     "Yet another photo management app" : "Başka bir fotoğraf yönetimi uygulaması daha",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Anılar\n\nAnılar, Nextcloud için \"pilleriyle birlikte\" gelen ve aşağıdaki gibi gelişmiş özellikleri bulunan bir fotoğraf yönetimi uygulamasıdır:\n\n- **📸 Zaman tüneli**: Fotoğrafları ve görüntüleri çekildikleri tarihe göre sıralayabilir, Exif verilerine göre ayrıştırabilirsiniz.\n- **⏪ Geri sarma**: Geçmişte herhangi bir zamana atlayabilir ve anılarınızı yeniden yaşayabilirsiniz.\n- **🤖 Yapay zeka ile etiketleme**: [recognize](https://github.com/nextcloud/recognize) tarafından desteklenen yapay zeka ile fotoğrafları insanlara ve nesnelere göre gruplayabilirsiniz.\n- **🖼️ Albümler**: Fotoğrafları ve görüntüleri birlikte gruplandırmak için albümler oluşturabilirsiniz. Daha sonra bu albümleri başkalarıyla paylaşabilirsiniz.\n- **🫱🏻‍🫲🏻 Dış paylaşım**: Fotoğrafları ve görüntüleri Nextcloud bulut sunucunuzun dışındaki kişilerle paylaşabilirsiniz.\n- **📱 Mobil desteği**: Web uygulaması üzerinden farklı şekil ve boyuttaki aygıtlarda kullanabilirsiniz.\n- **✏️ Üst verileri düzenleme**: Fotoğraflardaki tarihleri ​​hızlı ve kolay bir şekilde düzenleyebilirsiniz.\n- **📦 Arşiv**: Zaman tünelinizde görmek istemediğiniz fotoğrafları ayrı bir klasörde saklayabilirsiniz.\n- **📹 Görüntü dönüştürme**: Anılar görüntüleri dönüştürebilir ve en iyi başarım için HLS kullanır.\n- **⚡️ Başarım**: Anılar uygulaması son derece hızlıdır.\n\n## 🌐 Çevrimiçi Deneme\n\n- Anılar uygulamasının nasıl göründüğü ve nasıl hissettirdiği hakkında bir fikir edinmek için [genel deneme](https://memories-demo.radialapps.com/apps/memories/) sitesine göz atın.\n- Deneme sitesi salt okunurdur ve yavaş olabilir ([Oracle Cloud üzerinde](https://www.oracle.com/cloud/free/) ücretsiz VM paketini kullanır).\n- Fotoğraf hakkında emeği geçenler için [Unsplash](https://unsplash.com/) adresine bakabilirsiniz (bireysel eeği geçenler için her klasöre bakın).\n\n## 🚀 Kurulum\n\n1. Uygulamayı Nextcloud uygulama mağazasından yükleyin.\n1. Önerilen [yapılandırma adımlarını](https://github.com/pulsejet/memories/wiki/Extra-Configuration) gerçekleştirin.\n1. var olan fotoğrafların üst veri dizinlerini oluşturmak için `php ./occ memory:index` komutunu yürütün.\n1. Nextcloud üzerinde 📷 Anılar uygulamasını açın ve fotoğraflarınızın bulunduğu klasörü ayarlayın.",
     "Settings" : "Ayarlar",
     "Timeline" : "Zaman tüneli",
     "Folders" : "Klasörler",
@@ -218,6 +219,7 @@
     "Actual size (100%)" : "Gerçek boyut (%100)",
     "Fit size" : "Boyutu sığdır",
     "Transcoding failed." : "Kod dönüştürülemedi.",
+    "Auto" : "Otomatik",
     "Shared Folder" : "Paylaşılmış klasör",
     "Failed to create {albumName}." : "{albumName} albümü oluşturulamadı.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} albümünün adı {newAlbumName} olarak değiştirilemedi.",
diff --git a/l10n/uk.js b/l10n/uk.js
index e83c0e778..2cb1c1353 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -161,6 +161,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Зауважте, що вибрана область кадрування нижча за застосований розмір, що може спричинити погіршення якості",
     "Actual size (100%)" : "Фактичний розмір (100%)",
     "Fit size" : "Підходить за розміром",
+    "Auto" : "Автоматично",
     "Failed to create {albumName}." : "Не вдалося створити {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Не вдалося перейменувати {currentAlbumName} на {newAlbumName}.",
     "Failed to delete files." : "Не вдалося видалити файли.",
diff --git a/l10n/uk.json b/l10n/uk.json
index 64c2a1754..8f0d101cf 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -159,6 +159,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Зауважте, що вибрана область кадрування нижча за застосований розмір, що може спричинити погіршення якості",
     "Actual size (100%)" : "Фактичний розмір (100%)",
     "Fit size" : "Підходить за розміром",
+    "Auto" : "Автоматично",
     "Failed to create {albumName}." : "Не вдалося створити {albumName}.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "Не вдалося перейменувати {currentAlbumName} на {newAlbumName}.",
     "Failed to delete files." : "Не вдалося видалити файли.",
diff --git a/l10n/vi.js b/l10n/vi.js
index 718999266..7c72362ae 100644
--- a/l10n/vi.js
+++ b/l10n/vi.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "Image" : "Hình ảnh",
     "Text" : "Văn bản",
     "Size" : "Kích cỡ",
-    "Name is required." : "Tên là bắt buộc."
+    "Name is required." : "Tên là bắt buộc.",
+    "Auto" : "Tự động"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/vi.json b/l10n/vi.json
index c15003c52..f1d9e2af5 100644
--- a/l10n/vi.json
+++ b/l10n/vi.json
@@ -34,6 +34,7 @@
     "Image" : "Hình ảnh",
     "Text" : "Văn bản",
     "Size" : "Kích cỡ",
-    "Name is required." : "Tên là bắt buộc."
+    "Name is required." : "Tên là bắt buộc.",
+    "Auto" : "Tự động"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 9fbf27f2f..6db292b1a 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Extension" : "扩展",
     "Name is required." : "名称是必填项。",
     "Quality" : "质量",
+    "Auto" : "自动",
     "Failed to create {albumName}." : "创建 {albumName} 失败",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重命名 {currentAlbumName} 为 {newAlbumName} 的操作失败",
     "Failed to delete {fileName}." : "删除 {fileName} 失败"
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index a24b060d0..5c4687c23 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -82,6 +82,7 @@
     "Extension" : "扩展",
     "Name is required." : "名称是必填项。",
     "Quality" : "质量",
+    "Auto" : "自动",
     "Failed to create {albumName}." : "创建 {albumName} 失败",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重命名 {currentAlbumName} 为 {newAlbumName} 的操作失败",
     "Failed to delete {fileName}." : "删除 {fileName} 失败"
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 0b56cba33..89eed5471 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -221,6 +221,7 @@ OC.L10N.register(
     "Actual size (100%)" : "實際大小 (100%)",
     "Fit size" : "調整大小",
     "Transcoding failed." : "轉碼失敗。",
+    "Auto" : "自動",
     "Shared Folder" : "分享資料夾",
     "Failed to create {albumName}." : "創建 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index 5baa0c970..e6ba70d58 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -219,6 +219,7 @@
     "Actual size (100%)" : "實際大小 (100%)",
     "Fit size" : "調整大小",
     "Transcoding failed." : "轉碼失敗。",
+    "Auto" : "自動",
     "Shared Folder" : "分享資料夾",
     "Failed to create {albumName}." : "創建 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index e7c859073..e51a6d194 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -26,6 +26,8 @@ OC.L10N.register(
     "Choose the root of your timeline" : "選擇您時間軸的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Failed to get Exif data. Metadata may be lost!" : "取得 Exif 資料失敗。詮釋資料可能會遺失！",
+    "No Exif data found! Continue?" : "未找到 Exif 資料！繼續？",
     "Image saved successfully" : "圖片儲存成功",
     "Error saving image" : "儲存影像時發生錯誤",
     "Unsaved changes" : "未儲存變更",
@@ -218,6 +220,8 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "請注意，選定的裁剪區域低於套用的調整大小，這可能會導致品質下降",
     "Actual size (100%)" : "實際大小 (100%)",
     "Fit size" : "合適大小",
+    "Transcoding failed." : "轉換編碼失敗。",
+    "Auto" : "自動",
     "Shared Folder" : "已分享的資料夾",
     "Failed to create {albumName}." : "建立 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 19c782978..c7c2c79fa 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -24,6 +24,8 @@
     "Choose the root of your timeline" : "選擇您時間軸的根",
     "The selected folder does not seem to be valid. Try again." : "選定的資料夾似乎是無效的。請再試一次。",
     "Found {total} photos in {path}" : "在 {path} 中找到 {total} 張照片",
+    "Failed to get Exif data. Metadata may be lost!" : "取得 Exif 資料失敗。詮釋資料可能會遺失！",
+    "No Exif data found! Continue?" : "未找到 Exif 資料！繼續？",
     "Image saved successfully" : "圖片儲存成功",
     "Error saving image" : "儲存影像時發生錯誤",
     "Unsaved changes" : "未儲存變更",
@@ -216,6 +218,8 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "請注意，選定的裁剪區域低於套用的調整大小，這可能會導致品質下降",
     "Actual size (100%)" : "實際大小 (100%)",
     "Fit size" : "合適大小",
+    "Transcoding failed." : "轉換編碼失敗。",
+    "Auto" : "自動",
     "Shared Folder" : "已分享的資料夾",
     "Failed to create {albumName}." : "建立 {albumName} 失敗。",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "重新命名 {currentAlbumName} 為 {newAlbumName} 失敗。",

From c79c3fa3eda8c56051c731d64ce98406229e8b3d Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 07:44:57 -0800
Subject: [PATCH 126/163] Update tar args (#195)

---
 scripts/bundle.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bundle.sh b/scripts/bundle.sh
index 03c634fbd..9ca1b61c1 100755
--- a/scripts/bundle.sh
+++ b/scripts/bundle.sh
@@ -4,7 +4,7 @@ od=`pwd`
 
 rm -rf /tmp/memories
 mkdir -p /tmp/memories
-cp -R appinfo l10n img js lib templates COPYING README.md transcoder.yaml exiftest* composer* /tmp/memories
+cp -R appinfo l10n img js lib templates COPYING README.md exiftest* composer* /tmp/memories
 
 cd /tmp
 rm -f memories/appinfo/screencap* memories/js/*.map
@@ -14,7 +14,7 @@ cd memories
 sh "$od/scripts/get-exiftool.sh"
 cd ..
 
-tar -zvcf memories.tar.gz memories/
+tar --no-same-owner -p -zcf memories.tar.gz memories/
 rm -rf memories
 
 cd $od

From 599dacedcd5c93d63cad803c1cb05fb2558a379a Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 08:11:00 -0800
Subject: [PATCH 127/163] Update changelog date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 707f38d3a..91be9241f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 This file is manually updated. Please file an issue if something is missing.
 
-## v4.7.0, v3.7.0
+## v4.7.0, v3.7.0 (2022-11-14)
 
 - **Note**: you must run `occ memories:index -f` to take advantage of new features.
 - **Massively improved video performance**

From 472c0ccc5eb1ea434eb9911c32e4661952ad2f88 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 09:54:19 -0800
Subject: [PATCH 128/163] Add changelog to readme (#199)

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 0cc2aa369..fff9fdd0b 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,10 @@ A shout out to the current and past financial backers of Memories! See the spons
 
 [<img src="https://github.com/mpodshivalin.png" width="42" />](https://github.com/mpodshivalin)
 
+## Changelog
+
+For the full changelog, see [CHANGELOG.md](CHANGELOG.md).
+
 ## Special Thanks
 
 Nextcloud team. A lot of this work is based on [Photos](https://github.com/nextcloud/photos).

From 45abfa9cb70321d7059df341b50c3a5a9118baae Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Tue, 15 Nov 2022 03:17:07 +0000
Subject: [PATCH 129/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/ar.js   | 3 ++-
 l10n/ar.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/l10n/ar.js b/l10n/ar.js
index bfb2bfb09..d0e5decf6 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "Size" : "الحجم",
     "Position" : "الموقع",
     "Name is required." : "حقل الاسم مطلوب",
-    "Quality" : "الجودة"
+    "Quality" : "الجودة",
+    "Auto" : "تلقائي"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/l10n/ar.json b/l10n/ar.json
index a1412f694..4a0e17033 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -37,6 +37,7 @@
     "Size" : "الحجم",
     "Position" : "الموقع",
     "Name is required." : "حقل الاسم مطلوب",
-    "Quality" : "الجودة"
+    "Quality" : "الجودة",
+    "Auto" : "تلقائي"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file

From 03ef6a615a8c9a65a17cd3b205411454c1095ece Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 21:32:41 -0800
Subject: [PATCH 130/163] ci: add POSTGRES_DB

---
 .github/workflows/e2e.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 4309147a5..187ab72d1 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -118,6 +118,7 @@ jobs:
         ports:
           - 4444:5432/tcp
         env:
+          POSTGRES_DB: nextcloud
           POSTGRES_PASSWORD: rootpassword
         options: >-
           --health-cmd pg_isready

From 467c52053c5ab4dc3be299e3d827d73b240e9e84 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Mon, 14 Nov 2022 21:49:41 -0800
Subject: [PATCH 131/163] metaview: fix width on 100% scaling (close #200)

---
 src/App.vue                 | 5 +++++
 src/components/Metadata.vue | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 9d1c07313..7b00bc27f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -344,6 +344,11 @@ body.has-viewer header {
   overflow-x: hidden;
 }
 
+// Prevent sidebar from becoming too big
+aside.app-sidebar {
+  max-width: 360px !important;
+}
+
 // Fill all available space
 .fill-block {
   width: 100%;
diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index 850aa3920..8e69d8ff7 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -343,6 +343,8 @@ export default class Metadata extends Mixins(GlobalMixin) {
 
 .map {
   width: 100%;
-  height: 200px;
+  aspect-ratio: 16 / 10;
+  min-height: 200px;
+  max-height: 250px;
 }
 </style>
\ No newline at end of file

From e01b536f8349f4edce5ca3b6365e22e65cfe7705 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 01:50:59 -0800
Subject: [PATCH 132/163] fix: regression in non-transcode video (#198) (fix
 #202)

---
 src/services/dav/download.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/services/dav/download.ts b/src/services/dav/download.ts
index 5cf166a9c..4684a3712 100644
--- a/src/services/dav/download.ts
+++ b/src/services/dav/download.ts
@@ -102,10 +102,5 @@ export function getDownloadLink(photo: IPhoto) {
     }
   }
 
-  try {
-    const file = "/" + photo.filename.split("/").slice(3).join("/");
-    return `/apps/files/ajax/download.php?files=${file}`; // normal route
-  } catch {
-    return `/remote.php/dav${photo.filename}`; // fallback
-  }
+  return `/remote.php/dav${photo.filename}`;
 }

From 220a685bf65db22163107c503ecff035cb1f746e Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 02:27:20 -0800
Subject: [PATCH 133/163] Allow specifying ff* path (fix #201)

---
 lib/Command/VideoSetup.php         | 16 +++++++---------
 lib/Controller/VideoController.php | 18 ++++++++++++------
 scripts/get-exiftool.sh            |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index c84960dd7..efde576ce 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -50,16 +50,12 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        // Check nohup binary
-        $nohup = shell_exec('nohup --version');
-        if (!$nohup || false === strpos($nohup, 'nohup')) {
-            $output->writeln('<error>nohup binary not found. Please install nohup.</error>');
-
-            return $this->suggestDisable($output);
-        }
+        // Preset executables
+        $ffmpegPath = $this->config->getSystemValue('memories.ffmpeg_path', 'ffmpeg');
+        $ffprobePath = $this->config->getSystemValue('memories.ffprobe_path', 'ffprobe');
 
         // Get ffmpeg version
-        $ffmpeg = shell_exec('ffmpeg -version');
+        $ffmpeg = shell_exec("$ffmpegPath -version");
         if (false === strpos($ffmpeg, 'ffmpeg version')) {
             $ffmpeg = null;
             $output->writeln('<error>ffmpeg is not installed</error>');
@@ -68,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         // Get ffprobe version
-        $ffprobe = shell_exec('ffprobe -version');
+        $ffprobe = shell_exec("$ffprobePath -version");
         if (false === strpos($ffprobe, 'ffprobe version')) {
             $ffprobe = null;
             $output->writeln('<error>ffprobe is not installed</error>');
@@ -129,6 +125,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $this->config->setSystemValue('memories.transcoder', $goVodPath);
         $this->config->setSystemValue('memories.no_transcode', false);
         $output->writeln('Transcoding and HLS are now enabled! Monitor the output at /tmp/go-vod.log for any errors');
+        $output->writeln('You should restart the server for changes to take effect');
 
         // Check for VAAPI
         $output->writeln("\nChecking for QSV (/dev/dri/renderD128)");
@@ -171,6 +168,7 @@ protected function suggestDisable(OutputInterface $output)
 
         $this->config->setSystemValue('memories.no_transcode', true);
         $output->writeln('<error>Transcoding and HLS are now disabled</error>');
+        $output->writeln('You should restart the server for changes to take effect');
 
         return 0;
     }
diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index bf8d531f5..87261372a 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -96,15 +96,21 @@ public function transcode(string $client, string $fileid, string $profile): Http
             }
 
             // Check for environment variables
-            $vaapi = $this->config->getSystemValue('memories.qsv', false);
             $env = '';
-            if ($vaapi) {
-                $env .= 'VAAPI=1 ';
-            }
+
+            // QSV with VAAPI
+            $vaapi = $this->config->getSystemValue('memories.qsv', false);
+            if ($vaapi) $env .= 'VAAPI=1 ';
+
+            // Paths
+            $ffmpegPath = $this->config->getSystemValue('memories.ffmpeg_path', 'ffmpeg');
+            $ffprobePath = $this->config->getSystemValue('memories.ffprobe_path', 'ffprobe');
+            $tmpPath = $this->config->getSystemValue('memories.tmp_path', sys_get_temp_dir());
+            $env .= "FFMPEG='$ffmpegPath' FFPROBE='$ffprobePath' GOVOD_TEMPDIR='$tmpPath/go-vod' ";
 
             // Check if already running
-            shell_exec("pkill {$transcoder}");
-            shell_exec("{$env} nohup {$transcoder} > {$tmpDir}/go-vod.log 2>&1 & > /dev/null");
+            exec("pkill {$transcoder}");
+            shell_exec("{$env} nohup {$transcoder} > {$tmpPath}/go-vod.log 2>&1 & > /dev/null");
 
             // wait for 1s and try again
             sleep(1);
diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 6f78f136f..2cfaea786 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.11"
+govod="0.0.12"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From 8d6e49da7dc516cc118ab69b25534eacac7937d0 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 02:39:15 -0800
Subject: [PATCH 134/163] php-lint

---
 lib/Command/VideoSetup.php         | 4 ++--
 lib/Controller/VideoController.php | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index efde576ce..01b80be1f 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -55,7 +55,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $ffprobePath = $this->config->getSystemValue('memories.ffprobe_path', 'ffprobe');
 
         // Get ffmpeg version
-        $ffmpeg = shell_exec("$ffmpegPath -version");
+        $ffmpeg = shell_exec("{$ffmpegPath} -version");
         if (false === strpos($ffmpeg, 'ffmpeg version')) {
             $ffmpeg = null;
             $output->writeln('<error>ffmpeg is not installed</error>');
@@ -64,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         // Get ffprobe version
-        $ffprobe = shell_exec("$ffprobePath -version");
+        $ffprobe = shell_exec("{$ffprobePath} -version");
         if (false === strpos($ffprobe, 'ffprobe version')) {
             $ffprobe = null;
             $output->writeln('<error>ffprobe is not installed</error>');
diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 87261372a..8ad56a63c 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -100,13 +100,15 @@ public function transcode(string $client, string $fileid, string $profile): Http
 
             // QSV with VAAPI
             $vaapi = $this->config->getSystemValue('memories.qsv', false);
-            if ($vaapi) $env .= 'VAAPI=1 ';
+            if ($vaapi) {
+                $env .= 'VAAPI=1 ';
+            }
 
             // Paths
             $ffmpegPath = $this->config->getSystemValue('memories.ffmpeg_path', 'ffmpeg');
             $ffprobePath = $this->config->getSystemValue('memories.ffprobe_path', 'ffprobe');
             $tmpPath = $this->config->getSystemValue('memories.tmp_path', sys_get_temp_dir());
-            $env .= "FFMPEG='$ffmpegPath' FFPROBE='$ffprobePath' GOVOD_TEMPDIR='$tmpPath/go-vod' ";
+            $env .= "FFMPEG='{$ffmpegPath}' FFPROBE='{$ffprobePath}' GOVOD_TEMPDIR='{$tmpPath}/go-vod' ";
 
             // Check if already running
             exec("pkill {$transcoder}");

From 19386f2422608da36141dbf57778af49ce7e2ad1 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 05:08:53 -0800
Subject: [PATCH 135/163] release: v4.7.2

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index e52824146..9ae17a28a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.1</version>
+    <version>4.7.2</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>

From 5f5918372608d9b7192cea4c88903d7192bc0e7e Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 05:40:46 -0800
Subject: [PATCH 136/163] Add more permissions checks

---
 lib/Controller/ApiBase.php           | 9 +++++++++
 lib/Controller/ArchiveController.php | 2 +-
 lib/Controller/FacesController.php   | 5 +++++
 lib/Controller/ImageController.php   | 2 +-
 lib/Controller/VideoController.php   | 4 ++++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/ApiBase.php b/lib/Controller/ApiBase.php
index 3d3ef6674..146e78794 100644
--- a/lib/Controller/ApiBase.php
+++ b/lib/Controller/ApiBase.php
@@ -131,6 +131,10 @@ protected function getRequestFolder()
             throw new \Exception('Folder not found');
         }
 
+        if (!($folder->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+            throw new \Exception('Folder not readable');
+        }
+
         return $folder;
     }
 
@@ -160,6 +164,11 @@ protected function getUserFile(int $id)
             return null;
         }
 
+        // Check read permission
+        if (!($file[0]->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+            return null;
+        }
+
         return $file[0];
     }
 
diff --git a/lib/Controller/ArchiveController.php b/lib/Controller/ArchiveController.php
index 4ca93d0ca..f6c518b4f 100644
--- a/lib/Controller/ArchiveController.php
+++ b/lib/Controller/ArchiveController.php
@@ -54,7 +54,7 @@ public function archive(string $id): JSONResponse
         $file = $file[0];
 
         // Check if user has permissions
-        if (!$file->isUpdateable()) {
+        if (!$file->isUpdateable() || !($file->getPermissions() & \OCP\Constants::PERMISSION_UPDATE)) {
             return new JSONResponse(['message' => 'Cannot update this file'], Http::STATUS_FORBIDDEN);
         }
 
diff --git a/lib/Controller/FacesController.php b/lib/Controller/FacesController.php
index a6634ed76..f4dfd0973 100644
--- a/lib/Controller/FacesController.php
+++ b/lib/Controller/FacesController.php
@@ -104,6 +104,11 @@ public function preview(string $id): Http\Response
                 continue;
             }
 
+            // Check read permission
+            if (!($files[0]->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+                continue;
+            }
+
             // Get (hopefully cached) preview image
             try {
                 $preview = $this->previewManager->getPreview($files[0], 2048, 2048, false);
diff --git a/lib/Controller/ImageController.php b/lib/Controller/ImageController.php
index 43531472f..c6cb40bff 100644
--- a/lib/Controller/ImageController.php
+++ b/lib/Controller/ImageController.php
@@ -71,7 +71,7 @@ public function setExif(string $id): JSONResponse
         }
 
         // Check if user has permissions
-        if (!$file->isUpdateable()) {
+        if (!$file->isUpdateable() || !($file->getPermissions() & \OCP\Constants::PERMISSION_UPDATE)) {
             return new JSONResponse([], Http::STATUS_FORBIDDEN);
         }
 
diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 8ad56a63c..9f43bd39f 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -62,6 +62,10 @@ public function transcode(string $client, string $fileid, string $profile): Http
         }
         $file = $files[0];
 
+        if (!($file->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+            return new JSONResponse(['message' => 'File not readable'], Http::STATUS_FORBIDDEN);
+        }
+
         // Local files only for now
         if (!$file->getStorage()->isLocal()) {
             return new JSONResponse(['message' => 'External storage not supported'], Http::STATUS_FORBIDDEN);

From 34340de5f12ce7ab367989ea7587978c607eabdd Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 07:12:27 -0800
Subject: [PATCH 137/163] big: recurse all mountpoints in timeline path

---
 lib/Db/TimelineQueryDays.php | 73 +++++++++++++++++++++++-------------
 src/components/Settings.vue  |  6 ++-
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index 0bbbe9a1d..23c405cb9 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -8,14 +8,14 @@
 use OCP\Files\Folder;
 use OCP\IDBConnection;
 
-const CTE_FOLDERS = // CTE to get all folders recursively in the given top folder
+const CTE_FOLDERS = // CTE to get all folders recursively in the given top folders excluding archive
     'WITH RECURSIVE *PREFIX*cte_folders(fileid) AS (
         SELECT
             f.fileid
         FROM
             *PREFIX*filecache f
         WHERE
-            f.fileid = :topFolderId
+            f.fileid IN (:topFolderIds)
         UNION ALL
         SELECT
             f.fileid
@@ -24,10 +24,43 @@
         INNER JOIN *PREFIX*cte_folders c
             ON (f.parent = c.fileid
                 AND f.mimetype = (SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = \'httpd/unix-directory\')
-                AND f.fileid <> :excludedFolderId
+                AND f.name <> \'.archive\'
             )
     )';
 
+const CTE_FOLDERS_ARCHIVE = // CTE to get all archive folders recursively in the given top folders
+    'WITH RECURSIVE *PREFIX*cte_folders_all(fileid, name) AS (
+        SELECT
+            f.fileid, f.name
+        FROM
+            *PREFIX*filecache f
+        WHERE
+            f.fileid IN (:topFolderIds)
+        UNION ALL
+        SELECT
+            f.fileid, f.name
+        FROM
+            *PREFIX*filecache f
+        INNER JOIN *PREFIX*cte_folders_all c
+            ON (f.parent = c.fileid
+                AND f.mimetype = (SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = \'httpd/unix-directory\')
+            )
+    ), *PREFIX*cte_folders(fileid) AS (
+        SELECT
+            f.fileid
+        FROM
+            *PREFIX*cte_folders_all f
+        WHERE
+            f.name = \'.archive\'
+        UNION ALL
+        SELECT
+            f.fileid
+        FROM
+            *PREFIX*filecache f
+        INNER JOIN *PREFIX*cte_folders c
+            ON (f.parent = c.fileid)
+    )';
+
 trait TimelineQueryDays
 {
     protected IDBConnection $connection;
@@ -231,9 +264,12 @@ private function executeQueryWithCTEs(IQueryBuilder &$query, string $psql = '')
         $params = $query->getParameters();
         $types = $query->getParameterTypes();
 
+        // Get SQL
+        $CTE_SQL = $params['cteFoldersArchive'] ? CTE_FOLDERS_ARCHIVE : CTE_FOLDERS;
+
         // Add WITH clause if needed
         if (false !== strpos($sql, 'cte_folders')) {
-            $sql = CTE_FOLDERS.' '.$sql;
+            $sql = $CTE_SQL.' '.$sql;
         }
 
         return $this->connection->executeQuery($sql, $params, $types);
@@ -247,31 +283,16 @@ private function addSubfolderJoinParams(
         Folder &$folder,
         bool $archive
     ) {
-        // Query parameters, set at the end
-        $topFolderId = $folder->getId();
-        $excludedFolderId = -1;
-
-        /** @var Folder Archive folder if it exists */
-        $archiveFolder = null;
-
-        try {
-            $archiveFolder = $folder->get('.archive/');
-        } catch (\OCP\Files\NotFoundException $e) {
-        }
-
-        if (!$archive) {
-            // Exclude archive folder
-            if ($archiveFolder) {
-                $excludedFolderId = $archiveFolder->getId();
-            }
-        } else {
-            // Only include archive folder
-            $topFolderId = $archiveFolder ? $archiveFolder->getId() : -1;
+        // Get storages recursively
+        $topFolderIds = [$folder->getId()];
+        $mounts = \OC\Files\Filesystem::getMountManager()->findIn($folder->getPath());
+        foreach ($mounts as &$mount) {
+            $topFolderIds[] = $mount->getStorageRootId();
         }
 
         // Add query parameters
-        $query->setParameter('topFolderId', $topFolderId, IQueryBuilder::PARAM_INT);
-        $query->setParameter('excludedFolderId', $excludedFolderId, IQueryBuilder::PARAM_INT);
+        $query->setParameter('topFolderIds', $topFolderIds, IQueryBuilder::PARAM_INT_ARRAY);
+        $query->setParameter('cteFoldersArchive', $archive, IQueryBuilder::PARAM_BOOL);
     }
 
     /**
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index 43839041a..ecbc95f0f 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -91,10 +91,11 @@ export default class Settings extends Mixins(UserConfig, GlobalMixin) {
   }
 
   async chooseTimelinePath() {
-    const newPath = await this.chooseFolder(
+    let newPath = await this.chooseFolder(
       this.t("memories", "Choose the root of your timeline"),
       this.config_timelinePath
     );
+    if (newPath === "") newPath = "/";
     if (newPath !== this.config_timelinePath) {
       this.config_timelinePath = newPath;
       await this.updateSetting("timelinePath");
@@ -102,10 +103,11 @@ export default class Settings extends Mixins(UserConfig, GlobalMixin) {
   }
 
   async chooseFoldersPath() {
-    const newPath = await this.chooseFolder(
+    let newPath = await this.chooseFolder(
       this.t("memories", "Choose the root for the folders view"),
       this.config_foldersPath
     );
+    if (newPath === "") newPath = "/";
     if (newPath !== this.config_foldersPath) {
       this.config_foldersPath = newPath;
       await this.updateSetting("foldersPath");

From 6c49ace00a42829c8cd82d85f84c19b6fd88ce82 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 07:16:51 -0800
Subject: [PATCH 138/163] edit-date: fix saveMany call (fix #203)

---
 src/components/modal/EditDate.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/modal/EditDate.vue b/src/components/modal/EditDate.vue
index fbf99c0b8..52c5cc822 100644
--- a/src/components/modal/EditDate.vue
+++ b/src/components/modal/EditDate.vue
@@ -335,12 +335,11 @@ export default class EditDate extends Mixins(GlobalMixin) {
         const offset = date.getTime() - pDate.getTime();
         const scale = diff > 0 ? diffNew / diff : 0;
         const pDateNew = new Date(dateNew.getTime() - offset * scale);
-        const res = await axios.patch<any>(
-          generateUrl(EDIT_API_URL, { id: p.fileid }),
-          {
-            date: this.getExifFormat(pDateNew),
-          }
-        );
+        await axios.patch<any>(generateUrl(EDIT_API_URL, { id: p.fileid }), {
+          raw: {
+            DateTimeOriginal: this.getExifFormat(pDateNew),
+          },
+        });
         emit("files:file:updated", { fileid: p.fileid });
       } catch (e) {
         if (e.response?.data?.message) {

From f1e9765814c10dd2f7a94ae8eab26ae64563f376 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 18:29:26 -0800
Subject: [PATCH 139/163] folders: fix byref error (fix #207)

---
 lib/Controller/FoldersTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/FoldersTrait.php b/lib/Controller/FoldersTrait.php
index 847e9fb82..37c5d2173 100644
--- a/lib/Controller/FoldersTrait.php
+++ b/lib/Controller/FoldersTrait.php
@@ -34,7 +34,7 @@ public function getSubfoldersEntry(Folder &$folder)
         return [
             'dayid' => \OCA\Memories\Util::$TAG_DAYID_FOLDERS,
             'count' => \count($folders),
-            'detail' => array_map(function (&$node) use (&$folder) {
+            'detail' => array_map(function ($node) use (&$folder) {
                 return [
                     'fileid' => $node->getId(),
                     'name' => $node->getName(),

From 4c786796dae610e1abd2b8528b85b135d321b56a Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Wed, 16 Nov 2022 03:16:56 +0000
Subject: [PATCH 140/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/de.js   | 32 ++++++++++++++++++++++++++++++--
 l10n/de.json | 32 ++++++++++++++++++++++++++++++--
 l10n/fr.js   | 13 +++++++++++++
 l10n/fr.json | 13 +++++++++++++
 4 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/l10n/de.js b/l10n/de.js
index 3369af5f0..a7f809f76 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Memories" : "Erinnerungen",
     "Yet another photo management app" : "Eine weitere App zur Verwaltung von Fotos",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Erinnerungen\n\nMemories ist eine Fotoverwaltungs-App für Nextcloud mit erweiterten Funktionen, darunter:\n\n- **📸 Zeitleiste**: Fotos und Videos nach Aufnahmedatum sortieren, geparst aus Exif-Daten.\n- **⏪ Zurückspulen**: Springe sofort zu einem beliebigen Zeitpunkt in der Vergangenheit und erlebe deine Erinnerungen erneut.\n- **🤖 KI-Tagging**: Gruppiere Fotos nach Personen und Objekten mithilfe von KI, unterstützt von der App [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Alben**: Erstelle Alben, um Fotos und Videos zu gruppieren. Dann teile diese Alben mit anderen.\n- **📁 Ordner**: Durchsuche deine eigenen und freigegebenen Ordner mit einer ähnlichen, effizienten Zeitleiste.\n- **🎦 Diashow**: Zeige ganz einfach Fotos aus deinerr Chronik und deinen Ordnern an.\n- **📱 Mobiler Support**: Funktioniert auf Geräten jeder Form und Größe über die Web-App.\n- **✏️ Metadaten bearbeiten**: Bearbeite Exif-Daten auf Fotos schnell und einfach.\n- **📦 Archiv**: Speichere Fotos, die du nicht in deiner Chronik sehen möchtest, in einem separaten Ordner.\n- **📹 Videotranskodierung**: Memories transkodiert Videos und verwendet HLS für maximale Leistung.\n- **📷 RAW-Unterstützung**: Zeige RAW-Fotos von deiner Kamera mit der App [Camera RAW Previews](https://apps.nextcloud.com/apps/camerarawpreviews) an.\n- **⚡️ Schnell**: Memories ist extrem schnell. Zeitraum.\n\nUm eine Vorstellung davon zu bekommen, wie Erinnerungen aussehen und sich anfühlen, sehe dir die [öffentliche Demo](https://memories-demo.radialapps.com/apps/memories/) an. Beachte, dass die Demo schreibgeschützt ist und möglicherweise langsam ist, da sie in einer von [Oracle Cloud] (https://www.oracle.com/cloud/free/) bereitgestellten Low-End-VM mit kostenlosem Kontingent ausgeführt wird. Fotonachweise gehen zu [Unsplash](https://unsplash.com/) (Einzelnachweise findest du in jedem Ordner).\n\n## 🚀 Installation\n\n1. Installiere die App aus dem Nextcloud App Store\n1. Führe `php ./occ memory:index` aus, um Metadaten-Indizes für vorhandene Fotos zu generieren.\n1. Öffne die App 📷 Erinnerungen in Nextcloud und lege das Verzeichnis mit deinen Fotos fest. Fotos aus diesem Verzeichnis werden in der Zeitleiste angezeigt, einschließlich aller Fotos in verschachtelten Unterverzeichnissen.\n1. Die Installation des [Vorschaugenerators](https://github.com/rullzer/previewgenerator) zum Vorgenerieren von Miniaturansichten wird dringend empfohlen.",
     "Settings" : "Einstellungen",
     "Timeline" : "Verlauf",
     "Folders" : "Ordner",
@@ -14,6 +15,7 @@ OC.L10N.register(
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Maps" : "Karten",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Ein besseres Fotoerlebnis erwartet dich",
     "Choose the root folder of your timeline to begin" : "Wähle das Wurzelverzeichnis deiner Zeitleiste, um zu beginnen",
     "If you just installed Memories, run:" : "Wenn du Memorys gerade installiert hast, führe Folgendes aus:",
@@ -23,14 +25,20 @@ OC.L10N.register(
     "You can always change this later in settings" : "Du kannst das auch noch später in den Einstellungen ändern.",
     "Choose the root of your timeline" : "Wähle den Start deiner Zeitleiste aus",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuche es nochmal.",
+    "Found {total} photos in {path}" : "{total} Fotos gefunden in {path}",
+    "Failed to get Exif data. Metadata may be lost!" : "Exif-Daten konnten nicht abgerufen werden. Metadaten können verloren gehen!",
+    "No Exif data found! Continue?" : "Keine Exif-Daten gefunden! Fortsetzen?",
+    "Image saved successfully" : "Bild erfolgreich gespeichert",
+    "Error saving image" : "Fehler beim Speichern des Bildes",
     "Unsaved changes" : "Ungespeicherte Änderungen",
-    "Drop changes" : "Änderungen löschen",
+    "Drop changes" : "Änderungen verwerfen",
     "Edit" : "Bearbeiten",
     "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
+    "Remove from album" : "Aus dem Album entfernen",
     "Download" : "Herunterladen",
-    "Favorite" : "Favorit",
+    "Favorite" : "Favorisieren",
     "Unarchive" : "Dearchivieren",
     "Edit Date/Time" : "Datum/Uhrzeit bearbeiten",
     "View in folder" : "In Ordner anzeigen",
@@ -40,6 +48,7 @@ OC.L10N.register(
     "You are about to download a large number of files. Are you sure?" : "Du bist dabei, eine große Anzahl von Dateien herunterzuladen. Bist du dir sicher?",
     "You are about to delete a large number of files. Are you sure?" : "Du bist dabei, eine große Anzahl von Dateien zu löschen. Bist du dir sicher?",
     "You are about to touch a large number of files. Are you sure?" : "Du bist dabei, eine große Anzahl von Dateien zu ändern. Bist du dir sicher?",
+    "Could not remove photos from album" : "Fotos konnten nicht aus dem Album entfernt werden",
     "_{n} selected_::_{n} selected_" : ["{n} ausgewählt","{n} ausgewählt"],
     "Timeline Path" : "Pfad der Zeitlachse",
     "Folders Path" : "Ordnerpfad",
@@ -50,7 +59,10 @@ OC.L10N.register(
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
     "Share" : "Teilen",
     "Sidebar" : "Seitenleiste",
+    "Video sharing not supported yet" : "Teilen von Videos wird bislang nicht unterstützt",
+    "Cannot share this type of data" : "Diese Art von Daten kann nicht geteilt werden",
     "Processing … {n}/{m}" : "Verarbeite … {n}/{m}",
+    "{n} photos added to album" : "{n} Fotos zum Album hinzugefügt",
     "Search for collaborators" : "Suche nach Mitbearbeitenden",
     "Search people or groups" : "Nach Benutzer oder Gruppen suchen",
     "Add {collaboratorLabel} to the collaborators list" : "{collaboratorLabel} zur Liste der Mitarbeitenden hinzufügen",
@@ -69,6 +81,8 @@ OC.L10N.register(
     "New album" : "Neues Album",
     "Create new album" : "Neues Album erstellen",
     "Edit album details" : "Albumdetails bearbeiten",
+    "Could not load the selected album" : "Gewähltes Album konnte nicht geladen werden",
+    "Remove Album" : "Album entfernen",
     "Failed to delete {name}." : "{name} konnte nicht gelöscht werden.",
     "Name of the album" : "Name des Albums",
     "Location of the album" : "Ort des Albums",
@@ -81,7 +95,10 @@ OC.L10N.register(
     "Create album" : "Album erstellen",
     "Add selection to album {albumName}" : "Auswahl zum Album {albumName} hinzufügen",
     "Create a new album." : "Ein neues Album erstellen",
+    "_Share with %n user_::_Share with %n users_" : ["Mit %n Benutzer teilen","Mit %n Benutzern telken"],
+    "_%n item_::_%n items_" : ["%n Element","%n Elemente"],
     "Save collaborators for this album." : "Mitbearbeitende für dieses Album speichern.",
+    "Share Album" : "Album teilen",
     "Year" : "Jahr",
     "Month" : "Monat",
     "Day" : "Tag",
@@ -95,6 +112,7 @@ OC.L10N.register(
     "Exercise caution and make sure you have backups." : "Sei vorsichtig und stelle sicher, dass du Backups hast.",
     "Loading data … {n}/{m}" : "Lade … {n}/{m}",
     "Remove person" : "Person entfernen",
+    "Are you sure you want to remove {name}?" : "Soll {name} wirklich entfernt werden?",
     "Name" : "Name",
     "Rename person" : "Person umbenennen",
     "Update" : "Aktualisieren",
@@ -105,7 +123,13 @@ OC.L10N.register(
     "Error while moving {basename}" : "Fehler beim Verschieben von {basename}",
     "Failed to move {name}." : "{name} konnte nicht verschoben werden.",
     "Move selected photos to person" : "Ausgewählte Fotos zu einer Person verschieben",
+    "Are you sure you want to move the selected photos from {name} to {newName}?" : "Möchtest du die ausgewählten Fotos wirklich von {name} nach {newName} verschieben?",
+    "Share Folder" : "Ordner teilen",
+    "You cannot share the root folder" : "Du kannst den Wurzelordner nicht teilen",
+    "Use the sidebar to share this folder." : "Verwende die Seitenleiste, um diesen Ordner zu teilen.",
+    "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Wenn du eine öffentliche Linkfreigabe erstellst, klicke auf Aktualisieren und ein entsprechender Link zu Memories wird unten angezeigt.",
     "Refresh" : "Aktualisieren",
+    "Share album" : "Album teilen",
     "Delete album" : "Album löschen",
     "Merge with different person" : "Mit einer anderen Person zusammenführen",
     "Mark person in preview" : "Person in Vorschau markieren",
@@ -196,14 +220,18 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachte, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann.",
     "Actual size (100%)" : "Tatsächliche Größe (100%)",
     "Fit size" : "Größe anpassen",
+    "Transcoding failed." : "Transkodierung fehlgeschlagen",
     "Auto" : "Automatisch",
+    "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
     "General Failure" : "Allgemeiner Fehler",
     "Error: {msg}" : "Fehler: {msg}",
     "Failed to delete files." : "Löschen der Dateien fehlgeschlagen",
     "Failed to delete {fileName}." : "{fileName} konnte nicht gelöscht werden.",
+    "Failed to download some files." : "Einige Dateien konnten nicht heruntergeladen werden.",
     "Failed to favorite files." : "Favorisieren von Dateien fehlgeschlagen",
+    "Failed to favorite some files." : "Einige Dateien konnten nicht zu den Favoriten hinzugefügt werden.",
     "Failed to favorite {fileName}." : "{fileName} konnte nicht zu den Favoriten hinzugefügt werden."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 2548d1f4c..9a2a67bf1 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Memories" : "Erinnerungen",
     "Yet another photo management app" : "Eine weitere App zur Verwaltung von Fotos",
+    "# Memories\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects using AI, powered by [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Works on devices of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates on photos quickly and easily.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.\n- **⚡️ Performance**: In general, Memories is extremely fast.\n\n## 🌐 Online Demo\n\n- To get an idea of what memories looks and feels like, check out the [public demo](https://memories-demo.radialapps.com/apps/memories/).\n- The demo is read-only and may be slow (free tier VM from [Oracle Cloud](https://www.oracle.com/cloud/free/)).\n- Photo credits go to [Unsplash](https://unsplash.com/) (for individual credits, refer to each folder).\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store.\n1. Perform the recommended [configuration steps](https://github.com/pulsejet/memories/wiki/Extra-Configuration).\n1. Run `php ./occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos." : "# Erinnerungen\n\nMemories ist eine Fotoverwaltungs-App für Nextcloud mit erweiterten Funktionen, darunter:\n\n- **📸 Zeitleiste**: Fotos und Videos nach Aufnahmedatum sortieren, geparst aus Exif-Daten.\n- **⏪ Zurückspulen**: Springe sofort zu einem beliebigen Zeitpunkt in der Vergangenheit und erlebe deine Erinnerungen erneut.\n- **🤖 KI-Tagging**: Gruppiere Fotos nach Personen und Objekten mithilfe von KI, unterstützt von der App [recognize](https://github.com/nextcloud/recognize).\n- **🖼️ Alben**: Erstelle Alben, um Fotos und Videos zu gruppieren. Dann teile diese Alben mit anderen.\n- **📁 Ordner**: Durchsuche deine eigenen und freigegebenen Ordner mit einer ähnlichen, effizienten Zeitleiste.\n- **🎦 Diashow**: Zeige ganz einfach Fotos aus deinerr Chronik und deinen Ordnern an.\n- **📱 Mobiler Support**: Funktioniert auf Geräten jeder Form und Größe über die Web-App.\n- **✏️ Metadaten bearbeiten**: Bearbeite Exif-Daten auf Fotos schnell und einfach.\n- **📦 Archiv**: Speichere Fotos, die du nicht in deiner Chronik sehen möchtest, in einem separaten Ordner.\n- **📹 Videotranskodierung**: Memories transkodiert Videos und verwendet HLS für maximale Leistung.\n- **📷 RAW-Unterstützung**: Zeige RAW-Fotos von deiner Kamera mit der App [Camera RAW Previews](https://apps.nextcloud.com/apps/camerarawpreviews) an.\n- **⚡️ Schnell**: Memories ist extrem schnell. Zeitraum.\n\nUm eine Vorstellung davon zu bekommen, wie Erinnerungen aussehen und sich anfühlen, sehe dir die [öffentliche Demo](https://memories-demo.radialapps.com/apps/memories/) an. Beachte, dass die Demo schreibgeschützt ist und möglicherweise langsam ist, da sie in einer von [Oracle Cloud] (https://www.oracle.com/cloud/free/) bereitgestellten Low-End-VM mit kostenlosem Kontingent ausgeführt wird. Fotonachweise gehen zu [Unsplash](https://unsplash.com/) (Einzelnachweise findest du in jedem Ordner).\n\n## 🚀 Installation\n\n1. Installiere die App aus dem Nextcloud App Store\n1. Führe `php ./occ memory:index` aus, um Metadaten-Indizes für vorhandene Fotos zu generieren.\n1. Öffne die App 📷 Erinnerungen in Nextcloud und lege das Verzeichnis mit deinen Fotos fest. Fotos aus diesem Verzeichnis werden in der Zeitleiste angezeigt, einschließlich aller Fotos in verschachtelten Unterverzeichnissen.\n1. Die Installation des [Vorschaugenerators](https://github.com/rullzer/previewgenerator) zum Vorgenerieren von Miniaturansichten wird dringend empfohlen.",
     "Settings" : "Einstellungen",
     "Timeline" : "Verlauf",
     "Folders" : "Ordner",
@@ -12,6 +13,7 @@
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Maps" : "Karten",
+    "EXIF" : "EXIF",
     "A better photos experience awaits you" : "Ein besseres Fotoerlebnis erwartet dich",
     "Choose the root folder of your timeline to begin" : "Wähle das Wurzelverzeichnis deiner Zeitleiste, um zu beginnen",
     "If you just installed Memories, run:" : "Wenn du Memorys gerade installiert hast, führe Folgendes aus:",
@@ -21,14 +23,20 @@
     "You can always change this later in settings" : "Du kannst das auch noch später in den Einstellungen ändern.",
     "Choose the root of your timeline" : "Wähle den Start deiner Zeitleiste aus",
     "The selected folder does not seem to be valid. Try again." : "Der ausgewählte Ordner scheint ungültig zu sein. Versuche es nochmal.",
+    "Found {total} photos in {path}" : "{total} Fotos gefunden in {path}",
+    "Failed to get Exif data. Metadata may be lost!" : "Exif-Daten konnten nicht abgerufen werden. Metadaten können verloren gehen!",
+    "No Exif data found! Continue?" : "Keine Exif-Daten gefunden! Fortsetzen?",
+    "Image saved successfully" : "Bild erfolgreich gespeichert",
+    "Error saving image" : "Fehler beim Speichern des Bildes",
     "Unsaved changes" : "Ungespeicherte Änderungen",
-    "Drop changes" : "Änderungen löschen",
+    "Drop changes" : "Änderungen verwerfen",
     "Edit" : "Bearbeiten",
     "Loading …" : "Lade …",
     "Cancel" : "Abbrechen",
     "Delete" : "Löschen",
+    "Remove from album" : "Aus dem Album entfernen",
     "Download" : "Herunterladen",
-    "Favorite" : "Favorit",
+    "Favorite" : "Favorisieren",
     "Unarchive" : "Dearchivieren",
     "Edit Date/Time" : "Datum/Uhrzeit bearbeiten",
     "View in folder" : "In Ordner anzeigen",
@@ -38,6 +46,7 @@
     "You are about to download a large number of files. Are you sure?" : "Du bist dabei, eine große Anzahl von Dateien herunterzuladen. Bist du dir sicher?",
     "You are about to delete a large number of files. Are you sure?" : "Du bist dabei, eine große Anzahl von Dateien zu löschen. Bist du dir sicher?",
     "You are about to touch a large number of files. Are you sure?" : "Du bist dabei, eine große Anzahl von Dateien zu ändern. Bist du dir sicher?",
+    "Could not remove photos from album" : "Fotos konnten nicht aus dem Album entfernt werden",
     "_{n} selected_::_{n} selected_" : ["{n} ausgewählt","{n} ausgewählt"],
     "Timeline Path" : "Pfad der Zeitlachse",
     "Folders Path" : "Ordnerpfad",
@@ -48,7 +57,10 @@
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
     "Share" : "Teilen",
     "Sidebar" : "Seitenleiste",
+    "Video sharing not supported yet" : "Teilen von Videos wird bislang nicht unterstützt",
+    "Cannot share this type of data" : "Diese Art von Daten kann nicht geteilt werden",
     "Processing … {n}/{m}" : "Verarbeite … {n}/{m}",
+    "{n} photos added to album" : "{n} Fotos zum Album hinzugefügt",
     "Search for collaborators" : "Suche nach Mitbearbeitenden",
     "Search people or groups" : "Nach Benutzer oder Gruppen suchen",
     "Add {collaboratorLabel} to the collaborators list" : "{collaboratorLabel} zur Liste der Mitarbeitenden hinzufügen",
@@ -67,6 +79,8 @@
     "New album" : "Neues Album",
     "Create new album" : "Neues Album erstellen",
     "Edit album details" : "Albumdetails bearbeiten",
+    "Could not load the selected album" : "Gewähltes Album konnte nicht geladen werden",
+    "Remove Album" : "Album entfernen",
     "Failed to delete {name}." : "{name} konnte nicht gelöscht werden.",
     "Name of the album" : "Name des Albums",
     "Location of the album" : "Ort des Albums",
@@ -79,7 +93,10 @@
     "Create album" : "Album erstellen",
     "Add selection to album {albumName}" : "Auswahl zum Album {albumName} hinzufügen",
     "Create a new album." : "Ein neues Album erstellen",
+    "_Share with %n user_::_Share with %n users_" : ["Mit %n Benutzer teilen","Mit %n Benutzern telken"],
+    "_%n item_::_%n items_" : ["%n Element","%n Elemente"],
     "Save collaborators for this album." : "Mitbearbeitende für dieses Album speichern.",
+    "Share Album" : "Album teilen",
     "Year" : "Jahr",
     "Month" : "Monat",
     "Day" : "Tag",
@@ -93,6 +110,7 @@
     "Exercise caution and make sure you have backups." : "Sei vorsichtig und stelle sicher, dass du Backups hast.",
     "Loading data … {n}/{m}" : "Lade … {n}/{m}",
     "Remove person" : "Person entfernen",
+    "Are you sure you want to remove {name}?" : "Soll {name} wirklich entfernt werden?",
     "Name" : "Name",
     "Rename person" : "Person umbenennen",
     "Update" : "Aktualisieren",
@@ -103,7 +121,13 @@
     "Error while moving {basename}" : "Fehler beim Verschieben von {basename}",
     "Failed to move {name}." : "{name} konnte nicht verschoben werden.",
     "Move selected photos to person" : "Ausgewählte Fotos zu einer Person verschieben",
+    "Are you sure you want to move the selected photos from {name} to {newName}?" : "Möchtest du die ausgewählten Fotos wirklich von {name} nach {newName} verschieben?",
+    "Share Folder" : "Ordner teilen",
+    "You cannot share the root folder" : "Du kannst den Wurzelordner nicht teilen",
+    "Use the sidebar to share this folder." : "Verwende die Seitenleiste, um diesen Ordner zu teilen.",
+    "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Wenn du eine öffentliche Linkfreigabe erstellst, klicke auf Aktualisieren und ein entsprechender Link zu Memories wird unten angezeigt.",
     "Refresh" : "Aktualisieren",
+    "Share album" : "Album teilen",
     "Delete album" : "Album löschen",
     "Merge with different person" : "Mit einer anderen Person zusammenführen",
     "Mark person in preview" : "Person in Vorschau markieren",
@@ -194,14 +218,18 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Beachte, dass der ausgewählte Zuschneidebereich kleiner ist als die angewendete Größenänderung, was zu Qualitätseinbußen führen kann.",
     "Actual size (100%)" : "Tatsächliche Größe (100%)",
     "Fit size" : "Größe anpassen",
+    "Transcoding failed." : "Transkodierung fehlgeschlagen",
     "Auto" : "Automatisch",
+    "Shared Folder" : "Geteilter Ordner",
     "Failed to create {albumName}." : "{albumName} konnte nicht erstellt werden.",
     "Failed to rename {currentAlbumName} to {newAlbumName}." : "{currentAlbumName} konnte nicht in {newAlbumName} umbenannt werden.",
     "General Failure" : "Allgemeiner Fehler",
     "Error: {msg}" : "Fehler: {msg}",
     "Failed to delete files." : "Löschen der Dateien fehlgeschlagen",
     "Failed to delete {fileName}." : "{fileName} konnte nicht gelöscht werden.",
+    "Failed to download some files." : "Einige Dateien konnten nicht heruntergeladen werden.",
     "Failed to favorite files." : "Favorisieren von Dateien fehlgeschlagen",
+    "Failed to favorite some files." : "Einige Dateien konnten nicht zu den Favoriten hinzugefügt werden.",
     "Failed to favorite {fileName}." : "{fileName} konnte nicht zu den Favoriten hinzugefügt werden."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/fr.js b/l10n/fr.js
index fa6dc40aa..4a8fa48ce 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -14,7 +14,14 @@ OC.L10N.register(
     "On this day" : "Ce même jour",
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
+    "Choose the root folder of your timeline to begin" : "Choisissez le dossier racine de votre fil chronologique pour commencer",
     "If you just installed Memories, run:" : "Si vous venez d'installer Souvenirs, exécuter :",
+    "Continue to Memories" : "Continuer vers Souvenirs",
+    "Choose again" : "Choisir à nouveau",
+    "Click here to start" : "Cliquer ici pour commencer",
+    "You can always change this later in settings" : "Vous pouvez toujours changer cela ultérieurement dans les paramètres",
+    "Choose the root of your timeline" : "Choisissez le début de votre fil chronologique",
+    "The selected folder does not seem to be valid. Try again." : "Le dossier sélectionné ne semble pas être valide. Essayer à nouveau.",
     "Image saved successfully" : "Image enregistrée avec succès",
     "Error saving image" : "Erreur lors de l'enregistrement de l'image",
     "Unsaved changes" : "Modifications non enregistrées",
@@ -36,6 +43,7 @@ OC.L10N.register(
     "You are about to touch a large number of files. Are you sure?" : "Vous êtes sur le point de modifier un grand nombre de fichiers. Êtes-vous sûr(e) ?",
     "_{n} selected_::_{n} selected_" : ["{n} sélectionné","{n} sélectionnés","{n} sélectionnés"],
     "Timeline Path" : "Emplacement du Fil chronologique",
+    "Folders Path" : "Chemin du dossier",
     "Show hidden folders" : "Afficher les dossiers cachés",
     "Your Timeline" : "Votre fil chronologique",
     "Failed to load some photos" : "Échec du chargement de certaines photos",
@@ -93,10 +101,15 @@ OC.L10N.register(
     "Rename person" : "Renommer la personne",
     "Update" : "Mise à jour",
     "Failed to rename {oldName} to {name}." : "Échec du renommage de {oldName} en {name}.",
+    "You cannot share the root folder" : "Vous ne pouvez pas partager le dossier racine",
+    "Use the sidebar to share this folder." : "Utiliser la barre latérale pour partager ce dossier.",
+    "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Si vous créez un partage de lien public, cliquez sur rafraîchir et un lien correspondant à Souvenirs sera visible ci-dessous.",
     "Refresh" : "Actualiser",
     "Delete album" : "Supprimer l'album",
     "Merge with different person" : "Fusionner avec une différente personne",
     "Share folder" : "Partager le dossier",
+    "Move left" : "Vers la gauche",
+    "Move right" : "Vers la droite",
     "Save as" : "Enregistrer sous",
     "Reset" : "Réinitialiser",
     "All changes will be lost." : "Tous les changements seront perdus.",
diff --git a/l10n/fr.json b/l10n/fr.json
index d0be5c330..c9670f8ba 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -12,7 +12,14 @@
     "On this day" : "Ce même jour",
     "Tags" : "Étiquettes",
     "Maps" : "Cartes",
+    "Choose the root folder of your timeline to begin" : "Choisissez le dossier racine de votre fil chronologique pour commencer",
     "If you just installed Memories, run:" : "Si vous venez d'installer Souvenirs, exécuter :",
+    "Continue to Memories" : "Continuer vers Souvenirs",
+    "Choose again" : "Choisir à nouveau",
+    "Click here to start" : "Cliquer ici pour commencer",
+    "You can always change this later in settings" : "Vous pouvez toujours changer cela ultérieurement dans les paramètres",
+    "Choose the root of your timeline" : "Choisissez le début de votre fil chronologique",
+    "The selected folder does not seem to be valid. Try again." : "Le dossier sélectionné ne semble pas être valide. Essayer à nouveau.",
     "Image saved successfully" : "Image enregistrée avec succès",
     "Error saving image" : "Erreur lors de l'enregistrement de l'image",
     "Unsaved changes" : "Modifications non enregistrées",
@@ -34,6 +41,7 @@
     "You are about to touch a large number of files. Are you sure?" : "Vous êtes sur le point de modifier un grand nombre de fichiers. Êtes-vous sûr(e) ?",
     "_{n} selected_::_{n} selected_" : ["{n} sélectionné","{n} sélectionnés","{n} sélectionnés"],
     "Timeline Path" : "Emplacement du Fil chronologique",
+    "Folders Path" : "Chemin du dossier",
     "Show hidden folders" : "Afficher les dossiers cachés",
     "Your Timeline" : "Votre fil chronologique",
     "Failed to load some photos" : "Échec du chargement de certaines photos",
@@ -91,10 +99,15 @@
     "Rename person" : "Renommer la personne",
     "Update" : "Mise à jour",
     "Failed to rename {oldName} to {name}." : "Échec du renommage de {oldName} en {name}.",
+    "You cannot share the root folder" : "Vous ne pouvez pas partager le dossier racine",
+    "Use the sidebar to share this folder." : "Utiliser la barre latérale pour partager ce dossier.",
+    "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Si vous créez un partage de lien public, cliquez sur rafraîchir et un lien correspondant à Souvenirs sera visible ci-dessous.",
     "Refresh" : "Actualiser",
     "Delete album" : "Supprimer l'album",
     "Merge with different person" : "Fusionner avec une différente personne",
     "Share folder" : "Partager le dossier",
+    "Move left" : "Vers la gauche",
+    "Move right" : "Vers la droite",
     "Save as" : "Enregistrer sous",
     "Reset" : "Réinitialiser",
     "All changes will be lost." : "Tous les changements seront perdus.",

From 0c6d5a57b58e22839de04df3de4ec7fa88ca7c39 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 21:05:11 -0800
Subject: [PATCH 141/163] Fix filename of recursive mounts

---
 lib/Db/TimelineQueryDays.php | 100 ++++++++++++++++++++++++-----------
 src/components/Timeline.vue  |   4 +-
 2 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index 23c405cb9..dee832960 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -9,16 +9,18 @@
 use OCP\IDBConnection;
 
 const CTE_FOLDERS = // CTE to get all folders recursively in the given top folders excluding archive
-    'WITH RECURSIVE *PREFIX*cte_folders(fileid) AS (
+    'WITH RECURSIVE *PREFIX*cte_folders(fileid, rootid) AS (
         SELECT
-            f.fileid
+            f.fileid,
+            f.fileid AS rootid
         FROM
             *PREFIX*filecache f
         WHERE
             f.fileid IN (:topFolderIds)
         UNION ALL
         SELECT
-            f.fileid
+            f.fileid,
+            c.rootid
         FROM
             *PREFIX*filecache f
         INNER JOIN *PREFIX*cte_folders c
@@ -65,6 +67,9 @@ trait TimelineQueryDays
 {
     protected IDBConnection $connection;
 
+    /** Map of rootid => mount point */
+    private $topFolderPaths = [];
+
     /**
      * Get the days response from the database for the timeline.
      *
@@ -196,30 +201,51 @@ private function processDays(&$days)
      */
     private function processDay(&$day, $uid, $folder)
     {
-        $basePath = '#__#__#';
-        $davPath = '';
+        /**
+         * Path entry in database for folder.
+         * We need to splice this from the start of the file path.
+         */
+        $internalPaths = [];
+
+        /**
+         * DAV paths for the folders.
+         * We need to prefix this to the start of the file path.
+         */
+        $davPaths = [];
+
+        /**
+         * The root folder id for the folder.
+         * We fallback to this if rootid is not found
+         */
+        $defaultRootId = 0;
+
         if (null !== $folder) {
+            // Get root id of the top folder
+            $defaultRootId = $folder->getId();
+
             // No way to get the internal path from the folder
             $query = $this->connection->getQueryBuilder();
-            $query->select('path')
+            $query->select('fileid', 'path')
                 ->from('filecache')
-                ->where($query->expr()->eq('fileid', $query->createNamedParameter($folder->getId(), IQueryBuilder::PARAM_INT)))
+                ->where($query->expr()->in('fileid', $query->createNamedParameter(array_keys($this->topFolderPaths), IQueryBuilder::PARAM_INT_ARRAY)))
             ;
-            $path = $query->executeQuery()->fetchOne();
-            $basePath = $path ?: $basePath;
-
-            // Get user facing path
-            // getPath looks like /user/files/... but we want /files/user/...
-            // Split at / and swap these
-            // For public shares, we just give the relative path
-            if (!empty($uid)) {
-                $actualPath = $folder->getPath();
-                $actualPath = explode('/', $actualPath);
-                if (\count($actualPath) >= 3) {
-                    $tmp = $actualPath[1];
-                    $actualPath[1] = $actualPath[2];
-                    $actualPath[2] = $tmp;
-                    $davPath = implode('/', $actualPath);
+            $paths = $query->executeQuery()->fetchAll();
+            foreach ($paths as &$path) {
+                $fileid = (int) $path['fileid'];
+                $internalPaths[$fileid] = $path['path'];
+
+                // Get DAV path.
+                // getPath looks like /user/files/... but we want /files/user/...
+                // Split at / and swap these
+                // For public shares, we just give the relative path
+                if (!empty($uid) && ($actualPath = $this->topFolderPaths[$fileid])) {
+                    $actualPath = explode('/', $actualPath);
+                    if (\count($actualPath) >= 3) {
+                        $tmp = $actualPath[1];
+                        $actualPath[1] = $actualPath[2];
+                        $actualPath[2] = $tmp;
+                        $davPaths[$fileid] = implode('/', $actualPath);
+                    }
                 }
             }
         }
@@ -245,9 +271,14 @@ private function processDay(&$day, $uid, $folder)
 
             // Check if path exists and starts with basePath and remove
             if (isset($row['path']) && !empty($row['path'])) {
+                $rootId = $row['rootid'] ?: $defaultRootId;
+                $basePath = $internalPaths[$rootId] ?: '#__#';
+                $davPath = $davPaths[$rootId] ?: '';
+
                 if (0 === strpos($row['path'], $basePath)) {
                     $row['filename'] = $davPath.substr($row['path'], \strlen($basePath));
                 }
+
                 unset($row['path']);
             }
 
@@ -280,18 +311,10 @@ private function executeQueryWithCTEs(IQueryBuilder &$query, string $psql = '')
      */
     private function addSubfolderJoinParams(
         IQueryBuilder &$query,
-        Folder &$folder,
         bool $archive
     ) {
-        // Get storages recursively
-        $topFolderIds = [$folder->getId()];
-        $mounts = \OC\Files\Filesystem::getMountManager()->findIn($folder->getPath());
-        foreach ($mounts as &$mount) {
-            $topFolderIds[] = $mount->getStorageRootId();
-        }
-
         // Add query parameters
-        $query->setParameter('topFolderIds', $topFolderIds, IQueryBuilder::PARAM_INT_ARRAY);
+        $query->setParameter('topFolderIds', array_keys($this->topFolderPaths), IQueryBuilder::PARAM_INT_ARRAY);
         $query->setParameter('cteFoldersArchive', $archive, IQueryBuilder::PARAM_BOOL);
     }
 
@@ -315,12 +338,25 @@ private function joinFilecache(
             return $query->innerJoin('m', 'filecache', 'f', $baseOp);
         }
 
+        // Create top folders paths for later processing
+        $this->topFolderPaths = [];
+        $this->topFolderPaths[$folder->getId()] = $folder->getPath();
+
         // Filter by folder (recursive or otherwise)
         $pathOp = null;
         if ($recursive) {
+            // Add mountpoints recursively
+            $this->mounts = \OC\Files\Filesystem::getMountManager()->findIn($folder->getPath());
+            foreach ($this->mounts as &$mount) {
+                $id = $mount->getStorageRootId();
+                $path = $mount->getMountPoint();
+                $this->topFolderPaths[$id] = $path;
+            }
+
             // Join with folders CTE
-            $this->addSubfolderJoinParams($query, $folder, $archive);
+            $this->addSubfolderJoinParams($query, $archive);
             $query->innerJoin('f', 'cte_folders', 'cte_f', $query->expr()->eq('f.parent', 'cte_f.fileid'));
+            $query->addSelect('cte_f.rootid');
         } else {
             // If getting non-recursively folder only check for parent
             $pathOp = $query->expr()->eq('f.parent', $query->createNamedParameter($folder->getId(), IQueryBuilder::PARAM_INT));
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index 419ef280a..c7bbd2df8 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -917,7 +917,9 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
             head.day.detail.length === photos.length &&
             head.day.detail.every(
               (p, i) =>
-                p.fileid === photos[i].fileid && p.etag === photos[i].etag
+                p.fileid === photos[i].fileid &&
+                p.etag === photos[i].etag &&
+                p.filename === photos[i].filename
             )
           ) {
             continue;

From 46ac8cf55e8c45370b1d8e8c4290513a3ee67b75 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 21:22:40 -0800
Subject: [PATCH 142/163] Fix archive rootid

---
 lib/Db/TimelineQueryDays.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index dee832960..bd0a17497 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -31,32 +31,38 @@
     )';
 
 const CTE_FOLDERS_ARCHIVE = // CTE to get all archive folders recursively in the given top folders
-    'WITH RECURSIVE *PREFIX*cte_folders_all(fileid, name) AS (
+    'WITH RECURSIVE *PREFIX*cte_folders_all(fileid, name, rootid) AS (
         SELECT
-            f.fileid, f.name
+            f.fileid,
+            f.name,
+            f.fileid AS rootid
         FROM
             *PREFIX*filecache f
         WHERE
             f.fileid IN (:topFolderIds)
         UNION ALL
         SELECT
-            f.fileid, f.name
+            f.fileid,
+            f.name,
+            c.rootid
         FROM
             *PREFIX*filecache f
         INNER JOIN *PREFIX*cte_folders_all c
             ON (f.parent = c.fileid
                 AND f.mimetype = (SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = \'httpd/unix-directory\')
             )
-    ), *PREFIX*cte_folders(fileid) AS (
+    ), *PREFIX*cte_folders(fileid, rootid) AS (
         SELECT
-            f.fileid
+            cfa.fileid,
+            cfa.rootid
         FROM
-            *PREFIX*cte_folders_all f
+            *PREFIX*cte_folders_all cfa
         WHERE
-            f.name = \'.archive\'
+            cfa.name = \'.archive\'
         UNION ALL
         SELECT
-            f.fileid
+            f.fileid,
+            c.rootid
         FROM
             *PREFIX*filecache f
         INNER JOIN *PREFIX*cte_folders c

From c41ad9549afbd1a968cfcc3a6d1a5c35c33b885e Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 21:45:32 -0800
Subject: [PATCH 143/163] Fix archive logic for mounts

---
 lib/Controller/ArchiveController.php | 69 +++++++++++++++++-----------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/lib/Controller/ArchiveController.php b/lib/Controller/ArchiveController.php
index f6c518b4f..c4510489d 100644
--- a/lib/Controller/ArchiveController.php
+++ b/lib/Controller/ArchiveController.php
@@ -64,52 +64,65 @@ public function archive(string $id): JSONResponse
         if (null === $timelineFolder || !$timelineFolder instanceof Folder) {
             return new JSONResponse(['message' => 'Cannot get timeline'], Http::STATUS_INTERNAL_SERVER_ERROR);
         }
-        if (!$timelineFolder->isCreatable()) {
-            return new JSONResponse(['message' => 'Cannot create archive folder'], Http::STATUS_FORBIDDEN);
-        }
 
-        // Get path of current file relative to the timeline folder
-        // remove timelineFolder path from start of file path
-        $timelinePath = $timelineFolder->getPath(); // no trailing slash
-        if (substr($file->getPath(), 0, \strlen($timelinePath)) !== $timelinePath) {
-            return new JSONResponse(['message' => 'Files outside timeline cannot be archived'], Http::STATUS_INTERNAL_SERVER_ERROR);
+        // Bubble up from file until we reach the correct folder
+        $fileStorageId = $file->getStorage()->getId();
+        $parent = $file->getParent();
+        $isArchived = false;
+        while (true) {
+            if (null === $parent) {
+                throw new \Exception('Cannot get correct parent of file');
+            }
+
+            if ($parent->getPath() === $timelineFolder->getPath()) {
+                break;
+            }
+
+            if ($parent->getParent()->getStorage()->getId() !== $fileStorageId) {
+                break;
+            }
+
+            if ($parent->getName() === \OCA\Memories\Util::$ARCHIVE_FOLDER) {
+                $isArchived = true;
+                break;
+            }
+
+            $parent = $parent->getParent();
         }
-        $relativePath = substr($file->getPath(), \strlen($timelinePath)); // has a leading slash
 
-        // Final path of the file including the file name
-        $destinationPath = '';
+        // Get path of current file relative to the parent folder
+        $relativeFilePath = $parent->getRelativePath($file->getPath());
 
         // Check if we want to archive or unarchive
         $body = $this->request->getParams();
         $unarchive = isset($body['archive']) && false === $body['archive'];
+        if ($isArchived && !$unarchive) {
+            return new JSONResponse(['message' => 'File already archived'], Http::STATUS_BAD_REQUEST);
+        } else if (!$isArchived && $unarchive) {
+            return new JSONResponse(['message' => 'File not archived'], Http::STATUS_BAD_REQUEST);
+        }
+
+        // Final path of the file including the file name
+        $destinationPath = '';
 
         // Get if the file is already in the archive (relativePath starts with archive)
-        $archiveFolderWithLeadingSlash = '/'.\OCA\Memories\Util::$ARCHIVE_FOLDER;
-        if (substr($relativePath, 0, \strlen($archiveFolderWithLeadingSlash)) === $archiveFolderWithLeadingSlash) {
-            // file already in archive, remove it instead
-            $destinationPath = substr($relativePath, \strlen($archiveFolderWithLeadingSlash));
-            if (!$unarchive) {
-                return new JSONResponse(['message' => 'File already archived'], Http::STATUS_BAD_REQUEST);
-            }
+        if ($isArchived) {
+            // file already in archive, remove it
+            $destinationPath = $relativeFilePath;
+            $parent = $parent->getParent();
         } else {
             // file not in archive, put it in there
-            $destinationPath = Exif::removeExtraSlash(\OCA\Memories\Util::$ARCHIVE_FOLDER.$relativePath);
-            if ($unarchive) {
-                return new JSONResponse(['message' => 'File not archived'], Http::STATUS_BAD_REQUEST);
-            }
+            $af = \OCA\Memories\Util::$ARCHIVE_FOLDER;
+            $destinationPath = Exif::removeExtraSlash($af.$relativeFilePath);
         }
 
         // Remove the filename
-        $destinationFolders = explode('/', $destinationPath);
+        $destinationFolders = array_filter(explode('/', $destinationPath));
         array_pop($destinationFolders);
 
         // Create folder tree
-        $folder = $timelineFolder;
+        $folder = $parent;
         foreach ($destinationFolders as $folderName) {
-            if ('' === $folderName) {
-                continue;
-            }
-
             try {
                 $existingFolder = $folder->get($folderName.'/');
                 if (!$existingFolder instanceof Folder) {

From e9f67b24e68bcb9b30aae67cad0be1be20cb1001 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 21:45:52 -0800
Subject: [PATCH 144/163] Lint PHP

---
 lib/Controller/ArchiveController.php | 4 +++-
 lib/Db/TimelineQueryDays.php         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/ArchiveController.php b/lib/Controller/ArchiveController.php
index c4510489d..1e416d14e 100644
--- a/lib/Controller/ArchiveController.php
+++ b/lib/Controller/ArchiveController.php
@@ -84,6 +84,7 @@ public function archive(string $id): JSONResponse
 
             if ($parent->getName() === \OCA\Memories\Util::$ARCHIVE_FOLDER) {
                 $isArchived = true;
+
                 break;
             }
 
@@ -98,7 +99,8 @@ public function archive(string $id): JSONResponse
         $unarchive = isset($body['archive']) && false === $body['archive'];
         if ($isArchived && !$unarchive) {
             return new JSONResponse(['message' => 'File already archived'], Http::STATUS_BAD_REQUEST);
-        } else if (!$isArchived && $unarchive) {
+        }
+        if (!$isArchived && $unarchive) {
             return new JSONResponse(['message' => 'File not archived'], Http::STATUS_BAD_REQUEST);
         }
 
diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index bd0a17497..9b74ca5f7 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -221,7 +221,7 @@ private function processDay(&$day, $uid, $folder)
 
         /**
          * The root folder id for the folder.
-         * We fallback to this if rootid is not found
+         * We fallback to this if rootid is not found.
          */
         $defaultRootId = 0;
 

From 4a5408b846cbe863320bd92cdeaf545c1cbbee4b Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 22:44:55 -0800
Subject: [PATCH 145/163] image-editor: remove more extraneous props

---
 src/components/ImageEditor.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/ImageEditor.vue b/src/components/ImageEditor.vue
index 80131b849..8e051e9e2 100644
--- a/src/components/ImageEditor.vue
+++ b/src/components/ImageEditor.vue
@@ -220,6 +220,11 @@ export default class ImageEditor extends Mixins(GlobalMixin) {
       delete exif.ExifImageHeight;
       delete exif.ExifImageWidth;
       delete exif.ExifImageSize;
+      delete exif.CompatibleBrands;
+      delete exif.FileType;
+      delete exif.FileTypeExtension;
+      delete exif.MIMEType;
+      delete exif.MajorBrand;
 
       // Update exif data
       await axios.patch(

From d9afbbe710e60d606d6e2f5420e2bfe1a44f5282 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 15 Nov 2022 23:45:01 -0800
Subject: [PATCH 146/163] Refactor all calls to use TimelineRoot

---
 lib/Controller/ApiBase.php         | 21 +++++++--
 lib/Controller/DaysController.php  | 28 +++++------
 lib/Controller/FacesController.php | 15 +++---
 lib/Controller/TagsController.php  | 12 ++---
 lib/Db/TimelineQueryDays.php       | 75 +++++++++++-------------------
 lib/Db/TimelineQueryFaces.php      |  8 ++--
 lib/Db/TimelineQueryFolders.php    |  4 +-
 lib/Db/TimelineQueryTags.php       |  8 ++--
 lib/Db/TimelineRoot.php            | 67 ++++++++++++++++++++++++++
 9 files changed, 150 insertions(+), 88 deletions(-)
 create mode 100644 lib/Db/TimelineRoot.php

diff --git a/lib/Controller/ApiBase.php b/lib/Controller/ApiBase.php
index 146e78794..d84843899 100644
--- a/lib/Controller/ApiBase.php
+++ b/lib/Controller/ApiBase.php
@@ -25,6 +25,7 @@
 
 use OCA\Memories\AppInfo\Application;
 use OCA\Memories\Db\TimelineQuery;
+use OCA\Memories\Db\TimelineRoot;
 use OCA\Memories\Db\TimelineWrite;
 use OCA\Memories\Exif;
 use OCP\App\IAppManager;
@@ -88,12 +89,14 @@ protected function getUid(): string
         return $user ? $user->getUID() : '';
     }
 
-    /** Get the Folder object relevant to the request */
-    protected function getRequestFolder()
+    /** Get the TimelineRoot object relevant to the request */
+    protected function getRequestRoot()
     {
+        $root = new TimelineRoot();
+
         // Albums have no folder
         if ($this->request->getParam('album')) {
-            return null;
+            return $root;
         }
 
         // Public shared folder
@@ -103,7 +106,9 @@ protected function getRequestFolder()
                 throw new \Exception('Share not found or invalid');
             }
 
-            return $share;
+            $root->addFolder($share);
+
+            return $root;
         }
 
         // Anything else needs a user
@@ -135,7 +140,13 @@ protected function getRequestFolder()
             throw new \Exception('Folder not readable');
         }
 
-        return $folder;
+        // Don't add mount points for folder view
+        $root->addFolder($folder);
+        if (null === $folderPath) {
+            $root->addMountPoints();
+        }
+
+        return $root;
     }
 
     /**
diff --git a/lib/Controller/DaysController.php b/lib/Controller/DaysController.php
index 5133676b8..f3512cf31 100644
--- a/lib/Controller/DaysController.php
+++ b/lib/Controller/DaysController.php
@@ -23,9 +23,9 @@
 
 namespace OCA\Memories\Controller;
 
+use OCA\Memories\Db\TimelineRoot;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
-use OCP\Files\Folder;
 
 class DaysController extends ApiBase
 {
@@ -42,10 +42,10 @@ public function days(): JSONResponse
         $uid = $this->getUid();
 
         // Get the folder to show
-        $folder = null;
+        $root = null;
 
         try {
-            $folder = $this->getRequestFolder();
+            $root = $this->getRequestRoot();
         } catch (\Exception $e) {
             return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_NOT_FOUND);
         }
@@ -53,7 +53,7 @@ public function days(): JSONResponse
         // Run actual query
         try {
             $list = $this->timelineQuery->getDays(
-                $folder,
+                $root,
                 $uid,
                 $this->isRecursive(),
                 $this->isArchive(),
@@ -65,7 +65,7 @@ public function days(): JSONResponse
                 $list = $this->timelineQuery->daysToMonths($list);
             } else {
                 // Preload some day responses
-                $this->preloadDays($list, $uid, $folder);
+                $this->preloadDays($list, $uid, $root);
             }
 
             // Reverse response if requested. Folders still stay at top.
@@ -75,7 +75,7 @@ public function days(): JSONResponse
 
             // Add subfolder info if querying non-recursively
             if (!$this->isRecursive()) {
-                array_unshift($list, $this->getSubfoldersEntry($folder));
+                array_unshift($list, $this->getSubfoldersEntry($root->getFolder($root->getOneId())));
             }
 
             return new JSONResponse($list, Http::STATUS_OK);
@@ -111,10 +111,10 @@ public function day(string $id): JSONResponse
         }
 
         // Get the folder to show
-        $folder = null;
+        $root = null;
 
         try {
-            $folder = $this->getRequestFolder();
+            $root = $this->getRequestRoot();
         } catch (\Exception $e) {
             return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_NOT_FOUND);
         }
@@ -127,7 +127,7 @@ public function day(string $id): JSONResponse
         // Run actual query
         try {
             $list = $this->timelineQuery->getDay(
-                $folder,
+                $root,
                 $uid,
                 $dayIds,
                 $this->isRecursive(),
@@ -237,11 +237,11 @@ private function getTransformations(bool $aggregateOnly)
     /**
      * Preload a few "day" at the start of "days" response.
      *
-     * @param array       $days   the days array
-     * @param string      $uid    User ID or blank for public shares
-     * @param null|Folder $folder the folder to search in
+     * @param array        $days the days array
+     * @param string       $uid  User ID or blank for public shares
+     * @param TimelineRoot $root the root folder
      */
-    private function preloadDays(array &$days, string $uid, &$folder)
+    private function preloadDays(array &$days, string $uid, TimelineRoot &$root)
     {
         $transforms = $this->getTransformations(false);
         $preloaded = 0;
@@ -263,7 +263,7 @@ private function preloadDays(array &$days, string $uid, &$folder)
 
         if (\count($preloadDayIds) > 0) {
             $allDetails = $this->timelineQuery->getDay(
-                $folder,
+                $root,
                 $uid,
                 $preloadDayIds,
                 $this->isRecursive(),
diff --git a/lib/Controller/FacesController.php b/lib/Controller/FacesController.php
index f4dfd0973..c768129e3 100644
--- a/lib/Controller/FacesController.php
+++ b/lib/Controller/FacesController.php
@@ -49,14 +49,14 @@ public function faces(): JSONResponse
         }
 
         // If this isn't the timeline folder then things aren't going to work
-        $folder = $this->getRequestFolder();
-        if (null === $folder) {
+        $root = $this->getRequestRoot();
+        if ($root->isEmpty()) {
             return new JSONResponse([], Http::STATUS_NOT_FOUND);
         }
 
         // Run actual query
         $list = $this->timelineQuery->getFaces(
-            $folder,
+            $root,
         );
 
         return new JSONResponse($list, Http::STATUS_OK);
@@ -84,22 +84,23 @@ public function preview(string $id): Http\Response
         }
 
         // Get folder to search for
-        $folder = $this->getRequestFolder();
-        if (null === $folder) {
+        $root = $this->getRequestRoot();
+        if ($root->isEmpty()) {
             return new JSONResponse([], Http::STATUS_NOT_FOUND);
         }
 
         // Run actual query
-        $detections = $this->timelineQuery->getFacePreviewDetection($folder, (int) $id);
+        $detections = $this->timelineQuery->getFacePreviewDetection($root, (int) $id);
         if (null === $detections || 0 === \count($detections)) {
             return new DataResponse([], Http::STATUS_NOT_FOUND);
         }
 
         // Find the first detection that has a preview
         $preview = null;
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
         foreach ($detections as &$detection) {
             // Get the file (also checks permissions)
-            $files = $folder->getById($detection['file_id']);
+            $files = $userFolder->getById($detection['file_id']);
             if (0 === \count($files) || FileInfo::TYPE_FILE !== $files[0]->getType()) {
                 continue;
             }
diff --git a/lib/Controller/TagsController.php b/lib/Controller/TagsController.php
index d4c3c667e..c689253db 100644
--- a/lib/Controller/TagsController.php
+++ b/lib/Controller/TagsController.php
@@ -46,14 +46,14 @@ public function tags(): JSONResponse
         }
 
         // If this isn't the timeline folder then things aren't going to work
-        $folder = $this->getRequestFolder();
-        if (null === $folder) {
+        $root = $this->getRequestRoot();
+        if ($root->isEmpty()) {
             return new JSONResponse([], Http::STATUS_NOT_FOUND);
         }
 
         // Run actual query
         $list = $this->timelineQuery->getTags(
-            $folder,
+            $root,
         );
 
         return new JSONResponse($list, Http::STATUS_OK);
@@ -77,8 +77,8 @@ public function previews(): JSONResponse
         }
 
         // If this isn't the timeline folder then things aren't going to work
-        $folder = $this->getRequestFolder();
-        if (null === $folder) {
+        $root = $this->getRequestRoot();
+        if ($root->isEmpty()) {
             return new JSONResponse([], Http::STATUS_NOT_FOUND);
         }
 
@@ -88,7 +88,7 @@ public function previews(): JSONResponse
         // Run actual query
         $list = $this->timelineQuery->getTagPreviews(
             $tagName,
-            $folder,
+            $root,
         );
 
         return new JSONResponse($list, Http::STATUS_OK);
diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index 9b74ca5f7..40526edfb 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -5,7 +5,6 @@
 namespace OCA\Memories\Db;
 
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\Files\Folder;
 use OCP\IDBConnection;
 
 const CTE_FOLDERS = // CTE to get all folders recursively in the given top folders excluding archive
@@ -73,21 +72,18 @@ trait TimelineQueryDays
 {
     protected IDBConnection $connection;
 
-    /** Map of rootid => mount point */
-    private $topFolderPaths = [];
-
     /**
      * Get the days response from the database for the timeline.
      *
-     * @param null|Folder $folder          The folder to get the days from
-     * @param bool        $recursive       Whether to get the days recursively
-     * @param bool        $archive         Whether to get the days only from the archive folder
-     * @param array       $queryTransforms An array of query transforms to apply to the query
+     * @param TimelineRoot $root            The root to get the days from
+     * @param bool         $recursive       Whether to get the days recursively
+     * @param bool         $archive         Whether to get the days only from the archive folder
+     * @param array        $queryTransforms An array of query transforms to apply to the query
      *
      * @return array The days response
      */
     public function getDays(
-        &$folder,
+        TimelineRoot &$root,
         string $uid,
         bool $recursive,
         bool $archive,
@@ -100,7 +96,7 @@ public function getDays(
         $query->select('m.dayid', $count)
             ->from('memories', 'm')
         ;
-        $query = $this->joinFilecache($query, $folder, $recursive, $archive);
+        $query = $this->joinFilecache($query, $root, $recursive, $archive);
 
         // Group and sort by dayid
         $query->groupBy('m.dayid')
@@ -120,18 +116,18 @@ public function getDays(
     /**
      * Get the day response from the database for the timeline.
      *
-     * @param null|Folder $folder          The folder to get the day from
-     * @param string      $uid             The user id
-     * @param int[]       $day_ids         The day ids to fetch
-     * @param bool        $recursive       If the query should be recursive
-     * @param bool        $archive         If the query should include only the archive folder
-     * @param array       $queryTransforms The query transformations to apply
-     * @param mixed       $day_ids
+     * @param TimelineRoot $root            The root to get the day from
+     * @param string       $uid             The user id
+     * @param int[]        $day_ids         The day ids to fetch
+     * @param bool         $recursive       If the query should be recursive
+     * @param bool         $archive         If the query should include only the archive folder
+     * @param array        $queryTransforms The query transformations to apply
+     * @param mixed        $day_ids
      *
      * @return array An array of day responses
      */
     public function getDay(
-        &$folder,
+        TimelineRoot &$root,
         string $uid,
         $day_ids,
         bool $recursive,
@@ -151,7 +147,7 @@ public function getDay(
         ;
 
         // JOIN with filecache for existing files
-        $query = $this->joinFilecache($query, $folder, $recursive, $archive);
+        $query = $this->joinFilecache($query, $root, $recursive, $archive);
         $query->addSelect('f.etag', 'f.path', 'f.name AS basename');
 
         // JOIN with mimetypes to get the mimetype
@@ -180,7 +176,7 @@ public function getDay(
         $rows = $cursor->fetchAll();
         $cursor->closeCursor();
 
-        return $this->processDay($rows, $uid, $folder);
+        return $this->processDay($rows, $uid, $root);
     }
 
     /**
@@ -200,12 +196,8 @@ private function processDays(&$days)
 
     /**
      * Process the single day response.
-     *
-     * @param array       $day
-     * @param string      $uid    User or blank if not logged in
-     * @param null|Folder $folder
      */
-    private function processDay(&$day, $uid, $folder)
+    private function processDay(array &$day, string $uid, TimelineRoot &$root)
     {
         /**
          * Path entry in database for folder.
@@ -225,15 +217,15 @@ private function processDay(&$day, $uid, $folder)
          */
         $defaultRootId = 0;
 
-        if (null !== $folder) {
+        if (!$root->isEmpty()) {
             // Get root id of the top folder
-            $defaultRootId = $folder->getId();
+            $defaultRootId = $root->getOneId();
 
             // No way to get the internal path from the folder
             $query = $this->connection->getQueryBuilder();
             $query->select('fileid', 'path')
                 ->from('filecache')
-                ->where($query->expr()->in('fileid', $query->createNamedParameter(array_keys($this->topFolderPaths), IQueryBuilder::PARAM_INT_ARRAY)))
+                ->where($query->expr()->in('fileid', $query->createNamedParameter($root->getIds(), IQueryBuilder::PARAM_INT_ARRAY)))
             ;
             $paths = $query->executeQuery()->fetchAll();
             foreach ($paths as &$path) {
@@ -244,7 +236,7 @@ private function processDay(&$day, $uid, $folder)
                 // getPath looks like /user/files/... but we want /files/user/...
                 // Split at / and swap these
                 // For public shares, we just give the relative path
-                if (!empty($uid) && ($actualPath = $this->topFolderPaths[$fileid])) {
+                if (!empty($uid) && ($actualPath = $root->getFolderPath($fileid))) {
                     $actualPath = explode('/', $actualPath);
                     if (\count($actualPath) >= 3) {
                         $tmp = $actualPath[1];
@@ -317,10 +309,11 @@ private function executeQueryWithCTEs(IQueryBuilder &$query, string $psql = '')
      */
     private function addSubfolderJoinParams(
         IQueryBuilder &$query,
+        TimelineRoot &$root,
         bool $archive
     ) {
         // Add query parameters
-        $query->setParameter('topFolderIds', array_keys($this->topFolderPaths), IQueryBuilder::PARAM_INT_ARRAY);
+        $query->setParameter('topFolderIds', $root->getIds(), IQueryBuilder::PARAM_INT_ARRAY);
         $query->setParameter('cteFoldersArchive', $archive, IQueryBuilder::PARAM_BOOL);
     }
 
@@ -328,44 +321,32 @@ private function addSubfolderJoinParams(
      * Inner join with oc_filecache.
      *
      * @param IQueryBuilder $query     Query builder
-     * @param null|Folder   $folder    Either the top folder or null for all
+     * @param TimelineRoot  $root      Either the top folder or null for all
      * @param bool          $recursive Whether to get the days recursively
      * @param bool          $archive   Whether to get the days only from the archive folder
      */
     private function joinFilecache(
         IQueryBuilder &$query,
-        &$folder,
+        TimelineRoot &$root,
         bool $recursive,
         bool $archive
     ) {
         // Join with memories
         $baseOp = $query->expr()->eq('f.fileid', 'm.fileid');
-        if (null === $folder) {
+        if ($root->isEmpty()) {
             return $query->innerJoin('m', 'filecache', 'f', $baseOp);
         }
 
-        // Create top folders paths for later processing
-        $this->topFolderPaths = [];
-        $this->topFolderPaths[$folder->getId()] = $folder->getPath();
-
         // Filter by folder (recursive or otherwise)
         $pathOp = null;
         if ($recursive) {
-            // Add mountpoints recursively
-            $this->mounts = \OC\Files\Filesystem::getMountManager()->findIn($folder->getPath());
-            foreach ($this->mounts as &$mount) {
-                $id = $mount->getStorageRootId();
-                $path = $mount->getMountPoint();
-                $this->topFolderPaths[$id] = $path;
-            }
-
             // Join with folders CTE
-            $this->addSubfolderJoinParams($query, $archive);
+            $this->addSubfolderJoinParams($query, $root, $archive);
             $query->innerJoin('f', 'cte_folders', 'cte_f', $query->expr()->eq('f.parent', 'cte_f.fileid'));
             $query->addSelect('cte_f.rootid');
         } else {
             // If getting non-recursively folder only check for parent
-            $pathOp = $query->expr()->eq('f.parent', $query->createNamedParameter($folder->getId(), IQueryBuilder::PARAM_INT));
+            $pathOp = $query->expr()->eq('f.parent', $query->createNamedParameter($root->getOneId(), IQueryBuilder::PARAM_INT));
         }
 
         return $query->innerJoin('m', 'filecache', 'f', $query->expr()->andX(
diff --git a/lib/Db/TimelineQueryFaces.php b/lib/Db/TimelineQueryFaces.php
index ed01fd2ed..4cf6f6f27 100644
--- a/lib/Db/TimelineQueryFaces.php
+++ b/lib/Db/TimelineQueryFaces.php
@@ -47,7 +47,7 @@ public function transformFaceRect(IQueryBuilder &$query, string $userId)
         );
     }
 
-    public function getFaces(Folder $folder)
+    public function getFaces(TimelineRoot &$root)
     {
         $query = $this->connection->getQueryBuilder();
 
@@ -62,7 +62,7 @@ public function getFaces(Folder $folder)
         $query->innerJoin('rfd', 'memories', 'm', $query->expr()->eq('m.fileid', 'rfd.file_id'));
 
         // WHERE these photos are in the user's requested folder recursively
-        $query = $this->joinFilecache($query, $folder, true, false);
+        $query = $this->joinFilecache($query, $root, true, false);
 
         // GROUP by ID of face cluster
         $query->groupBy('rfc.id');
@@ -87,7 +87,7 @@ public function getFaces(Folder $folder)
         return $faces;
     }
 
-    public function getFacePreviewDetection(Folder &$folder, int $id)
+    public function getFacePreviewDetection(TimelineRoot &$root, int $id)
     {
         $query = $this->connection->getQueryBuilder();
 
@@ -109,7 +109,7 @@ public function getFacePreviewDetection(Folder &$folder, int $id)
         $query->innerJoin('rfd', 'memories', 'm', $query->expr()->eq('m.fileid', 'rfd.file_id'));
 
         // WHERE these photos are in the user's requested folder recursively
-        $query = $this->joinFilecache($query, $folder, true, false);
+        $query = $this->joinFilecache($query, $root, true, false);
 
         // LIMIT results
         $query->setMaxResults(15);
diff --git a/lib/Db/TimelineQueryFolders.php b/lib/Db/TimelineQueryFolders.php
index 26910eceb..347e7e64f 100644
--- a/lib/Db/TimelineQueryFolders.php
+++ b/lib/Db/TimelineQueryFolders.php
@@ -19,7 +19,9 @@ public function getFolderPreviews(Folder &$folder)
         $query->select('f.fileid', 'f.etag')->from('memories', 'm');
 
         // WHERE these photos are in the user's requested folder recursively
-        $query = $this->joinFilecache($query, $folder, true, false);
+        $root = new TimelineRoot();
+        $root->addFolder($folder);
+        $query = $this->joinFilecache($query, $root, true, false);
 
         // ORDER descending by fileid
         $query->orderBy('f.fileid', 'DESC');
diff --git a/lib/Db/TimelineQueryTags.php b/lib/Db/TimelineQueryTags.php
index 8a3b9bfd4..4c4224eb6 100644
--- a/lib/Db/TimelineQueryTags.php
+++ b/lib/Db/TimelineQueryTags.php
@@ -38,7 +38,7 @@ public function transformTagFilter(IQueryBuilder &$query, string $userId, string
         ));
     }
 
-    public function getTags(Folder $folder)
+    public function getTags(TimelineRoot &$root)
     {
         $query = $this->connection->getQueryBuilder();
 
@@ -58,7 +58,7 @@ public function getTags(Folder $folder)
         $query->innerJoin('stom', 'memories', 'm', $query->expr()->eq('m.objectid', 'stom.objectid'));
 
         // WHERE these photos are in the user's requested folder recursively
-        $query = $this->joinFilecache($query, $folder, true, false);
+        $query = $this->joinFilecache($query, $root, true, false);
 
         // GROUP and ORDER by tag name
         $query->groupBy('st.id');
@@ -78,7 +78,7 @@ public function getTags(Folder $folder)
         return $tags;
     }
 
-    public function getTagPreviews(string $tagName, Folder &$folder)
+    public function getTagPreviews(string $tagName, TimelineRoot &$root)
     {
         $query = $this->connection->getQueryBuilder();
         $tagId = $this->getSystemTagId($query, $tagName);
@@ -99,7 +99,7 @@ public function getTagPreviews(string $tagName, Folder &$folder)
         $query->innerJoin('stom', 'memories', 'm', $query->expr()->eq('m.objectid', 'stom.objectid'));
 
         // WHERE these photos are in the user's requested folder recursively
-        $query = $this->joinFilecache($query, $folder, true, false);
+        $query = $this->joinFilecache($query, $root, true, false);
 
         // MAX 4
         $query->setMaxResults(4);
diff --git a/lib/Db/TimelineRoot.php b/lib/Db/TimelineRoot.php
new file mode 100644
index 000000000..04490a736
--- /dev/null
+++ b/lib/Db/TimelineRoot.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Memories\Db;
+
+use OCP\Files\Folder;
+
+class TimelineRoot
+{
+    protected array $folders;
+    protected array $folderPaths;
+
+    /** Initialize */
+    public function __construct()
+    {
+    }
+
+    public function addFolder(Folder &$folder)
+    {
+        // Add top level folder
+        $id = $folder->getId();
+        $folderPath = $folder->getPath();
+        $this->folders[$id] = $folder;
+        $this->folderPaths[$id] = $folderPath;
+    }
+
+    // Add mountpoints recursively
+    public function addMountPoints()
+    {
+        $mp = [];
+        foreach ($this->folderPaths as $id => $folderPath) {
+            $mounts = \OC\Files\Filesystem::getMountManager()->findIn($folderPath);
+            foreach ($mounts as &$mount) {
+                $id = $mount->getStorageRootId();
+                $path = $mount->getMountPoint();
+                $mp[$id] = $path;
+            }
+        }
+        $this->folderPaths += $mp;
+    }
+
+    public function getFolderPath(int $id)
+    {
+        return $this->folderPaths[$id];
+    }
+
+    public function getIds()
+    {
+        return array_keys($this->folderPaths);
+    }
+
+    public function getOneId()
+    {
+        return array_key_first($this->folders);
+    }
+
+    public function getFolder(int $id)
+    {
+        return $this->folders[$id];
+    }
+
+    public function isEmpty()
+    {
+        return empty($this->folderPaths);
+    }
+}

From a6ef3ac9bf5a936dd9d6c38799c81eff6393fdc3 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 00:16:01 -0800
Subject: [PATCH 147/163] Add support for multiple timeline paths

---
 lib/Controller/ApiBase.php                    |  42 ++++---
 lib/Db/TimelineQueryDays.php                  |   5 +-
 lib/Db/TimelineRoot.php                       |  21 +++-
 src/components/Settings.vue                   |  28 +++--
 .../modal/MultiPathSelectionModal.vue         | 112 ++++++++++++++++++
 5 files changed, 175 insertions(+), 33 deletions(-)
 create mode 100644 src/components/modal/MultiPathSelectionModal.vue

diff --git a/lib/Controller/ApiBase.php b/lib/Controller/ApiBase.php
index d84843899..a7ea2319c 100644
--- a/lib/Controller/ApiBase.php
+++ b/lib/Controller/ApiBase.php
@@ -114,36 +114,34 @@ protected function getRequestRoot()
         // Anything else needs a user
         $user = $this->userSession->getUser();
         if (null === $user) {
-            return null;
+            throw new \Exception('User not logged in');
         }
         $uid = $user->getUID();
 
         $folder = null;
         $folderPath = $this->request->getParam('folder');
-        $forcedTimelinePath = $this->request->getParam('timelinePath');
         $userFolder = $this->rootFolder->getUserFolder($uid);
 
-        if (null !== $folderPath) {
-            $folder = $userFolder->get($folderPath);
-        } elseif (null !== $forcedTimelinePath) {
-            $folder = $userFolder->get($forcedTimelinePath);
-        } else {
-            $configPath = Exif::removeExtraSlash(Exif::getPhotosPath($this->config, $uid));
-            $folder = $userFolder->get($configPath);
-        }
-
-        if (!$folder instanceof Folder) {
-            throw new \Exception('Folder not found');
-        }
-
-        if (!($folder->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
-            throw new \Exception('Folder not readable');
-        }
+        try {
+            if (null !== $folderPath) {
+                $folder = $userFolder->get(Exif::removeExtraSlash($folderPath));
+                $root->addFolder($folder);
+            } else {
+                $timelinePath = $this->request->getParam('timelinePath', Exif::getPhotosPath($this->config, $uid));
+                $timelinePath = Exif::removeExtraSlash($timelinePath);
+
+                // Multiple timeline path support
+                $paths = explode(';', $timelinePath);
+                foreach ($paths as &$path) {
+                    $folder = $userFolder->get(trim($path));
+                    $root->addFolder($folder);
+                }
+                $root->addMountPoints();
+            }
+        } catch (\OCP\Files\NotFoundException $e) {
+            $msg = $e->getMessage();
 
-        // Don't add mount points for folder view
-        $root->addFolder($folder);
-        if (null === $folderPath) {
-            $root->addMountPoints();
+            throw new \Exception("Folder not found: {$msg}");
         }
 
         return $root;
diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index 40526edfb..5e5ce9481 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -242,7 +242,8 @@ private function processDay(array &$day, string $uid, TimelineRoot &$root)
                         $tmp = $actualPath[1];
                         $actualPath[1] = $actualPath[2];
                         $actualPath[2] = $tmp;
-                        $davPaths[$fileid] = implode('/', $actualPath);
+                        $davPath = implode('/', $actualPath);
+                        $davPaths[$fileid] = \OCA\Memories\Exif::removeExtraSlash('/'.$davPath.'/');
                     }
                 }
             }
@@ -270,7 +271,7 @@ private function processDay(array &$day, string $uid, TimelineRoot &$root)
             // Check if path exists and starts with basePath and remove
             if (isset($row['path']) && !empty($row['path'])) {
                 $rootId = $row['rootid'] ?: $defaultRootId;
-                $basePath = $internalPaths[$rootId] ?: '#__#';
+                $basePath = $internalPaths[$rootId] ?? '#__#';
                 $davPath = $davPaths[$rootId] ?: '';
 
                 if (0 === strpos($row['path'], $basePath)) {
diff --git a/lib/Db/TimelineRoot.php b/lib/Db/TimelineRoot.php
index 04490a736..fc6b8f521 100644
--- a/lib/Db/TimelineRoot.php
+++ b/lib/Db/TimelineRoot.php
@@ -5,6 +5,7 @@
 namespace OCA\Memories\Db;
 
 use OCP\Files\Folder;
+use OCP\Files\Node;
 
 class TimelineRoot
 {
@@ -16,11 +17,27 @@ public function __construct()
     {
     }
 
-    public function addFolder(Folder &$folder)
+    /**
+     * Add a folder to the root.
+     *
+     * @param Node $folder Node to add
+     *
+     * @throws \Exception if node is not valid readable folder
+     */
+    public function addFolder(Node &$folder)
     {
+        $folderPath = $folder->getPath();
+
+        if (!$folder instanceof Folder) {
+            throw new \Exception("Not a folder: {$folderPath}");
+        }
+
+        if (!($folder->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+            throw new \Exception("Folder not readable: {$folderPath}");
+        }
+
         // Add top level folder
         $id = $folder->getId();
-        $folderPath = $folder->getPath();
         $this->folders[$id] = $folder;
         $this->folderPaths[$id] = $folderPath;
     }
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index ecbc95f0f..1d13d705f 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -53,6 +53,12 @@
     >
       {{ t("memories", "Square grid mode") }}
     </NcCheckboxRadioSwitch>
+
+    <MultiPathSelectionModal
+      ref="multiPathModal"
+      :title="pathSelTitle"
+      @close="saveTimelinePath"
+    />
   </div>
 </template>
 
@@ -65,18 +71,24 @@ input[type="text"] {
 <script lang="ts">
 import { Component, Mixins } from "vue-property-decorator";
 import GlobalMixin from "../mixins/GlobalMixin";
-
-import { getFilePickerBuilder } from "@nextcloud/dialogs";
 import UserConfig from "../mixins/UserConfig";
 
+import { getFilePickerBuilder } from "@nextcloud/dialogs";
 import { NcCheckboxRadioSwitch } from "@nextcloud/vue";
 
+import MultiPathSelectionModal from "./modal/MultiPathSelectionModal.vue";
+
 @Component({
   components: {
     NcCheckboxRadioSwitch,
+    MultiPathSelectionModal,
   },
 })
 export default class Settings extends Mixins(UserConfig, GlobalMixin) {
+  get pathSelTitle() {
+    return this.t("memories", "Choose Timeline Paths");
+  }
+
   async chooseFolder(title: string, initial: string) {
     const picker = getFilePickerBuilder(title)
       .setMultiSelect(false)
@@ -91,11 +103,13 @@ export default class Settings extends Mixins(UserConfig, GlobalMixin) {
   }
 
   async chooseTimelinePath() {
-    let newPath = await this.chooseFolder(
-      this.t("memories", "Choose the root of your timeline"),
-      this.config_timelinePath
-    );
-    if (newPath === "") newPath = "/";
+    (<any>this.$refs.multiPathModal).open(this.config_timelinePath.split(";"));
+  }
+
+  async saveTimelinePath(paths: string[]) {
+    if (!paths || !paths.length) return;
+
+    const newPath = paths.join(";");
     if (newPath !== this.config_timelinePath) {
       this.config_timelinePath = newPath;
       await this.updateSetting("timelinePath");
diff --git a/src/components/modal/MultiPathSelectionModal.vue b/src/components/modal/MultiPathSelectionModal.vue
new file mode 100644
index 000000000..b8b031651
--- /dev/null
+++ b/src/components/modal/MultiPathSelectionModal.vue
@@ -0,0 +1,112 @@
+<template>
+  <Modal @close="close" v-if="show" size="small">
+    <template #title>
+      {{ title }}
+    </template>
+
+    <ul>
+      <li v-for="(path, index) in paths" :key="index" class="path">
+        {{ path }}
+
+        <NcActions :inline="1">
+          <NcActionButton
+            :aria-label="t('memories', 'Remove')"
+            @click="remove(index)"
+          >
+            {{ t("memories", "Remove") }}
+            <template #icon> <CloseIcon :size="20" /> </template>
+          </NcActionButton>
+        </NcActions>
+      </li>
+    </ul>
+
+    <template #buttons>
+      <NcButton @click="add" class="button" type="secondary">
+        {{ t("memories", "Add Path") }}
+      </NcButton>
+      <NcButton @click="save" class="button" type="primary">
+        {{ t("memories", "Save") }}
+      </NcButton>
+    </template>
+  </Modal>
+</template>
+
+<script lang="ts">
+import { Component, Emit, Mixins, Prop } from "vue-property-decorator";
+import GlobalMixin from "../../mixins/GlobalMixin";
+import UserConfig from "../../mixins/UserConfig";
+
+import Modal from "./Modal.vue";
+
+import { getFilePickerBuilder } from "@nextcloud/dialogs";
+import { NcActions, NcActionButton, NcButton } from "@nextcloud/vue";
+
+import CloseIcon from "vue-material-design-icons/Close.vue";
+
+@Component({
+  components: {
+    Modal,
+    NcActions,
+    NcActionButton,
+    NcButton,
+    CloseIcon,
+  },
+})
+export default class Settings extends Mixins(UserConfig, GlobalMixin) {
+  @Prop({ required: true }) title: string;
+
+  private show = false;
+  private paths: string[] = [];
+
+  @Emit("close")
+  public close(list: string[]) {
+    this.show = false;
+  }
+
+  public open(paths: string[]) {
+    this.paths = paths;
+    this.show = true;
+  }
+
+  public save() {
+    this.close(this.paths);
+  }
+
+  async chooseFolder(title: string, initial: string) {
+    const picker = getFilePickerBuilder(title)
+      .setMultiSelect(false)
+      .setModal(true)
+      .setType(1)
+      .addMimeTypeFilter("httpd/unix-directory")
+      .allowDirectories()
+      .startAt(initial)
+      .build();
+
+    return await picker.pick();
+  }
+
+  public async add() {
+    let newPath = await this.chooseFolder(
+      this.t("memories", "Add a root to your timeline"),
+      "/"
+    );
+    if (newPath === "") newPath = "/";
+    this.paths.push(newPath);
+  }
+
+  public remove(index: number) {
+    this.paths.splice(index, 1);
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.path {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 0.1rem;
+  padding-left: 10px;
+  word-wrap: break-all;
+}
+</style>

From bd89c9d355e555ba105fb145ef139fa964df718c Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 00:16:07 -0800
Subject: [PATCH 148/163] Fix some errors

---
 lib/Controller/FoldersTrait.php | 2 +-
 lib/Db/TimelineQueryDays.php    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/FoldersTrait.php b/lib/Controller/FoldersTrait.php
index 37c5d2173..c8a087b0a 100644
--- a/lib/Controller/FoldersTrait.php
+++ b/lib/Controller/FoldersTrait.php
@@ -13,7 +13,7 @@ trait FoldersTrait
     /**
      * Get subfolders entry for days response.
      */
-    public function getSubfoldersEntry(Folder &$folder)
+    public function getSubfoldersEntry(Folder $folder)
     {
         // Ugly: get the view of the folder with reflection
         // This is unfortunately the only way to get the contents of a folder
diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index 5e5ce9481..f84535c23 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -295,7 +295,9 @@ private function executeQueryWithCTEs(IQueryBuilder &$query, string $psql = '')
         $types = $query->getParameterTypes();
 
         // Get SQL
-        $CTE_SQL = $params['cteFoldersArchive'] ? CTE_FOLDERS_ARCHIVE : CTE_FOLDERS;
+        $CTE_SQL = \array_key_exists('cteFoldersArchive', $params) && $params['cteFoldersArchive']
+         ? CTE_FOLDERS_ARCHIVE
+         : CTE_FOLDERS;
 
         // Add WITH clause if needed
         if (false !== strpos($sql, 'cte_folders')) {

From cd3fb4b897158f827d31e89abca884fbb739c287 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 00:23:57 -0800
Subject: [PATCH 149/163] Fix rootid warning

---
 lib/Db/TimelineQueryDays.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index f84535c23..f3bcfaa5b 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -270,7 +270,7 @@ private function processDay(array &$day, string $uid, TimelineRoot &$root)
 
             // Check if path exists and starts with basePath and remove
             if (isset($row['path']) && !empty($row['path'])) {
-                $rootId = $row['rootid'] ?: $defaultRootId;
+                $rootId = \array_key_exists('rootid', $row) ? $row['rootid'] : $defaultRootId;
                 $basePath = $internalPaths[$rootId] ?? '#__#';
                 $davPath = $davPaths[$rootId] ?: '';
 

From 3154de7ac909b7086312b795f8d68b063a661c21 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 01:17:01 -0800
Subject: [PATCH 150/163] Select rootid only for day query

---
 lib/Db/TimelineQueryDays.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index f3bcfaa5b..64947ac74 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -150,6 +150,9 @@ public function getDay(
         $query = $this->joinFilecache($query, $root, $recursive, $archive);
         $query->addSelect('f.etag', 'f.path', 'f.name AS basename');
 
+        // SELECT rootid if not a single folder
+        if ($recursive) $query->addSelect('cte_f.rootid');
+
         // JOIN with mimetypes to get the mimetype
         $query->join('f', 'mimetypes', 'mimetypes', $query->expr()->eq('f.mimetype', 'mimetypes.id'));
         $query->addSelect('mimetypes.mimetype');
@@ -346,7 +349,6 @@ private function joinFilecache(
             // Join with folders CTE
             $this->addSubfolderJoinParams($query, $root, $archive);
             $query->innerJoin('f', 'cte_folders', 'cte_f', $query->expr()->eq('f.parent', 'cte_f.fileid'));
-            $query->addSelect('cte_f.rootid');
         } else {
             // If getting non-recursively folder only check for parent
             $pathOp = $query->expr()->eq('f.parent', $query->createNamedParameter($root->getOneId(), IQueryBuilder::PARAM_INT));

From 0a0d1d9e52691e4d151d3b6d57cd38fdda34c187 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 01:49:03 -0800
Subject: [PATCH 151/163] Fix duplicate folders in CTE response

---
 lib/Db/TimelineQueryDays.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index 64947ac74..d754e542f 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -8,7 +8,7 @@
 use OCP\IDBConnection;
 
 const CTE_FOLDERS = // CTE to get all folders recursively in the given top folders excluding archive
-    'WITH RECURSIVE *PREFIX*cte_folders(fileid, rootid) AS (
+    'WITH RECURSIVE *PREFIX*cte_folders_all(fileid, rootid) AS (
         SELECT
             f.fileid,
             f.fileid AS rootid
@@ -22,11 +22,19 @@
             c.rootid
         FROM
             *PREFIX*filecache f
-        INNER JOIN *PREFIX*cte_folders c
+        INNER JOIN *PREFIX*cte_folders_all c
             ON (f.parent = c.fileid
                 AND f.mimetype = (SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = \'httpd/unix-directory\')
                 AND f.name <> \'.archive\'
             )
+    ), *PREFIX*cte_folders AS (
+        SELECT
+            fileid,
+        	MIN(rootid) AS rootid
+        FROM
+            *PREFIX*cte_folders_all
+        GROUP BY
+        	fileid
     )';
 
 const CTE_FOLDERS_ARCHIVE = // CTE to get all archive folders recursively in the given top folders
@@ -53,11 +61,13 @@
     ), *PREFIX*cte_folders(fileid, rootid) AS (
         SELECT
             cfa.fileid,
-            cfa.rootid
+            MIN(cfa.rootid) AS rootid
         FROM
             *PREFIX*cte_folders_all cfa
         WHERE
             cfa.name = \'.archive\'
+        GROUP BY
+            cfa.fileid
         UNION ALL
         SELECT
             f.fileid,

From c1ae720656486b3c05f7a37c3ddbbd75f174fb72 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 02:30:18 -0800
Subject: [PATCH 152/163] archive: fix for multipath

---
 lib/Controller/ArchiveController.php | 29 ++++++++++++++++++++++------
 lib/Util.php                         | 13 -------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/lib/Controller/ArchiveController.php b/lib/Controller/ArchiveController.php
index 1e416d14e..7fe86035d 100644
--- a/lib/Controller/ArchiveController.php
+++ b/lib/Controller/ArchiveController.php
@@ -59,10 +59,20 @@ public function archive(string $id): JSONResponse
         }
 
         // Create archive folder in the root of the user's configured timeline
-        $timelinePath = Exif::removeExtraSlash(Exif::getPhotosPath($this->config, $uid));
-        $timelineFolder = $userFolder->get($timelinePath);
-        if (null === $timelineFolder || !$timelineFolder instanceof Folder) {
-            return new JSONResponse(['message' => 'Cannot get timeline'], Http::STATUS_INTERNAL_SERVER_ERROR);
+        $configPath = Exif::removeExtraSlash(Exif::getPhotosPath($this->config, $uid));
+        $configPaths = \explode(';', $configPath);
+        $timelineFolders = [];
+        $timelinePaths = [];
+
+        // Get all timeline paths
+        foreach ($configPaths as $path) {
+            try {
+                $f = $userFolder->get($path);
+                $timelineFolders[] = $f;
+                $timelinePaths[] = $f->getPath();
+            } catch (\OCP\Files\NotFoundException $e) {
+                return new JSONResponse(['message' => 'Timeline folder not found'], Http::STATUS_NOT_FOUND);
+            }
         }
 
         // Bubble up from file until we reach the correct folder
@@ -74,14 +84,21 @@ public function archive(string $id): JSONResponse
                 throw new \Exception('Cannot get correct parent of file');
             }
 
-            if ($parent->getPath() === $timelineFolder->getPath()) {
+            // Hit a timeline folder
+            if (in_array($parent->getPath(), $timelinePaths)) {
                 break;
             }
 
-            if ($parent->getParent()->getStorage()->getId() !== $fileStorageId) {
+            // Hit a storage root
+            try {
+                if ($parent->getParent()->getStorage()->getId() !== $fileStorageId) {
+                    break;
+                }
+            } catch (\OCP\Files\NotFoundException $e) {
                 break;
             }
 
+            // Hit an archive folder root
             if ($parent->getName() === \OCA\Memories\Util::$ARCHIVE_FOLDER) {
                 $isArchived = true;
 
diff --git a/lib/Util.php b/lib/Util.php
index d20b52ab2..a2c661e47 100644
--- a/lib/Util.php
+++ b/lib/Util.php
@@ -47,19 +47,6 @@ public static function getLibc()
         return null;
     }
 
-    /**
-     * Get the path to the user's configured photos directory.
-     */
-    public static function getPhotosPath(IConfig &$config, string $userId)
-    {
-        $p = $config->getUserValue($userId, Application::APPNAME, 'timelinePath', '');
-        if (empty($p)) {
-            return '/Photos/';
-        }
-
-        return $p;
-    }
-
     /**
      * Check if albums are enabled for this user.
      *

From c3f874d4b4f96c9154e24e19b3f79afaa53a6e18 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 02:30:51 -0800
Subject: [PATCH 153/163] PHP Lint

---
 lib/Controller/ArchiveController.php | 4 ++--
 lib/Db/TimelineQueryDays.php         | 4 +++-
 lib/Util.php                         | 3 ---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/Controller/ArchiveController.php b/lib/Controller/ArchiveController.php
index 7fe86035d..8c5a4ba61 100644
--- a/lib/Controller/ArchiveController.php
+++ b/lib/Controller/ArchiveController.php
@@ -60,7 +60,7 @@ public function archive(string $id): JSONResponse
 
         // Create archive folder in the root of the user's configured timeline
         $configPath = Exif::removeExtraSlash(Exif::getPhotosPath($this->config, $uid));
-        $configPaths = \explode(';', $configPath);
+        $configPaths = explode(';', $configPath);
         $timelineFolders = [];
         $timelinePaths = [];
 
@@ -85,7 +85,7 @@ public function archive(string $id): JSONResponse
             }
 
             // Hit a timeline folder
-            if (in_array($parent->getPath(), $timelinePaths)) {
+            if (\in_array($parent->getPath(), $timelinePaths, true)) {
                 break;
             }
 
diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index d754e542f..49e29c041 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -161,7 +161,9 @@ public function getDay(
         $query->addSelect('f.etag', 'f.path', 'f.name AS basename');
 
         // SELECT rootid if not a single folder
-        if ($recursive) $query->addSelect('cte_f.rootid');
+        if ($recursive) {
+            $query->addSelect('cte_f.rootid');
+        }
 
         // JOIN with mimetypes to get the mimetype
         $query->join('f', 'mimetypes', 'mimetypes', $query->expr()->eq('f.mimetype', 'mimetypes.id'));
diff --git a/lib/Util.php b/lib/Util.php
index a2c661e47..2ddd9cb6e 100644
--- a/lib/Util.php
+++ b/lib/Util.php
@@ -4,9 +4,6 @@
 
 namespace OCA\Memories;
 
-use OCA\Memories\AppInfo\Application;
-use OCP\IConfig;
-
 class Util
 {
     public static $TAG_DAYID_START = -(1 << 30); // the world surely didn't exist

From 579984041a3c036430f76e961861507e208750e1 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 02:35:17 -0800
Subject: [PATCH 154/163] albums: fix for multipath

---
 lib/Db/TimelineQueryDays.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
index 49e29c041..d1f58ffcf 100644
--- a/lib/Db/TimelineQueryDays.php
+++ b/lib/Db/TimelineQueryDays.php
@@ -161,7 +161,7 @@ public function getDay(
         $query->addSelect('f.etag', 'f.path', 'f.name AS basename');
 
         // SELECT rootid if not a single folder
-        if ($recursive) {
+        if ($recursive && !$root->isEmpty()) {
             $query->addSelect('cte_f.rootid');
         }
 

From 5cadd168b4b046f5655053cafc6ad14b6e146bc4 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 02:38:40 -0800
Subject: [PATCH 155/163] Remove mp4 from src

---
 src/components/PsVideo.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 1d35a6786..7838da9e0 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -197,7 +197,6 @@ class VideoContentSetup {
 
           content.videojs.src({
             src: content.data.src,
-            type: "video/mp4",
           });
           this.updateRotation(content, 0);
         }

From 79780f3e2b79460b58afc914f1168a523fb8e121 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 02:52:17 -0800
Subject: [PATCH 156/163] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91be9241f..9dea378d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This file is manually updated. Please file an issue if something is missing.
 
+## v4.8.0, v3.8.0
+
+- **Feature**: Timeline path now scans recursively for mounted volumes / shares inside it.
+- **Feature**: Multiple timeline paths can be specified.
+
 ## v4.7.0, v3.7.0 (2022-11-14)
 
 - **Note**: you must run `occ memories:index -f` to take advantage of new features.

From c75e94108ce0c709cf3b20fa9ad66c19d98950a4 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 03:05:48 -0800
Subject: [PATCH 157/163] Store unknown exif fields

---
 lib/Exif.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Exif.php b/lib/Exif.php
index 1d98df75c..ab8f3a6b3 100644
--- a/lib/Exif.php
+++ b/lib/Exif.php
@@ -368,7 +368,7 @@ private static function readOrTimeout($handle, $timeout, $delimiter = null)
 
     private static function getExifFromLocalPathWithStaticProc(string &$path)
     {
-        fwrite(self::$staticPipes[0], "{$path}\n-json\n-b\n-api\nQuickTimeUTC=1\n-n\n-execute\n");
+        fwrite(self::$staticPipes[0], "{$path}\n-U\n-json\n-b\n-api\nQuickTimeUTC=1\n-n\n-execute\n");
         fflush(self::$staticPipes[0]);
 
         $readyToken = "\n{ready}\n";
@@ -390,7 +390,7 @@ private static function getExifFromLocalPathWithStaticProc(string &$path)
     private static function getExifFromLocalPathWithSeparateProc(string &$path)
     {
         $pipes = [];
-        $proc = proc_open(array_merge(self::getExiftool(), ['-api', 'QuickTimeUTC=1', '-n', '-json', '-b', $path]), [
+        $proc = proc_open(array_merge(self::getExiftool(), ['-api', 'QuickTimeUTC=1', '-n', '-U', '-json', '-b', $path]), [
             1 => ['pipe', 'w'],
             2 => ['pipe', 'w'],
         ], $pipes);

From cc7567aca376c01305bbe0a3406b1805cec88048 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 03:24:59 -0800
Subject: [PATCH 158/163] exif: exclude binary fields

---
 lib/Exif.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Exif.php b/lib/Exif.php
index ab8f3a6b3..ebef819bf 100644
--- a/lib/Exif.php
+++ b/lib/Exif.php
@@ -368,7 +368,7 @@ private static function readOrTimeout($handle, $timeout, $delimiter = null)
 
     private static function getExifFromLocalPathWithStaticProc(string &$path)
     {
-        fwrite(self::$staticPipes[0], "{$path}\n-U\n-json\n-b\n-api\nQuickTimeUTC=1\n-n\n-execute\n");
+        fwrite(self::$staticPipes[0], "{$path}\n-U\n-json\n--b\n-api\nQuickTimeUTC=1\n-n\n-execute\n");
         fflush(self::$staticPipes[0]);
 
         $readyToken = "\n{ready}\n";
@@ -390,7 +390,7 @@ private static function getExifFromLocalPathWithStaticProc(string &$path)
     private static function getExifFromLocalPathWithSeparateProc(string &$path)
     {
         $pipes = [];
-        $proc = proc_open(array_merge(self::getExiftool(), ['-api', 'QuickTimeUTC=1', '-n', '-U', '-json', '-b', $path]), [
+        $proc = proc_open(array_merge(self::getExiftool(), ['-api', 'QuickTimeUTC=1', '-n', '-U', '-json', '--b', $path]), [
             1 => ['pipe', 'w'],
             2 => ['pipe', 'w'],
         ], $pipes);

From 1e7c29736182cf2d1662a8890e19dd4f15640429 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 06:15:09 -0800
Subject: [PATCH 159/163] =?UTF-8?q?video:=20everything=20is=20mp4=20?=
 =?UTF-8?q?=F0=9F=A4=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PsVideo.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts
index 7838da9e0..4b8b0b41c 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/PsVideo.ts
@@ -164,6 +164,7 @@ class VideoContentSetup {
 
     sources.push({
       src: content.data.src,
+      type: "video/mp4",
     });
 
     const overrideNative = !videojs.browser.IS_SAFARI;
@@ -197,6 +198,7 @@ class VideoContentSetup {
 
           content.videojs.src({
             src: content.data.src,
+            type: "video/mp4",
           });
           this.updateRotation(content, 0);
         }

From 38c6b2104e56b7e29839248e982cd3ea37205668 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 16 Nov 2022 07:11:44 -0800
Subject: [PATCH 160/163] Bump up go-vod (#197)

---
 scripts/get-exiftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh
index 2cfaea786..e83df7621 100755
--- a/scripts/get-exiftool.sh
+++ b/scripts/get-exiftool.sh
@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.12"
+govod="0.0.13"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

From ce3750467f6ffea89cac4f635dab8a2261a4e8ad Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Thu, 17 Nov 2022 03:19:02 +0000
Subject: [PATCH 161/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/el.js         | 1 +
 l10n/el.json       | 1 +
 l10n/en_GB.js      | 1 +
 l10n/en_GB.json    | 1 +
 l10n/eo.js         | 1 +
 l10n/eo.json       | 1 +
 l10n/es.js         | 1 +
 l10n/es.json       | 1 +
 l10n/es_419.js     | 1 +
 l10n/es_419.json   | 1 +
 l10n/es_AR.js      | 1 +
 l10n/es_AR.json    | 1 +
 l10n/es_CL.js      | 1 +
 l10n/es_CL.json    | 1 +
 l10n/es_CO.js      | 1 +
 l10n/es_CO.json    | 1 +
 l10n/es_CR.js      | 1 +
 l10n/es_CR.json    | 1 +
 l10n/es_DO.js      | 1 +
 l10n/es_DO.json    | 1 +
 l10n/es_EC.js      | 1 +
 l10n/es_EC.json    | 1 +
 l10n/es_GT.js      | 1 +
 l10n/es_GT.json    | 1 +
 l10n/es_HN.js      | 1 +
 l10n/es_HN.json    | 1 +
 l10n/es_MX.js      | 1 +
 l10n/es_MX.json    | 1 +
 l10n/es_NI.js      | 1 +
 l10n/es_NI.json    | 1 +
 l10n/es_PA.js      | 1 +
 l10n/es_PA.json    | 1 +
 l10n/es_PE.js      | 1 +
 l10n/es_PE.json    | 1 +
 l10n/es_PR.js      | 1 +
 l10n/es_PR.json    | 1 +
 l10n/es_PY.js      | 1 +
 l10n/es_PY.json    | 1 +
 l10n/es_SV.js      | 1 +
 l10n/es_SV.json    | 1 +
 l10n/es_UY.js      | 1 +
 l10n/es_UY.json    | 1 +
 l10n/et_EE.js      | 1 +
 l10n/et_EE.json    | 1 +
 l10n/eu.js         | 1 +
 l10n/eu.json       | 1 +
 l10n/fa.js         | 1 +
 l10n/fa.json       | 1 +
 l10n/fi.js         | 1 +
 l10n/fi.json       | 1 +
 l10n/fr.js         | 1 +
 l10n/fr.json       | 1 +
 l10n/gd.js         | 1 +
 l10n/gd.json       | 1 +
 l10n/gl.js         | 1 +
 l10n/gl.json       | 1 +
 l10n/he.js         | 1 +
 l10n/he.json       | 1 +
 l10n/hr.js         | 1 +
 l10n/hr.json       | 1 +
 l10n/hu.js         | 1 +
 l10n/hu.json       | 1 +
 l10n/id.js         | 1 +
 l10n/id.json       | 1 +
 l10n/is.js         | 1 +
 l10n/is.json       | 1 +
 l10n/it.js         | 1 +
 l10n/it.json       | 1 +
 l10n/ja.js         | 1 +
 l10n/ja.json       | 1 +
 l10n/ka_GE.js      | 1 +
 l10n/ka_GE.json    | 1 +
 l10n/kab.js        | 1 +
 l10n/kab.json      | 1 +
 l10n/km.js         | 1 +
 l10n/km.json       | 1 +
 l10n/kn.js         | 1 +
 l10n/kn.json       | 1 +
 l10n/ko.js         | 1 +
 l10n/ko.json       | 1 +
 l10n/lb.js         | 1 +
 l10n/lb.json       | 1 +
 l10n/lo.js         | 1 +
 l10n/lo.json       | 1 +
 l10n/lt_LT.js      | 1 +
 l10n/lt_LT.json    | 1 +
 l10n/lv.js         | 1 +
 l10n/lv.json       | 1 +
 l10n/mk.js         | 1 +
 l10n/mk.json       | 1 +
 l10n/mn.js         | 1 +
 l10n/mn.json       | 1 +
 l10n/ms_MY.js      | 1 +
 l10n/ms_MY.json    | 1 +
 l10n/nb.js         | 1 +
 l10n/nb.json       | 1 +
 l10n/nl.js         | 1 +
 l10n/nl.json       | 1 +
 l10n/nn_NO.js      | 1 +
 l10n/nn_NO.json    | 1 +
 l10n/oc.js         | 1 +
 l10n/oc.json       | 1 +
 l10n/pl.js         | 1 +
 l10n/pl.json       | 1 +
 l10n/pt_BR.js      | 1 +
 l10n/pt_BR.json    | 1 +
 l10n/pt_PT.js      | 1 +
 l10n/pt_PT.json    | 1 +
 l10n/ro.js         | 1 +
 l10n/ro.json       | 1 +
 l10n/ru.js         | 1 +
 l10n/ru.json       | 1 +
 l10n/sc.js         | 1 +
 l10n/sc.json       | 1 +
 l10n/si.js         | 1 +
 l10n/si.json       | 1 +
 l10n/sk.js         | 1 +
 l10n/sk.json       | 1 +
 l10n/sl.js         | 1 +
 l10n/sl.json       | 1 +
 l10n/sq.js         | 1 +
 l10n/sq.json       | 1 +
 l10n/sr.js         | 1 +
 l10n/sr.json       | 1 +
 l10n/sr@latin.js   | 1 +
 l10n/sr@latin.json | 1 +
 l10n/sv.js         | 1 +
 l10n/sv.json       | 1 +
 l10n/ta.js         | 1 +
 l10n/ta.json       | 1 +
 l10n/th.js         | 1 +
 l10n/th.json       | 1 +
 l10n/tk.js         | 3 ++-
 l10n/tk.json       | 3 ++-
 l10n/tr.js         | 1 +
 l10n/tr.json       | 1 +
 l10n/ug.js         | 1 +
 l10n/ug.json       | 1 +
 l10n/uk.js         | 1 +
 l10n/uk.json       | 1 +
 l10n/uz.js         | 1 +
 l10n/uz.json       | 1 +
 l10n/vi.js         | 1 +
 l10n/vi.json       | 1 +
 l10n/zh_CN.js      | 1 +
 l10n/zh_CN.json    | 1 +
 l10n/zh_HK.js      | 1 +
 l10n/zh_HK.json    | 1 +
 l10n/zh_TW.js      | 1 +
 l10n/zh_TW.json    | 1 +
 150 files changed, 152 insertions(+), 2 deletions(-)

diff --git a/l10n/el.js b/l10n/el.js
index 336c7cce1..b2cfb3586 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -35,6 +35,7 @@ OC.L10N.register(
     "Name" : "Όνομα",
     "Update" : "Ενημέρωση",
     "Refresh" : "Ανανέωση",
+    "Remove" : "Αφαίρεση",
     "Share folder" : "Διαμοιρασμός φακέλου",
     "Reset" : "Επαναφορά",
     "Continue" : "Συνεχίστε",
diff --git a/l10n/el.json b/l10n/el.json
index 04095a2a3..f41ffd764 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -33,6 +33,7 @@
     "Name" : "Όνομα",
     "Update" : "Ενημέρωση",
     "Refresh" : "Ανανέωση",
+    "Remove" : "Αφαίρεση",
     "Share folder" : "Διαμοιρασμός φακέλου",
     "Reset" : "Επαναφορά",
     "Continue" : "Συνεχίστε",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index b3477b7c0..55d34ef43 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "Name" : "Surname",
     "Update" : "Update",
     "Refresh" : "Refresh",
+    "Remove" : "Remove",
     "Reset" : "Reset",
     "Continue" : "Continue",
     "Undo" : "Undo",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 79e01300a..aef5ec3df 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -26,6 +26,7 @@
     "Name" : "Surname",
     "Update" : "Update",
     "Refresh" : "Refresh",
+    "Remove" : "Remove",
     "Reset" : "Reset",
     "Continue" : "Continue",
     "Undo" : "Undo",
diff --git a/l10n/eo.js b/l10n/eo.js
index d66be4036..9af7ffb7f 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "Name" : "Nomo",
     "Update" : "Ĝisdatigi",
     "Refresh" : "Aktualigi",
+    "Remove" : "Forigi",
     "Reset" : "Restarigi",
     "Continue" : "Daŭrigi",
     "Undo" : "Malfari",
diff --git a/l10n/eo.json b/l10n/eo.json
index f7ddbb267..0486007c6 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -26,6 +26,7 @@
     "Name" : "Nomo",
     "Update" : "Ĝisdatigi",
     "Refresh" : "Aktualigi",
+    "Remove" : "Forigi",
     "Reset" : "Restarigi",
     "Continue" : "Daŭrigi",
     "Undo" : "Malfari",
diff --git a/l10n/es.js b/l10n/es.js
index 0d35a9579..97c2f326d 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -127,6 +127,7 @@ OC.L10N.register(
     "Use the sidebar to share this folder." : "Utilice la barra lateral para compartir esta carpeta.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Si crea un enlace público de compartición, haga click en refrescar y se mostrará abajo el enlace correspondiente a Memories.",
     "Refresh" : "Actualizar",
+    "Remove" : "Quitar",
     "Share album" : "Compartir álbum",
     "Delete album" : "Eliminar álbum",
     "Merge with different person" : "Unir con una persona diferente",
diff --git a/l10n/es.json b/l10n/es.json
index b85bfb000..772b99acd 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -125,6 +125,7 @@
     "Use the sidebar to share this folder." : "Utilice la barra lateral para compartir esta carpeta.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Si crea un enlace público de compartición, haga click en refrescar y se mostrará abajo el enlace correspondiente a Memories.",
     "Refresh" : "Actualizar",
+    "Remove" : "Quitar",
     "Share album" : "Compartir álbum",
     "Delete album" : "Eliminar álbum",
     "Merge with different person" : "Unir con una persona diferente",
diff --git a/l10n/es_419.js b/l10n/es_419.js
index 73444a4d2..ec053a73d 100644
--- a/l10n/es_419.js
+++ b/l10n/es_419.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restaurar",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_419.json b/l10n/es_419.json
index e022b67c4..97fe40e36 100644
--- a/l10n/es_419.json
+++ b/l10n/es_419.json
@@ -24,6 +24,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restaurar",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_AR.js b/l10n/es_AR.js
index 3c216ac0c..dcb5f0a94 100644
--- a/l10n/es_AR.js
+++ b/l10n/es_AR.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Recargar",
+    "Remove" : "Borrar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_AR.json b/l10n/es_AR.json
index 79ddc9f4a..dbb015988 100644
--- a/l10n/es_AR.json
+++ b/l10n/es_AR.json
@@ -26,6 +26,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Recargar",
+    "Remove" : "Borrar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_CL.js b/l10n/es_CL.js
index 500b5448b..255ef414c 100644
--- a/l10n/es_CL.js
+++ b/l10n/es_CL.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_CL.json b/l10n/es_CL.json
index 393112cd4..3fc1c534b 100644
--- a/l10n/es_CL.json
+++ b/l10n/es_CL.json
@@ -26,6 +26,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_CO.js b/l10n/es_CO.js
index 054b5bd52..b6978230b 100644
--- a/l10n/es_CO.js
+++ b/l10n/es_CO.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Reiniciar",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_CO.json b/l10n/es_CO.json
index 1801a1c64..a97d797a4 100644
--- a/l10n/es_CO.json
+++ b/l10n/es_CO.json
@@ -25,6 +25,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Reiniciar",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_CR.js b/l10n/es_CR.js
index 1adbcbc47..98feb7068 100644
--- a/l10n/es_CR.js
+++ b/l10n/es_CR.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_CR.json b/l10n/es_CR.json
index 8a97726f0..78039437c 100644
--- a/l10n/es_CR.json
+++ b/l10n/es_CR.json
@@ -25,6 +25,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_DO.js b/l10n/es_DO.js
index 1adbcbc47..98feb7068 100644
--- a/l10n/es_DO.js
+++ b/l10n/es_DO.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_DO.json b/l10n/es_DO.json
index 8a97726f0..78039437c 100644
--- a/l10n/es_DO.json
+++ b/l10n/es_DO.json
@@ -25,6 +25,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
index 1478a63e6..4e7075e86 100644
--- a/l10n/es_EC.js
+++ b/l10n/es_EC.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
index 02c57b562..57cf5aca4 100644
--- a/l10n/es_EC.json
+++ b/l10n/es_EC.json
@@ -25,6 +25,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index eb02434f8..78bf6f77d 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index b6b8b8125..a195612fe 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -25,6 +25,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
index 1adbcbc47..98feb7068 100644
--- a/l10n/es_HN.js
+++ b/l10n/es_HN.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
index 8a97726f0..78039437c 100644
--- a/l10n/es_HN.json
+++ b/l10n/es_HN.json
@@ -25,6 +25,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index e90cdf939..db6dc1222 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Reiniciar",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index 8aa54c4bf..5cc06742d 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -26,6 +26,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Reiniciar",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_NI.js b/l10n/es_NI.js
index 854c75e8e..f12d5960d 100644
--- a/l10n/es_NI.js
+++ b/l10n/es_NI.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_NI.json b/l10n/es_NI.json
index ed8847251..35337f742 100644
--- a/l10n/es_NI.json
+++ b/l10n/es_NI.json
@@ -24,6 +24,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
index 854c75e8e..f12d5960d 100644
--- a/l10n/es_PA.js
+++ b/l10n/es_PA.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
index ed8847251..35337f742 100644
--- a/l10n/es_PA.json
+++ b/l10n/es_PA.json
@@ -24,6 +24,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_PE.js b/l10n/es_PE.js
index 114445c1b..d093dbf57 100644
--- a/l10n/es_PE.js
+++ b/l10n/es_PE.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_PE.json b/l10n/es_PE.json
index fa3f1dd40..583ca9145 100644
--- a/l10n/es_PE.json
+++ b/l10n/es_PE.json
@@ -24,6 +24,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
index 854c75e8e..f12d5960d 100644
--- a/l10n/es_PR.js
+++ b/l10n/es_PR.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
index ed8847251..35337f742 100644
--- a/l10n/es_PR.json
+++ b/l10n/es_PR.json
@@ -24,6 +24,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_PY.js b/l10n/es_PY.js
index 854c75e8e..f12d5960d 100644
--- a/l10n/es_PY.js
+++ b/l10n/es_PY.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_PY.json b/l10n/es_PY.json
index ed8847251..35337f742 100644
--- a/l10n/es_PY.json
+++ b/l10n/es_PY.json
@@ -24,6 +24,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
index 1adbcbc47..98feb7068 100644
--- a/l10n/es_SV.js
+++ b/l10n/es_SV.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
index 8a97726f0..78039437c 100644
--- a/l10n/es_SV.json
+++ b/l10n/es_SV.json
@@ -25,6 +25,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
index 854c75e8e..f12d5960d 100644
--- a/l10n/es_UY.js
+++ b/l10n/es_UY.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
index ed8847251..35337f742 100644
--- a/l10n/es_UY.json
+++ b/l10n/es_UY.json
@@ -24,6 +24,7 @@
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Eliminar",
     "Reset" : "Restablecer",
     "Continue" : "Continuar",
     "Undo" : "Deshacer",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index e17229f1d..83cc38143 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "Nimi",
     "Update" : "Uuenda",
     "Refresh" : "Värskenda",
+    "Remove" : "Eemalda",
     "Reset" : "Lähtesta",
     "Continue" : "Jätka",
     "Custom" : "Kohandatud",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index 364934d90..a29dccc96 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -25,6 +25,7 @@
     "Name" : "Nimi",
     "Update" : "Uuenda",
     "Refresh" : "Värskenda",
+    "Remove" : "Eemalda",
     "Reset" : "Lähtesta",
     "Continue" : "Jätka",
     "Custom" : "Kohandatud",
diff --git a/l10n/eu.js b/l10n/eu.js
index 880b196ab..ba5df9a70 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -89,6 +89,7 @@ OC.L10N.register(
     "Update" : "Eguneratu",
     "Failed to move {name}." : "{name} mugitzeak huts egin du.",
     "Refresh" : "Freskatu",
+    "Remove" : "Kendu",
     "Delete album" : "Ezabatu albuma",
     "Merge with different person" : "Bateratu beste pertsona batekin",
     "Share folder" : "Partekatu karpeta",
diff --git a/l10n/eu.json b/l10n/eu.json
index fb2488de0..c7c267952 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -87,6 +87,7 @@
     "Update" : "Eguneratu",
     "Failed to move {name}." : "{name} mugitzeak huts egin du.",
     "Refresh" : "Freskatu",
+    "Remove" : "Kendu",
     "Delete album" : "Ezabatu albuma",
     "Merge with different person" : "Bateratu beste pertsona batekin",
     "Share folder" : "Partekatu karpeta",
diff --git a/l10n/fa.js b/l10n/fa.js
index 0a25b373e..a92e4e094 100644
--- a/l10n/fa.js
+++ b/l10n/fa.js
@@ -29,6 +29,7 @@ OC.L10N.register(
     "Name" : "نام",
     "Update" : "یه‌روزرسانی",
     "Refresh" : "تازه‌سازی",
+    "Remove" : "حذف",
     "Share folder" : "اشتراک‌گذاری پوشه",
     "Reset" : "بازنشاندن",
     "Continue" : "ادامه دادن",
diff --git a/l10n/fa.json b/l10n/fa.json
index 328b30a83..daddd426e 100644
--- a/l10n/fa.json
+++ b/l10n/fa.json
@@ -27,6 +27,7 @@
     "Name" : "نام",
     "Update" : "یه‌روزرسانی",
     "Refresh" : "تازه‌سازی",
+    "Remove" : "حذف",
     "Share folder" : "اشتراک‌گذاری پوشه",
     "Reset" : "بازنشاندن",
     "Continue" : "ادامه دادن",
diff --git a/l10n/fi.js b/l10n/fi.js
index 0d5e545a8..8503f275e 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -107,6 +107,7 @@ OC.L10N.register(
     "You cannot share the root folder" : "Et voi jakaa juurikansiota",
     "Use the sidebar to share this folder." : "Käytä sivupalkkia jakaaksesi tämän kansion.",
     "Refresh" : "Päivitä",
+    "Remove" : "Poista",
     "Share album" : "Jaa albumi",
     "Delete album" : "Poista albumi",
     "Merge with different person" : "Yhdistä toisen henkilön kanssa",
diff --git a/l10n/fi.json b/l10n/fi.json
index dbb630063..f75d4fa7d 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -105,6 +105,7 @@
     "You cannot share the root folder" : "Et voi jakaa juurikansiota",
     "Use the sidebar to share this folder." : "Käytä sivupalkkia jakaaksesi tämän kansion.",
     "Refresh" : "Päivitä",
+    "Remove" : "Poista",
     "Share album" : "Jaa albumi",
     "Delete album" : "Poista albumi",
     "Merge with different person" : "Yhdistä toisen henkilön kanssa",
diff --git a/l10n/fr.js b/l10n/fr.js
index 4a8fa48ce..57cbb38a1 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -105,6 +105,7 @@ OC.L10N.register(
     "Use the sidebar to share this folder." : "Utiliser la barre latérale pour partager ce dossier.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Si vous créez un partage de lien public, cliquez sur rafraîchir et un lien correspondant à Souvenirs sera visible ci-dessous.",
     "Refresh" : "Actualiser",
+    "Remove" : "Retirer",
     "Delete album" : "Supprimer l'album",
     "Merge with different person" : "Fusionner avec une différente personne",
     "Share folder" : "Partager le dossier",
diff --git a/l10n/fr.json b/l10n/fr.json
index c9670f8ba..d58273387 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -103,6 +103,7 @@
     "Use the sidebar to share this folder." : "Utiliser la barre latérale pour partager ce dossier.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Si vous créez un partage de lien public, cliquez sur rafraîchir et un lien correspondant à Souvenirs sera visible ci-dessous.",
     "Refresh" : "Actualiser",
+    "Remove" : "Retirer",
     "Delete album" : "Supprimer l'album",
     "Merge with different person" : "Fusionner avec une différente personne",
     "Share folder" : "Partager le dossier",
diff --git a/l10n/gd.js b/l10n/gd.js
index 89df61946..c0b032b3f 100644
--- a/l10n/gd.js
+++ b/l10n/gd.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Save" : "Sàbhail",
     "Name" : "Ainm",
     "Refresh" : "Ath-nuadhaich",
+    "Remove" : "Thoir air falbh",
     "Undo" : "Neo-dhèan"
 },
 "nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;");
diff --git a/l10n/gd.json b/l10n/gd.json
index 0ff3a5476..94fb63460 100644
--- a/l10n/gd.json
+++ b/l10n/gd.json
@@ -13,6 +13,7 @@
     "Save" : "Sàbhail",
     "Name" : "Ainm",
     "Refresh" : "Ath-nuadhaich",
+    "Remove" : "Thoir air falbh",
     "Undo" : "Neo-dhèan"
 },"pluralForm" :"nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/l10n/gl.js b/l10n/gl.js
index 4d9591c44..32be2af72 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Name" : "Nome",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Retirar",
     "Reset" : "Restabelecer",
     "Continue" : "Continuar",
     "Undo" : "Desfacer",
diff --git a/l10n/gl.json b/l10n/gl.json
index b4ad77c8e..dc1f9bf4c 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -31,6 +31,7 @@
     "Name" : "Nome",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Retirar",
     "Reset" : "Restabelecer",
     "Continue" : "Continuar",
     "Undo" : "Desfacer",
diff --git a/l10n/he.js b/l10n/he.js
index d23dd9865..19b1e7575 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -32,6 +32,7 @@ OC.L10N.register(
     "Name" : "שם",
     "Update" : "עדכון",
     "Refresh" : "רענון",
+    "Remove" : "הסרה",
     "Reset" : "איפוס",
     "Continue" : "להמשך",
     "Undo" : "ביטול",
diff --git a/l10n/he.json b/l10n/he.json
index f093d2137..cfae3dd04 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -30,6 +30,7 @@
     "Name" : "שם",
     "Update" : "עדכון",
     "Refresh" : "רענון",
+    "Remove" : "הסרה",
     "Reset" : "איפוס",
     "Continue" : "להמשך",
     "Undo" : "ביטול",
diff --git a/l10n/hr.js b/l10n/hr.js
index 6d0a94f8f..ebad7be5a 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Name" : "Naziv",
     "Update" : "Ažuriraj",
     "Refresh" : "Osvježi",
+    "Remove" : "Ukloni",
     "Share folder" : "Dijeli mapu",
     "Reset" : "Resetiraj",
     "Continue" : "Nastavi",
diff --git a/l10n/hr.json b/l10n/hr.json
index 43f8a950f..831150b7b 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -31,6 +31,7 @@
     "Name" : "Naziv",
     "Update" : "Ažuriraj",
     "Refresh" : "Osvježi",
+    "Remove" : "Ukloni",
     "Share folder" : "Dijeli mapu",
     "Reset" : "Resetiraj",
     "Continue" : "Nastavi",
diff --git a/l10n/hu.js b/l10n/hu.js
index 41c6cc3f0..d6c229ff7 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -85,6 +85,7 @@ OC.L10N.register(
     "Rename person" : "Személy átnevezése",
     "Update" : "Frissítés",
     "Refresh" : "Frissítés",
+    "Remove" : "Eltávolítás",
     "Delete album" : "Album törlése",
     "Merge with different person" : "Összevonás egy másik személlyel",
     "Share folder" : "Mappa megosztása",
diff --git a/l10n/hu.json b/l10n/hu.json
index cd01eaa70..abd63e53c 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -83,6 +83,7 @@
     "Rename person" : "Személy átnevezése",
     "Update" : "Frissítés",
     "Refresh" : "Frissítés",
+    "Remove" : "Eltávolítás",
     "Delete album" : "Album törlése",
     "Merge with different person" : "Összevonás egy másik személlyel",
     "Share folder" : "Mappa megosztása",
diff --git a/l10n/id.js b/l10n/id.js
index fbe4dfe71..c5a77fac1 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "Nama",
     "Update" : "Perbarui",
     "Refresh" : "Muat ulang",
+    "Remove" : "Buang",
     "Reset" : "Setel ulang",
     "Continue" : "Lanjutkan",
     "Undo" : "Undo",
diff --git a/l10n/id.json b/l10n/id.json
index 166e369bd..254827eb0 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -24,6 +24,7 @@
     "Name" : "Nama",
     "Update" : "Perbarui",
     "Refresh" : "Muat ulang",
+    "Remove" : "Buang",
     "Reset" : "Setel ulang",
     "Continue" : "Lanjutkan",
     "Undo" : "Undo",
diff --git a/l10n/is.js b/l10n/is.js
index 87bfe66df..3d246e28c 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -34,6 +34,7 @@ OC.L10N.register(
     "Name" : "Heiti",
     "Update" : "Uppfæra",
     "Refresh" : "Endurnýja",
+    "Remove" : "Fjarlægja",
     "Reset" : "Endurstilla",
     "Continue" : "Halda áfram",
     "Undo" : "Undo",
diff --git a/l10n/is.json b/l10n/is.json
index 093244b02..2465dfdd5 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -32,6 +32,7 @@
     "Name" : "Heiti",
     "Update" : "Uppfæra",
     "Refresh" : "Endurnýja",
+    "Remove" : "Fjarlægja",
     "Reset" : "Endurstilla",
     "Continue" : "Halda áfram",
     "Undo" : "Undo",
diff --git a/l10n/it.js b/l10n/it.js
index 033b781a7..a52551720 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Rename person" : "Rinomina persona",
     "Update" : "Aggiorna",
     "Refresh" : "Aggiorna",
+    "Remove" : "Rimuovi",
     "Delete album" : "Elimina album",
     "Merge with different person" : "Unisci ad un'altra persona",
     "Share folder" : "Condividi cartella",
diff --git a/l10n/it.json b/l10n/it.json
index cced2d391..caacafb6c 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -52,6 +52,7 @@
     "Rename person" : "Rinomina persona",
     "Update" : "Aggiorna",
     "Refresh" : "Aggiorna",
+    "Remove" : "Rimuovi",
     "Delete album" : "Elimina album",
     "Merge with different person" : "Unisci ad un'altra persona",
     "Share folder" : "Condividi cartella",
diff --git a/l10n/ja.js b/l10n/ja.js
index 90aa81372..c6cbf833c 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "Name" : "名前",
     "Update" : "更新",
     "Refresh" : "更新",
+    "Remove" : "削除",
     "Share folder" : "フォルダーを共有",
     "Reset" : "リセット",
     "All changes will be lost." : "全ての変更がなくなります",
diff --git a/l10n/ja.json b/l10n/ja.json
index bff1fd3b5..8c4d589ba 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -40,6 +40,7 @@
     "Name" : "名前",
     "Update" : "更新",
     "Refresh" : "更新",
+    "Remove" : "削除",
     "Share folder" : "フォルダーを共有",
     "Reset" : "リセット",
     "All changes will be lost." : "全ての変更がなくなります",
diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js
index 6db14874b..d6bc89a3d 100644
--- a/l10n/ka_GE.js
+++ b/l10n/ka_GE.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "სახელი",
     "Update" : "განახლება",
     "Refresh" : "განახლება",
+    "Remove" : "წაშლა",
     "Reset" : "საწყის მდოგმარეობაში დაბრუნება",
     "Continue" : "გაგრძელება",
     "Undo" : "დაბრუნება",
diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json
index 41069df28..997e5b6a8 100644
--- a/l10n/ka_GE.json
+++ b/l10n/ka_GE.json
@@ -24,6 +24,7 @@
     "Name" : "სახელი",
     "Update" : "განახლება",
     "Refresh" : "განახლება",
+    "Remove" : "წაშლა",
     "Reset" : "საწყის მდოგმარეობაში დაბრუნება",
     "Continue" : "გაგრძელება",
     "Undo" : "დაბრუნება",
diff --git a/l10n/kab.js b/l10n/kab.js
index ad2a8775c..bbba92d48 100644
--- a/l10n/kab.js
+++ b/l10n/kab.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Hour" : "Asrag",
     "Name" : "Nom",
     "Refresh" : "Sismeḍ",
+    "Remove" : "Kkes",
     "Continue" : "Continuer",
     "Size" : "Teɣzi"
 },
diff --git a/l10n/kab.json b/l10n/kab.json
index 63f3ef152..b23f3ba74 100644
--- a/l10n/kab.json
+++ b/l10n/kab.json
@@ -14,6 +14,7 @@
     "Hour" : "Asrag",
     "Name" : "Nom",
     "Refresh" : "Sismeḍ",
+    "Remove" : "Kkes",
     "Continue" : "Continuer",
     "Size" : "Teɣzi"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/l10n/km.js b/l10n/km.js
index ce4a44293..de2960b54 100644
--- a/l10n/km.js
+++ b/l10n/km.js
@@ -18,6 +18,7 @@ OC.L10N.register(
     "Time" : "ម៉ោង",
     "Name" : "ឈ្មោះ",
     "Update" : "ធ្វើ​បច្ចុប្បន្នភាព",
+    "Remove" : "ដកចេញ",
     "Continue" : "បន្ត",
     "Value" : "តម្លៃ",
     "Line" : "បន្ទាត់",
diff --git a/l10n/km.json b/l10n/km.json
index 0f3ee5cb5..cd73b8af0 100644
--- a/l10n/km.json
+++ b/l10n/km.json
@@ -16,6 +16,7 @@
     "Time" : "ម៉ោង",
     "Name" : "ឈ្មោះ",
     "Update" : "ធ្វើ​បច្ចុប្បន្នភាព",
+    "Remove" : "ដកចេញ",
     "Continue" : "បន្ត",
     "Value" : "តម្លៃ",
     "Line" : "បន្ទាត់",
diff --git a/l10n/kn.js b/l10n/kn.js
index e84812050..01462cf5e 100644
--- a/l10n/kn.js
+++ b/l10n/kn.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Save" : "ಉಳಿಸಿ",
     "Time" : "ಸಮಯ",
     "Name" : "ಹೆಸರು",
+    "Remove" : "ತೆಗೆದುಹಾಕಿ",
     "Reset" : "ಮರುಹೊಂದಿಸಿ",
     "Continue" : "ಮುಂದುವರಿಸಿ",
     "Size" : " ಗಾತ್ರ"
diff --git a/l10n/kn.json b/l10n/kn.json
index 550a8279f..b02bf4038 100644
--- a/l10n/kn.json
+++ b/l10n/kn.json
@@ -11,6 +11,7 @@
     "Save" : "ಉಳಿಸಿ",
     "Time" : "ಸಮಯ",
     "Name" : "ಹೆಸರು",
+    "Remove" : "ತೆಗೆದುಹಾಕಿ",
     "Reset" : "ಮರುಹೊಂದಿಸಿ",
     "Continue" : "ಮುಂದುವರಿಸಿ",
     "Size" : " ಗಾತ್ರ"
diff --git a/l10n/ko.js b/l10n/ko.js
index 37b032996..800603ebb 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -31,6 +31,7 @@ OC.L10N.register(
     "Name" : "이름",
     "Update" : "업데이트",
     "Refresh" : "새로 고침",
+    "Remove" : "삭제",
     "Reset" : "초기화",
     "Continue" : "계속",
     "Undo" : "실행 취소",
diff --git a/l10n/ko.json b/l10n/ko.json
index 783115f27..627493760 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -29,6 +29,7 @@
     "Name" : "이름",
     "Update" : "업데이트",
     "Refresh" : "새로 고침",
+    "Remove" : "삭제",
     "Reset" : "초기화",
     "Continue" : "계속",
     "Undo" : "실행 취소",
diff --git a/l10n/lb.js b/l10n/lb.js
index fff5088a8..22b6ad8f5 100644
--- a/l10n/lb.js
+++ b/l10n/lb.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Name" : "Numm",
     "Update" : "Update",
     "Refresh" : "Opfrëschen",
+    "Remove" : "Läschen",
     "Reset" : "Zeréck setzen",
     "Continue" : "Weider",
     "Custom" : "Individualiséier",
diff --git a/l10n/lb.json b/l10n/lb.json
index b6b9dccc7..8fa4b1012 100644
--- a/l10n/lb.json
+++ b/l10n/lb.json
@@ -19,6 +19,7 @@
     "Name" : "Numm",
     "Update" : "Update",
     "Refresh" : "Opfrëschen",
+    "Remove" : "Läschen",
     "Reset" : "Zeréck setzen",
     "Continue" : "Weider",
     "Custom" : "Individualiséier",
diff --git a/l10n/lo.js b/l10n/lo.js
index 81ee13d9d..e4eb65d4a 100644
--- a/l10n/lo.js
+++ b/l10n/lo.js
@@ -17,6 +17,7 @@ OC.L10N.register(
     "Save" : "ບັນທຶກ",
     "Name" : "ຊື່",
     "Refresh" : "Refresh",
+    "Remove" : "ຍ້າຍອອກ",
     "Continue" : "ສືບຕໍ່",
     "Original" : "ຕົ້ນສະບັບ",
     "Size" : "ຂະຫນາດ"
diff --git a/l10n/lo.json b/l10n/lo.json
index 74e031ee1..dc081a26e 100644
--- a/l10n/lo.json
+++ b/l10n/lo.json
@@ -15,6 +15,7 @@
     "Save" : "ບັນທຶກ",
     "Name" : "ຊື່",
     "Refresh" : "Refresh",
+    "Remove" : "ຍ້າຍອອກ",
     "Continue" : "ສືບຕໍ່",
     "Original" : "ຕົ້ນສະບັບ",
     "Size" : "ຂະຫນາດ"
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 668be9539..d89ebc8ef 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -90,6 +90,7 @@ OC.L10N.register(
     "Failed to move {name}." : "Nepavyko perkelti {name}.",
     "Share Folder" : "Bendrinti aplanką",
     "Refresh" : "Įkelti iš naujo",
+    "Remove" : "Šalinti",
     "Share album" : "Bendrinti albumą",
     "Delete album" : "Ištrinti albumą",
     "Merge with different person" : "Sulieti su kitu žmogumi",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index c52589fa2..1ef85ba0d 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -88,6 +88,7 @@
     "Failed to move {name}." : "Nepavyko perkelti {name}.",
     "Share Folder" : "Bendrinti aplanką",
     "Refresh" : "Įkelti iš naujo",
+    "Remove" : "Šalinti",
     "Share album" : "Bendrinti albumą",
     "Delete album" : "Ištrinti albumą",
     "Merge with different person" : "Sulieti su kitu žmogumi",
diff --git a/l10n/lv.js b/l10n/lv.js
index 6ef918855..4c55d1c4e 100644
--- a/l10n/lv.js
+++ b/l10n/lv.js
@@ -35,6 +35,7 @@ OC.L10N.register(
     "Update" : "Atjaunināt",
     "Share Folder" : "Kopīgot mapi",
     "Refresh" : "Atsvaidzināt",
+    "Remove" : "Noņemt",
     "Save as" : "Saglabāt kā",
     "Reset" : "Atiestatīt",
     "Continue" : "Turpināt",
diff --git a/l10n/lv.json b/l10n/lv.json
index a7d13cb64..fe87e73c5 100644
--- a/l10n/lv.json
+++ b/l10n/lv.json
@@ -33,6 +33,7 @@
     "Update" : "Atjaunināt",
     "Share Folder" : "Kopīgot mapi",
     "Refresh" : "Atsvaidzināt",
+    "Remove" : "Noņemt",
     "Save as" : "Saglabāt kā",
     "Reset" : "Atiestatīt",
     "Continue" : "Turpināt",
diff --git a/l10n/mk.js b/l10n/mk.js
index a6545c465..0d6b14e9c 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -45,6 +45,7 @@ OC.L10N.register(
     "Rename person" : "Преименувај личност",
     "Update" : "Ажурирај",
     "Refresh" : "Освежи",
+    "Remove" : "Отстрани ",
     "Delete album" : "Избриши албум",
     "Merge with different person" : "Спој со друга личност",
     "Share folder" : "Сподели папка",
diff --git a/l10n/mk.json b/l10n/mk.json
index 61a34703f..af3537757 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -43,6 +43,7 @@
     "Rename person" : "Преименувај личност",
     "Update" : "Ажурирај",
     "Refresh" : "Освежи",
+    "Remove" : "Отстрани ",
     "Delete album" : "Избриши албум",
     "Merge with different person" : "Спој со друга личност",
     "Share folder" : "Сподели папка",
diff --git a/l10n/mn.js b/l10n/mn.js
index 04b030a10..804d009d2 100644
--- a/l10n/mn.js
+++ b/l10n/mn.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Name" : "Нэр",
     "Update" : "Шинэчлэх",
     "Refresh" : "Сэргээх",
+    "Remove" : "Устгах",
     "Reset" : "тохируулах",
     "Continue" : "үргэлжлүүлэх",
     "Undo" : "буцах",
diff --git a/l10n/mn.json b/l10n/mn.json
index 9e987dd08..febd8b2be 100644
--- a/l10n/mn.json
+++ b/l10n/mn.json
@@ -23,6 +23,7 @@
     "Name" : "Нэр",
     "Update" : "Шинэчлэх",
     "Refresh" : "Сэргээх",
+    "Remove" : "Устгах",
     "Reset" : "тохируулах",
     "Continue" : "үргэлжлүүлэх",
     "Undo" : "буцах",
diff --git a/l10n/ms_MY.js b/l10n/ms_MY.js
index ad8adcc8a..993eaf0d5 100644
--- a/l10n/ms_MY.js
+++ b/l10n/ms_MY.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Name" : "Nama",
     "Update" : "Kemaskini",
     "Refresh" : "Refresh",
+    "Remove" : "Buang",
     "Size" : "Saiz"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ms_MY.json b/l10n/ms_MY.json
index bdef3a5c1..df3a6ca68 100644
--- a/l10n/ms_MY.json
+++ b/l10n/ms_MY.json
@@ -13,6 +13,7 @@
     "Name" : "Nama",
     "Update" : "Kemaskini",
     "Refresh" : "Refresh",
+    "Remove" : "Buang",
     "Size" : "Saiz"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/nb.js b/l10n/nb.js
index 93c187d3d..c8a9c3e64 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Name" : "Navn",
     "Update" : "Oppdater",
     "Refresh" : "Oppdater",
+    "Remove" : "Fjern",
     "Share folder" : "Del mappe",
     "Save as" : "Lagre som",
     "Reset" : "Tilbakestill",
diff --git a/l10n/nb.json b/l10n/nb.json
index 382d4ac39..14e329969 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -31,6 +31,7 @@
     "Name" : "Navn",
     "Update" : "Oppdater",
     "Refresh" : "Oppdater",
+    "Remove" : "Fjern",
     "Share folder" : "Del mappe",
     "Save as" : "Lagre som",
     "Reset" : "Tilbakestill",
diff --git a/l10n/nl.js b/l10n/nl.js
index b52cc3b01..b69994c66 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -35,6 +35,7 @@ OC.L10N.register(
     "Name" : "Naam",
     "Update" : "Update",
     "Refresh" : "Verversen",
+    "Remove" : "Verwijderen",
     "Share folder" : "Map delen",
     "Reset" : "Herstellen",
     "Continue" : "Doorgaan",
diff --git a/l10n/nl.json b/l10n/nl.json
index d600ac9ff..a7da3d57e 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -33,6 +33,7 @@
     "Name" : "Naam",
     "Update" : "Update",
     "Refresh" : "Verversen",
+    "Remove" : "Verwijderen",
     "Share folder" : "Map delen",
     "Reset" : "Herstellen",
     "Continue" : "Doorgaan",
diff --git a/l10n/nn_NO.js b/l10n/nn_NO.js
index e38cff249..ba0cea647 100644
--- a/l10n/nn_NO.js
+++ b/l10n/nn_NO.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Name" : "Namn",
     "Update" : "Oppdater",
     "Refresh" : "Last inn på nytt",
+    "Remove" : "Fjern",
     "Continue" : "Gå vidare",
     "Value" : "Verdi",
     "Size" : "Storleik"
diff --git a/l10n/nn_NO.json b/l10n/nn_NO.json
index 86f97d25f..6507821fb 100644
--- a/l10n/nn_NO.json
+++ b/l10n/nn_NO.json
@@ -19,6 +19,7 @@
     "Name" : "Namn",
     "Update" : "Oppdater",
     "Refresh" : "Last inn på nytt",
+    "Remove" : "Fjern",
     "Continue" : "Gå vidare",
     "Value" : "Verdi",
     "Size" : "Storleik"
diff --git a/l10n/oc.js b/l10n/oc.js
index ef6e1396c..ade963c77 100644
--- a/l10n/oc.js
+++ b/l10n/oc.js
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Name" : "Nom",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Suprimir",
     "Reset" : "Reïnicializar",
     "Continue" : "Contunhar",
     "Undo" : "Desfar",
diff --git a/l10n/oc.json b/l10n/oc.json
index cc9a344f8..b41a982ee 100644
--- a/l10n/oc.json
+++ b/l10n/oc.json
@@ -28,6 +28,7 @@
     "Name" : "Nom",
     "Update" : "Actualizar",
     "Refresh" : "Actualizar",
+    "Remove" : "Suprimir",
     "Reset" : "Reïnicializar",
     "Continue" : "Contunhar",
     "Undo" : "Desfar",
diff --git a/l10n/pl.js b/l10n/pl.js
index 98539d306..56a70019b 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -82,6 +82,7 @@ OC.L10N.register(
     "Rename person" : "Zmień nazwę osoby",
     "Update" : "Aktualizuj",
     "Refresh" : "Odśwież",
+    "Remove" : "Usuń",
     "Delete album" : "Usuń album",
     "Merge with different person" : "Połącz z inną osobą",
     "Share folder" : "Udostępnij katalog",
diff --git a/l10n/pl.json b/l10n/pl.json
index a243670e5..549422fbb 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -80,6 +80,7 @@
     "Rename person" : "Zmień nazwę osoby",
     "Update" : "Aktualizuj",
     "Refresh" : "Odśwież",
+    "Remove" : "Usuń",
     "Delete album" : "Usuń album",
     "Merge with different person" : "Połącz z inną osobą",
     "Share folder" : "Udostępnij katalog",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index b875cb43a..142658c1f 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "Move selected photos to person" : "Mover fotos selecionadas para pessoa",
     "Are you sure you want to move the selected photos from {name} to {newName}?" : "Tem certeza de que deseja mover as fotos selecionadas de {name} para {newName}?",
     "Refresh" : "Atualizar",
+    "Remove" : "Remover",
     "Delete album" : "Remover álbum",
     "Merge with different person" : "Unir com outra pessoa",
     "Mark person in preview" : "Marcar pessoa na visualização",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index cba3958f0..baa8c1be0 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -108,6 +108,7 @@
     "Move selected photos to person" : "Mover fotos selecionadas para pessoa",
     "Are you sure you want to move the selected photos from {name} to {newName}?" : "Tem certeza de que deseja mover as fotos selecionadas de {name} para {newName}?",
     "Refresh" : "Atualizar",
+    "Remove" : "Remover",
     "Delete album" : "Remover álbum",
     "Merge with different person" : "Unir com outra pessoa",
     "Mark person in preview" : "Marcar pessoa na visualização",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 3d4aaca83..c67206938 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "Name" : "Nome",
     "Update" : "Atualizar",
     "Refresh" : "Atualizar",
+    "Remove" : "Remover",
     "Share folder" : "Partilhar pasta",
     "Reset" : "Reiniciar",
     "Continue" : "Continuar",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index f2212fdab..0ebb93729 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -34,6 +34,7 @@
     "Name" : "Nome",
     "Update" : "Atualizar",
     "Refresh" : "Atualizar",
+    "Remove" : "Remover",
     "Share folder" : "Partilhar pasta",
     "Reset" : "Reiniciar",
     "Continue" : "Continuar",
diff --git a/l10n/ro.js b/l10n/ro.js
index 0f690abff..df876cbdd 100644
--- a/l10n/ro.js
+++ b/l10n/ro.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "Name" : "Nume",
     "Update" : "Actualizare",
     "Refresh" : "Reîmprospătează",
+    "Remove" : "Elimină",
     "Share folder" : "Distribuie dosar",
     "Reset" : "Resetare",
     "Continue" : "Continuă",
diff --git a/l10n/ro.json b/l10n/ro.json
index 7c82c3e8e..f452423a9 100644
--- a/l10n/ro.json
+++ b/l10n/ro.json
@@ -26,6 +26,7 @@
     "Name" : "Nume",
     "Update" : "Actualizare",
     "Refresh" : "Reîmprospătează",
+    "Remove" : "Elimină",
     "Share folder" : "Distribuie dosar",
     "Reset" : "Resetare",
     "Continue" : "Continuă",
diff --git a/l10n/ru.js b/l10n/ru.js
index 84d461f8a..d8d2fb384 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -45,6 +45,7 @@ OC.L10N.register(
     "Name" : "Имя",
     "Update" : "Обновить",
     "Refresh" : "Обновить",
+    "Remove" : "Удалить",
     "Share folder" : "Поделиться папкой",
     "Save as" : "Сохранить как",
     "Reset" : "Сброс",
diff --git a/l10n/ru.json b/l10n/ru.json
index 2bf5d1b74..22c40c281 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -43,6 +43,7 @@
     "Name" : "Имя",
     "Update" : "Обновить",
     "Refresh" : "Обновить",
+    "Remove" : "Удалить",
     "Share folder" : "Поделиться папкой",
     "Save as" : "Сохранить как",
     "Reset" : "Сброс",
diff --git a/l10n/sc.js b/l10n/sc.js
index 902b52f9a..d3e3679f0 100644
--- a/l10n/sc.js
+++ b/l10n/sc.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Name" : "Nùmene",
     "Update" : "Agiorna",
     "Refresh" : "Agiorna",
+    "Remove" : "Boga",
     "Share folder" : "Cumpartzi cartella",
     "Reset" : "Torra a impostare",
     "Continue" : "Sighi",
diff --git a/l10n/sc.json b/l10n/sc.json
index 91b589ecf..cd5b55658 100644
--- a/l10n/sc.json
+++ b/l10n/sc.json
@@ -31,6 +31,7 @@
     "Name" : "Nùmene",
     "Update" : "Agiorna",
     "Refresh" : "Agiorna",
+    "Remove" : "Boga",
     "Share folder" : "Cumpartzi cartella",
     "Reset" : "Torra a impostare",
     "Continue" : "Sighi",
diff --git a/l10n/si.js b/l10n/si.js
index 704ba7c03..f0844f9d9 100644
--- a/l10n/si.js
+++ b/l10n/si.js
@@ -20,6 +20,7 @@ OC.L10N.register(
     "Time" : "වේලාව",
     "Name" : "නම",
     "Update" : "යාවත්කාල",
+    "Remove" : "ඉවත් කරන්න",
     "Undo" : "පෙරසේ",
     "Value" : "අගය",
     "Size" : "ප්‍රමාණය"
diff --git a/l10n/si.json b/l10n/si.json
index 9a1e7fed9..bd4928a9c 100644
--- a/l10n/si.json
+++ b/l10n/si.json
@@ -18,6 +18,7 @@
     "Time" : "වේලාව",
     "Name" : "නම",
     "Update" : "යාවත්කාල",
+    "Remove" : "ඉවත් කරන්න",
     "Undo" : "පෙරසේ",
     "Value" : "අගය",
     "Size" : "ප්‍රමාණය"
diff --git a/l10n/sk.js b/l10n/sk.js
index 8b9794487..86fd56b3a 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -93,6 +93,7 @@ OC.L10N.register(
     "Error while moving {basename}" : "Chyba pri presúvaní {basename}",
     "Failed to move {name}." : "Nepodarilo sa presunúť {name}.",
     "Refresh" : "Obnoviť",
+    "Remove" : "Odobrať",
     "Delete album" : "Zmazať album",
     "Merge with different person" : "Spojiť s inou osobou",
     "Share folder" : "Zdieľať priečinok",
diff --git a/l10n/sk.json b/l10n/sk.json
index e02db2e87..4ab2812b6 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -91,6 +91,7 @@
     "Error while moving {basename}" : "Chyba pri presúvaní {basename}",
     "Failed to move {name}." : "Nepodarilo sa presunúť {name}.",
     "Refresh" : "Obnoviť",
+    "Remove" : "Odobrať",
     "Delete album" : "Zmazať album",
     "Merge with different person" : "Spojiť s inou osobou",
     "Share folder" : "Zdieľať priečinok",
diff --git a/l10n/sl.js b/l10n/sl.js
index 19883da46..66e1c0432 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "Name" : "Ime",
     "Update" : "Posodobi",
     "Refresh" : "Osveži",
+    "Remove" : "Odstrani",
     "Share folder" : "Omogoči souporabo mape",
     "Reset" : "Ponastavi",
     "Continue" : "Nadaljuj",
diff --git a/l10n/sl.json b/l10n/sl.json
index 0dadba3d3..8a82fda01 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -37,6 +37,7 @@
     "Name" : "Ime",
     "Update" : "Posodobi",
     "Refresh" : "Osveži",
+    "Remove" : "Odstrani",
     "Share folder" : "Omogoči souporabo mape",
     "Reset" : "Ponastavi",
     "Continue" : "Nadaljuj",
diff --git a/l10n/sq.js b/l10n/sq.js
index 59317995e..d7f13f479 100644
--- a/l10n/sq.js
+++ b/l10n/sq.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Name" : "Emri",
     "Update" : "Përditëso",
     "Refresh" : "Rifresko",
+    "Remove" : "Hiq",
     "Reset" : "Rivendos",
     "Continue" : "Vazhdo",
     "Undo" : "Ktheje pas",
diff --git a/l10n/sq.json b/l10n/sq.json
index 44fd20577..47fc0b131 100644
--- a/l10n/sq.json
+++ b/l10n/sq.json
@@ -24,6 +24,7 @@
     "Name" : "Emri",
     "Update" : "Përditëso",
     "Refresh" : "Rifresko",
+    "Remove" : "Hiq",
     "Reset" : "Rivendos",
     "Continue" : "Vazhdo",
     "Undo" : "Ktheje pas",
diff --git a/l10n/sr.js b/l10n/sr.js
index f5da664a9..bbfe298c0 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Name" : "Име",
     "Update" : "Ажурирај",
     "Refresh" : "Освежи",
+    "Remove" : "Уклони",
     "Reset" : "Ресетуј",
     "Continue" : "Настави",
     "Undo" : "Опозови",
diff --git a/l10n/sr.json b/l10n/sr.json
index 04c2b5827..3d219a83f 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -31,6 +31,7 @@
     "Name" : "Име",
     "Update" : "Ажурирај",
     "Refresh" : "Освежи",
+    "Remove" : "Уклони",
     "Reset" : "Ресетуј",
     "Continue" : "Настави",
     "Undo" : "Опозови",
diff --git a/l10n/sr@latin.js b/l10n/sr@latin.js
index dfb67f3fa..64711c6e2 100644
--- a/l10n/sr@latin.js
+++ b/l10n/sr@latin.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Name" : "Ime",
     "Update" : "Ažuriraj",
     "Refresh" : "Osveži",
+    "Remove" : "Ukloni",
     "Undo" : "Opozovi"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/sr@latin.json b/l10n/sr@latin.json
index 6e85a8782..9b01ee082 100644
--- a/l10n/sr@latin.json
+++ b/l10n/sr@latin.json
@@ -14,6 +14,7 @@
     "Name" : "Ime",
     "Update" : "Ažuriraj",
     "Refresh" : "Osveži",
+    "Remove" : "Ukloni",
     "Undo" : "Opozovi"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/sv.js b/l10n/sv.js
index 267b3ee90..d6454f090 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -52,6 +52,7 @@ OC.L10N.register(
     "Name" : "Namn",
     "Update" : "Uppdatera",
     "Refresh" : "Uppdatera",
+    "Remove" : "Ta bort",
     "Share folder" : "Dela mapp",
     "Reset" : "Återställ",
     "Continue" : "Fortsätt",
diff --git a/l10n/sv.json b/l10n/sv.json
index 1f5ad73b0..27c9b12f6 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -50,6 +50,7 @@
     "Name" : "Namn",
     "Update" : "Uppdatera",
     "Refresh" : "Uppdatera",
+    "Remove" : "Ta bort",
     "Share folder" : "Dela mapp",
     "Reset" : "Återställ",
     "Continue" : "Fortsätt",
diff --git a/l10n/ta.js b/l10n/ta.js
index dd456d0fc..388b6dcda 100644
--- a/l10n/ta.js
+++ b/l10n/ta.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Name" : "பெயர்",
     "Update" : "இற்றைப்படுத்தல்",
     "Refresh" : "மீள் ஏற்றுக",
+    "Remove" : "அகற்றுக",
     "Continue" : "Continue",
     "Value" : "Value",
     "Size" : "அளவு"
diff --git a/l10n/ta.json b/l10n/ta.json
index a149b5097..1c02c5b16 100644
--- a/l10n/ta.json
+++ b/l10n/ta.json
@@ -14,6 +14,7 @@
     "Name" : "பெயர்",
     "Update" : "இற்றைப்படுத்தல்",
     "Refresh" : "மீள் ஏற்றுக",
+    "Remove" : "அகற்றுக",
     "Continue" : "Continue",
     "Value" : "Value",
     "Size" : "அளவு"
diff --git a/l10n/th.js b/l10n/th.js
index 103b15d3b..ffba94a8a 100644
--- a/l10n/th.js
+++ b/l10n/th.js
@@ -24,6 +24,7 @@ OC.L10N.register(
     "Name" : "ชื่อ",
     "Update" : "อัปเดต",
     "Refresh" : "รีเฟรช",
+    "Remove" : "ลบออก",
     "Share folder" : "แชร์โฟลเดอร์",
     "Reset" : "ตั้งค่าใหม่",
     "Continue" : "ดำเนินการต่อ",
diff --git a/l10n/th.json b/l10n/th.json
index b336c076a..ae8954ff2 100644
--- a/l10n/th.json
+++ b/l10n/th.json
@@ -22,6 +22,7 @@
     "Name" : "ชื่อ",
     "Update" : "อัปเดต",
     "Refresh" : "รีเฟรช",
+    "Remove" : "ลบออก",
     "Share folder" : "แชร์โฟลเดอร์",
     "Reset" : "ตั้งค่าใหม่",
     "Continue" : "ดำเนินการต่อ",
diff --git a/l10n/tk.js b/l10n/tk.js
index 49fdf11cf..1c38a94e3 100644
--- a/l10n/tk.js
+++ b/l10n/tk.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Back" : "Yzyna",
     "Save" : "Saklamak",
     "Name" : "Ady",
-    "Refresh" : "Täzelemek"
+    "Refresh" : "Täzelemek",
+    "Remove" : "Aýyrmak"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/tk.json b/l10n/tk.json
index 6129807de..fc3520e2f 100644
--- a/l10n/tk.json
+++ b/l10n/tk.json
@@ -12,6 +12,7 @@
     "Back" : "Yzyna",
     "Save" : "Saklamak",
     "Name" : "Ady",
-    "Refresh" : "Täzelemek"
+    "Refresh" : "Täzelemek",
+    "Remove" : "Aýyrmak"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/tr.js b/l10n/tr.js
index 47085f8ef..dc0cdd5b9 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -129,6 +129,7 @@ OC.L10N.register(
     "Use the sidebar to share this folder." : "Bu klasörü paylaşmak için yan çubuğu kullanın.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Herkese açık bir bağlantı paylaşımı oluşturduktan sonra yenile üzerine tıklayın. Anılar için ilgili bağlantı aşağıda görüntülenir.",
     "Refresh" : "Yenlle",
+    "Remove" : "Kaldır",
     "Share album" : "Albümü paylaş",
     "Delete album" : "Albümü sil",
     "Merge with different person" : "Başka bir kişi ile birleştir",
diff --git a/l10n/tr.json b/l10n/tr.json
index 041915c07..fe7db7356 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -127,6 +127,7 @@
     "Use the sidebar to share this folder." : "Bu klasörü paylaşmak için yan çubuğu kullanın.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Herkese açık bir bağlantı paylaşımı oluşturduktan sonra yenile üzerine tıklayın. Anılar için ilgili bağlantı aşağıda görüntülenir.",
     "Refresh" : "Yenlle",
+    "Remove" : "Kaldır",
     "Share album" : "Albümü paylaş",
     "Delete album" : "Albümü sil",
     "Merge with different person" : "Başka bir kişi ile birleştir",
diff --git a/l10n/ug.js b/l10n/ug.js
index 308dfdbcc..14fe96b64 100644
--- a/l10n/ug.js
+++ b/l10n/ug.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Name" : "ئاتى",
     "Update" : "يېڭىلا",
     "Refresh" : "يېڭىلا",
+    "Remove" : "چىقىرىۋەت",
     "Size" : "چوڭلۇقى"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ug.json b/l10n/ug.json
index 43c4c0f05..641c9311f 100644
--- a/l10n/ug.json
+++ b/l10n/ug.json
@@ -14,6 +14,7 @@
     "Name" : "ئاتى",
     "Update" : "يېڭىلا",
     "Refresh" : "يېڭىلا",
+    "Remove" : "چىقىرىۋەت",
     "Size" : "چوڭلۇقى"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/uk.js b/l10n/uk.js
index 2cb1c1353..7400609f9 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -74,6 +74,7 @@ OC.L10N.register(
     "Rename person" : "Перейменувати особу",
     "Update" : "Оновлення",
     "Refresh" : "Оновити",
+    "Remove" : "Вилучити",
     "Delete album" : "Видалити альбом",
     "Merge with different person" : "Злитися з іншою людиною",
     "Share folder" : "Спільний доступ для каталогу",
diff --git a/l10n/uk.json b/l10n/uk.json
index 8f0d101cf..719103155 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -72,6 +72,7 @@
     "Rename person" : "Перейменувати особу",
     "Update" : "Оновлення",
     "Refresh" : "Оновити",
+    "Remove" : "Вилучити",
     "Delete album" : "Видалити альбом",
     "Merge with different person" : "Злитися з іншою людиною",
     "Share folder" : "Спільний доступ для каталогу",
diff --git a/l10n/uz.js b/l10n/uz.js
index d4ef44d2a..764f1ffbd 100644
--- a/l10n/uz.js
+++ b/l10n/uz.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Name" : "Name",
     "Update" : "Update",
     "Refresh" : "Refresh",
+    "Remove" : "Remove",
     "Continue" : "Continue",
     "Size" : "Size"
 },
diff --git a/l10n/uz.json b/l10n/uz.json
index f0ec91810..f756e4802 100644
--- a/l10n/uz.json
+++ b/l10n/uz.json
@@ -12,6 +12,7 @@
     "Name" : "Name",
     "Update" : "Update",
     "Refresh" : "Refresh",
+    "Remove" : "Remove",
     "Continue" : "Continue",
     "Size" : "Size"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/l10n/vi.js b/l10n/vi.js
index 7c72362ae..2c7c8a16c 100644
--- a/l10n/vi.js
+++ b/l10n/vi.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "Name" : "Tên",
     "Update" : "Cập nhật",
     "Refresh" : "Tải mới",
+    "Remove" : "Xoá",
     "Reset" : "Đặt lại",
     "Continue" : "Tiếp tục",
     "Undo" : "Hoàn tác",
diff --git a/l10n/vi.json b/l10n/vi.json
index f1d9e2af5..36b75fb3c 100644
--- a/l10n/vi.json
+++ b/l10n/vi.json
@@ -26,6 +26,7 @@
     "Name" : "Tên",
     "Update" : "Cập nhật",
     "Refresh" : "Tải mới",
+    "Remove" : "Xoá",
     "Reset" : "Đặt lại",
     "Continue" : "Tiếp tục",
     "Undo" : "Hoàn tác",
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 6db292b1a..7484d9d98 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -65,6 +65,7 @@ OC.L10N.register(
     "Rename person" : "重命名用户",
     "Update" : "更新",
     "Refresh" : "刷新",
+    "Remove" : "移除",
     "Delete album" : "删除相册",
     "Merge with different person" : "与另一个人合并为同一人",
     "Share folder" : "共享文件夹",
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 5c4687c23..322ee3019 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -63,6 +63,7 @@
     "Rename person" : "重命名用户",
     "Update" : "更新",
     "Refresh" : "刷新",
+    "Remove" : "移除",
     "Delete album" : "删除相册",
     "Merge with different person" : "与另一个人合并为同一人",
     "Share folder" : "共享文件夹",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 89eed5471..b850f4ffd 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -129,6 +129,7 @@ OC.L10N.register(
     "Use the sidebar to share this folder." : "使用側邊欄以分享此資料夾。",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "若您建立公開連結分享，請點擊「重新整理」，下方將會顯示對應的 Memories 連結。",
     "Refresh" : "刷新",
+    "Remove" : "移除",
     "Share album" : "分享相簿",
     "Delete album" : "刪除相簿",
     "Merge with different person" : "與其他人合併",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index e6ba70d58..56cc93cd2 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -127,6 +127,7 @@
     "Use the sidebar to share this folder." : "使用側邊欄以分享此資料夾。",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "若您建立公開連結分享，請點擊「重新整理」，下方將會顯示對應的 Memories 連結。",
     "Refresh" : "刷新",
+    "Remove" : "移除",
     "Share album" : "分享相簿",
     "Delete album" : "刪除相簿",
     "Merge with different person" : "與其他人合併",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index e51a6d194..562e06081 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -129,6 +129,7 @@ OC.L10N.register(
     "Use the sidebar to share this folder." : "使用側邊欄以分享此資料夾。",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "若您建立公開連結分享，請點擊「重新整理」，下方將會顯示對應的 Memories 連結。",
     "Refresh" : "重新整理",
+    "Remove" : "移除",
     "Share album" : "分享相簿",
     "Delete album" : "刪除相簿",
     "Merge with different person" : "與其他人合併",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index c7c2c79fa..2ae7c6672 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -127,6 +127,7 @@
     "Use the sidebar to share this folder." : "使用側邊欄以分享此資料夾。",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "若您建立公開連結分享，請點擊「重新整理」，下方將會顯示對應的 Memories 連結。",
     "Refresh" : "重新整理",
+    "Remove" : "移除",
     "Share album" : "分享相簿",
     "Delete album" : "刪除相簿",
     "Merge with different person" : "與其他人合併",

From 3179d28dc6aad453e529d0d6efec3c8fe4fd69ac Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Fri, 18 Nov 2022 03:17:01 +0000
Subject: [PATCH 162/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/af.js      | 1 +
 l10n/af.json    | 1 +
 l10n/ar.js      | 1 +
 l10n/ar.json    | 1 +
 l10n/ast.js     | 1 +
 l10n/ast.json   | 1 +
 l10n/az.js      | 1 +
 l10n/az.json    | 1 +
 l10n/bg.js      | 1 +
 l10n/bg.json    | 1 +
 l10n/bn_BD.js   | 1 +
 l10n/bn_BD.json | 1 +
 l10n/br.js      | 1 +
 l10n/br.json    | 1 +
 l10n/ca.js      | 1 +
 l10n/ca.json    | 1 +
 l10n/cs.js      | 1 +
 l10n/cs.json    | 1 +
 l10n/cy_GB.js   | 1 +
 l10n/cy_GB.json | 1 +
 l10n/da.js      | 1 +
 l10n/da.json    | 1 +
 l10n/de_DE.js   | 4 ++++
 l10n/de_DE.json | 4 ++++
 l10n/es.js      | 6 ++++++
 l10n/es.json    | 6 ++++++
 l10n/tr.js      | 3 +++
 l10n/tr.json    | 3 +++
 l10n/zh_HK.js   | 3 +++
 l10n/zh_HK.json | 3 +++
 l10n/zh_TW.js   | 3 +++
 l10n/zh_TW.json | 3 +++
 32 files changed, 60 insertions(+)

diff --git a/l10n/af.js b/l10n/af.js
index aab4e7c2b..1a1bb496f 100644
--- a/l10n/af.js
+++ b/l10n/af.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "Naam",
     "Update" : "Werk by",
     "Refresh" : "Verfris",
+    "Remove" : "Verwyder",
     "Reset" : "Herstel",
     "Continue" : "Gaan voort",
     "Original" : "Oorspronklik",
diff --git a/l10n/af.json b/l10n/af.json
index 75ac74470..9901a9c36 100644
--- a/l10n/af.json
+++ b/l10n/af.json
@@ -25,6 +25,7 @@
     "Name" : "Naam",
     "Update" : "Werk by",
     "Refresh" : "Verfris",
+    "Remove" : "Verwyder",
     "Reset" : "Herstel",
     "Continue" : "Gaan voort",
     "Original" : "Oorspronklik",
diff --git a/l10n/ar.js b/l10n/ar.js
index d0e5decf6..1aaf51022 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Name" : "الاسم",
     "Update" : "تحديث",
     "Refresh" : "إنعاش",
+    "Remove" : "حذف",
     "Reset" : "إعادة الضبط",
     "Continue" : "متابعة",
     "Undo" : "تراجع",
diff --git a/l10n/ar.json b/l10n/ar.json
index 4a0e17033..c637ca8a0 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -25,6 +25,7 @@
     "Name" : "الاسم",
     "Update" : "تحديث",
     "Refresh" : "إنعاش",
+    "Remove" : "حذف",
     "Reset" : "إعادة الضبط",
     "Continue" : "متابعة",
     "Undo" : "تراجع",
diff --git a/l10n/ast.js b/l10n/ast.js
index 0349acb14..109535fc4 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Name" : "Nome",
     "Update" : "Anovar",
     "Refresh" : "Refrescar",
+    "Remove" : "Desaniciar",
     "Continue" : "Siguir",
     "Undo" : "Desfacer",
     "Custom" : "Personalizáu",
diff --git a/l10n/ast.json b/l10n/ast.json
index e39516945..f3aa9e197 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -23,6 +23,7 @@
     "Name" : "Nome",
     "Update" : "Anovar",
     "Refresh" : "Refrescar",
+    "Remove" : "Desaniciar",
     "Continue" : "Siguir",
     "Undo" : "Desfacer",
     "Custom" : "Personalizáu",
diff --git a/l10n/az.js b/l10n/az.js
index 8624884da..bb1e996fa 100644
--- a/l10n/az.js
+++ b/l10n/az.js
@@ -19,6 +19,7 @@ OC.L10N.register(
     "Name" : "Ad",
     "Update" : "Yenilənmə",
     "Refresh" : "Yenilə",
+    "Remove" : "Sil",
     "Reset" : "Sıfırla",
     "Size" : "Həcm"
 },
diff --git a/l10n/az.json b/l10n/az.json
index eced9701b..e1ff1f800 100644
--- a/l10n/az.json
+++ b/l10n/az.json
@@ -17,6 +17,7 @@
     "Name" : "Ad",
     "Update" : "Yenilənmə",
     "Refresh" : "Yenilə",
+    "Remove" : "Sil",
     "Reset" : "Sıfırla",
     "Size" : "Həcm"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/l10n/bg.js b/l10n/bg.js
index 996ca0565..f84ab3c4c 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -126,6 +126,7 @@ OC.L10N.register(
     "Use the sidebar to share this folder." : "Използвайне на страничната лента, за споделяне на тази папка.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Ако създадете публично споделяне на връзка, щракнете върху Опресняване и съответна връзка към приложението Спомени ще бъде показана по-долу.",
     "Refresh" : "Опресняване",
+    "Remove" : "Премахване",
     "Share album" : "Споделяне на албум",
     "Delete album" : "Изтриване на албум",
     "Merge with different person" : "Обединяване с различно лице",
diff --git a/l10n/bg.json b/l10n/bg.json
index d97c266ff..faf5df299 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -124,6 +124,7 @@
     "Use the sidebar to share this folder." : "Използвайне на страничната лента, за споделяне на тази папка.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Ако създадете публично споделяне на връзка, щракнете върху Опресняване и съответна връзка към приложението Спомени ще бъде показана по-долу.",
     "Refresh" : "Опресняване",
+    "Remove" : "Премахване",
     "Share album" : "Споделяне на албум",
     "Delete album" : "Изтриване на албум",
     "Merge with different person" : "Обединяване с различно лице",
diff --git a/l10n/bn_BD.js b/l10n/bn_BD.js
index c1e8e500c..ef1249551 100644
--- a/l10n/bn_BD.js
+++ b/l10n/bn_BD.js
@@ -20,6 +20,7 @@ OC.L10N.register(
     "Name" : "নাম",
     "Update" : "পরিবর্ধন",
     "Refresh" : "নবোদ্যম",
+    "Remove" : "অপসারণ",
     "Reset" : "পূণঃনির্ধানণ",
     "Continue" : "চালিয়ে যাও",
     "Size" : "আকার"
diff --git a/l10n/bn_BD.json b/l10n/bn_BD.json
index 8adf74936..31348c2fd 100644
--- a/l10n/bn_BD.json
+++ b/l10n/bn_BD.json
@@ -18,6 +18,7 @@
     "Name" : "নাম",
     "Update" : "পরিবর্ধন",
     "Refresh" : "নবোদ্যম",
+    "Remove" : "অপসারণ",
     "Reset" : "পূণঃনির্ধানণ",
     "Continue" : "চালিয়ে যাও",
     "Size" : "আকার"
diff --git a/l10n/br.js b/l10n/br.js
index 754ebb01b..2e65aef0a 100644
--- a/l10n/br.js
+++ b/l10n/br.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Name" : "Anv",
     "Update" : "Hizivaat",
     "Refresh" : "Freskaat",
+    "Remove" : "Lemel",
     "Continue" : "Kendec'hel",
     "Original" : "Orin",
     "Size" : "Ment"
diff --git a/l10n/br.json b/l10n/br.json
index 5e1b80060..838c7f722 100644
--- a/l10n/br.json
+++ b/l10n/br.json
@@ -21,6 +21,7 @@
     "Name" : "Anv",
     "Update" : "Hizivaat",
     "Refresh" : "Freskaat",
+    "Remove" : "Lemel",
     "Continue" : "Kendec'hel",
     "Original" : "Orin",
     "Size" : "Ment"
diff --git a/l10n/ca.js b/l10n/ca.js
index 65d42078f..4ab2afe61 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Name" : "Cognom",
     "Update" : "Actualitzar",
     "Refresh" : "Actualitza",
+    "Remove" : "Elimina",
     "Share folder" : "Comparteix la carpeta",
     "Save as" : "Anomena i desa",
     "Reset" : "Restableix",
diff --git a/l10n/ca.json b/l10n/ca.json
index 6aa4f2c20..2e50b2b73 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -35,6 +35,7 @@
     "Name" : "Cognom",
     "Update" : "Actualitzar",
     "Refresh" : "Actualitza",
+    "Remove" : "Elimina",
     "Share folder" : "Comparteix la carpeta",
     "Save as" : "Anomena i desa",
     "Reset" : "Restableix",
diff --git a/l10n/cs.js b/l10n/cs.js
index 3a6c5c72d..daf6ae796 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -129,6 +129,7 @@ OC.L10N.register(
     "Use the sidebar to share this folder." : "Pokud chcete tuto složku nasdílet, použijte k tomu postranní panel",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Pokud vytváříte odkaz pro veřejné sdílení, klikněte na opětovné načtení a níže se ukáže příslušný odkaz do Vzpomínek.",
     "Refresh" : "Znovu načíst",
+    "Remove" : "Odebrat",
     "Share album" : "Nasdílet album",
     "Delete album" : "Smazat album",
     "Merge with different person" : "Sloučit s jinou osobou",
diff --git a/l10n/cs.json b/l10n/cs.json
index 637949601..09b9102c6 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -127,6 +127,7 @@
     "Use the sidebar to share this folder." : "Pokud chcete tuto složku nasdílet, použijte k tomu postranní panel",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Pokud vytváříte odkaz pro veřejné sdílení, klikněte na opětovné načtení a níže se ukáže příslušný odkaz do Vzpomínek.",
     "Refresh" : "Znovu načíst",
+    "Remove" : "Odebrat",
     "Share album" : "Nasdílet album",
     "Delete album" : "Smazat album",
     "Merge with different person" : "Sloučit s jinou osobou",
diff --git a/l10n/cy_GB.js b/l10n/cy_GB.js
index 2e81565b4..0d3738ecb 100644
--- a/l10n/cy_GB.js
+++ b/l10n/cy_GB.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Name" : "Enw",
     "Update" : "Diweddaru",
     "Refresh" : "Ail-lwytho",
+    "Remove" : "Gwaredu",
     "Undo" : "Dadwneud",
     "Custom" : "Cyfaddas",
     "Size" : "Maint",
diff --git a/l10n/cy_GB.json b/l10n/cy_GB.json
index 503832cde..5d1097332 100644
--- a/l10n/cy_GB.json
+++ b/l10n/cy_GB.json
@@ -21,6 +21,7 @@
     "Name" : "Enw",
     "Update" : "Diweddaru",
     "Refresh" : "Ail-lwytho",
+    "Remove" : "Gwaredu",
     "Undo" : "Dadwneud",
     "Custom" : "Cyfaddas",
     "Size" : "Maint",
diff --git a/l10n/da.js b/l10n/da.js
index f3a40e01f..d41368665 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -51,6 +51,7 @@ OC.L10N.register(
     "Name" : "Navn",
     "Update" : "Opdater",
     "Refresh" : "Opdater",
+    "Remove" : "Fjern",
     "Share folder" : "Del mappe",
     "Reset" : "Nulstil",
     "Continue" : "Fortsæt",
diff --git a/l10n/da.json b/l10n/da.json
index b63c3b91c..5919cd1b3 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -49,6 +49,7 @@
     "Name" : "Navn",
     "Update" : "Opdater",
     "Refresh" : "Opdater",
+    "Remove" : "Fjern",
     "Share folder" : "Del mappe",
     "Reset" : "Nulstil",
     "Continue" : "Fortsæt",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 32d6ddca8..ada31b8cb 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Folders Path" : "Ordnerpfad",
     "Show hidden folders" : "Zeige versteckte Ordner",
     "Square grid mode" : "Quadratischer Gittermodus",
+    "Choose Timeline Paths" : "Pfade der Zeitleiste auswählen",
     "Choose the root for the folders view" : "Wählen Sie das Stammverzeichnis für die Ordneransicht",
     "Your Timeline" : "Ihre Zeitleiste",
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
@@ -129,6 +130,9 @@ OC.L10N.register(
     "Use the sidebar to share this folder." : "Verwenden Sie die Seitenleiste, um diesen Ordner zu teilen.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Wenn Sie eine öffentliche Linkfreigabe erstellen, klicken Sie auf Aktualisieren und ein entsprechender Link zu Memories wird unten angezeigt.",
     "Refresh" : "Aktualisieren",
+    "Remove" : "Entfernen",
+    "Add Path" : "Pfad hinzufügen",
+    "Add a root to your timeline" : "Einen Start Ihrer Zeitleiste hinzufügen",
     "Share album" : "Album teilen",
     "Delete album" : "Album löschen",
     "Merge with different person" : "Mit einer anderen Person zusammenführen",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index e9dfac143..b3470d80f 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -52,6 +52,7 @@
     "Folders Path" : "Ordnerpfad",
     "Show hidden folders" : "Zeige versteckte Ordner",
     "Square grid mode" : "Quadratischer Gittermodus",
+    "Choose Timeline Paths" : "Pfade der Zeitleiste auswählen",
     "Choose the root for the folders view" : "Wählen Sie das Stammverzeichnis für die Ordneransicht",
     "Your Timeline" : "Ihre Zeitleiste",
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
@@ -127,6 +128,9 @@
     "Use the sidebar to share this folder." : "Verwenden Sie die Seitenleiste, um diesen Ordner zu teilen.",
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Wenn Sie eine öffentliche Linkfreigabe erstellen, klicken Sie auf Aktualisieren und ein entsprechender Link zu Memories wird unten angezeigt.",
     "Refresh" : "Aktualisieren",
+    "Remove" : "Entfernen",
+    "Add Path" : "Pfad hinzufügen",
+    "Add a root to your timeline" : "Einen Start Ihrer Zeitleiste hinzufügen",
     "Share album" : "Album teilen",
     "Delete album" : "Album löschen",
     "Merge with different person" : "Mit einer anderen Person zusammenführen",
diff --git a/l10n/es.js b/l10n/es.js
index 97c2f326d..5a61d5e95 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -26,6 +26,8 @@ OC.L10N.register(
     "Choose the root of your timeline" : "Seleccione la raíz de su línea de tiempo",
     "The selected folder does not seem to be valid. Try again." : "La carpeta seleccionada no parece ser válida. Intente de nuevo.",
     "Found {total} photos in {path}" : "Se encontraron {total} fotos en {path}",
+    "Failed to get Exif data. Metadata may be lost!" : "Fallo al obtener los datos Exif. ¡Podrían haberse perdido los metadatos!",
+    "No Exif data found! Continue?" : "¡No se encontraron datos Exif!, ¿Continuar?",
     "Image saved successfully" : "La imagen se guardó exitósamente",
     "Error saving image" : "Error guardando imágen",
     "Unsaved changes" : "Cambios sin guardar",
@@ -52,6 +54,7 @@ OC.L10N.register(
     "Folders Path" : "Ruta a las carpetas",
     "Show hidden folders" : "Mostrar carpetas ocultas",
     "Square grid mode" : "Modo de rejilla cuadrada",
+    "Choose Timeline Paths" : "Escoga las rutas a la línea de tiempo",
     "Choose the root for the folders view" : "Seleccione la raíz de la vista de carpetas",
     "Your Timeline" : "Su línea de tiempo",
     "Failed to load some photos" : "Fallo al cargar algunas fotos",
@@ -128,6 +131,8 @@ OC.L10N.register(
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Si crea un enlace público de compartición, haga click en refrescar y se mostrará abajo el enlace correspondiente a Memories.",
     "Refresh" : "Actualizar",
     "Remove" : "Quitar",
+    "Add Path" : "Añadir ruta",
+    "Add a root to your timeline" : "Añadir una raíz a su línea de tiempo",
     "Share album" : "Compartir álbum",
     "Delete album" : "Eliminar álbum",
     "Merge with different person" : "Unir con una persona diferente",
@@ -219,6 +224,7 @@ OC.L10N.register(
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tenga en cuenta que el área a recortar es menor al redimensionamiento aplicado lo que puede causar pérdida de calidad",
     "Actual size (100%)" : "Tamaño actual (100%)",
     "Fit size" : "Ajustar tamaño",
+    "Transcoding failed." : "Falló el transcoding",
     "Auto" : "Auto",
     "Shared Folder" : "Carpeta compartida",
     "Failed to create {albumName}." : "Fallo al crear {albumName}",
diff --git a/l10n/es.json b/l10n/es.json
index 772b99acd..34202fa7a 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -24,6 +24,8 @@
     "Choose the root of your timeline" : "Seleccione la raíz de su línea de tiempo",
     "The selected folder does not seem to be valid. Try again." : "La carpeta seleccionada no parece ser válida. Intente de nuevo.",
     "Found {total} photos in {path}" : "Se encontraron {total} fotos en {path}",
+    "Failed to get Exif data. Metadata may be lost!" : "Fallo al obtener los datos Exif. ¡Podrían haberse perdido los metadatos!",
+    "No Exif data found! Continue?" : "¡No se encontraron datos Exif!, ¿Continuar?",
     "Image saved successfully" : "La imagen se guardó exitósamente",
     "Error saving image" : "Error guardando imágen",
     "Unsaved changes" : "Cambios sin guardar",
@@ -50,6 +52,7 @@
     "Folders Path" : "Ruta a las carpetas",
     "Show hidden folders" : "Mostrar carpetas ocultas",
     "Square grid mode" : "Modo de rejilla cuadrada",
+    "Choose Timeline Paths" : "Escoga las rutas a la línea de tiempo",
     "Choose the root for the folders view" : "Seleccione la raíz de la vista de carpetas",
     "Your Timeline" : "Su línea de tiempo",
     "Failed to load some photos" : "Fallo al cargar algunas fotos",
@@ -126,6 +129,8 @@
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Si crea un enlace público de compartición, haga click en refrescar y se mostrará abajo el enlace correspondiente a Memories.",
     "Refresh" : "Actualizar",
     "Remove" : "Quitar",
+    "Add Path" : "Añadir ruta",
+    "Add a root to your timeline" : "Añadir una raíz a su línea de tiempo",
     "Share album" : "Compartir álbum",
     "Delete album" : "Eliminar álbum",
     "Merge with different person" : "Unir con una persona diferente",
@@ -217,6 +222,7 @@
     "Note that the selected crop area is lower than the applied resize which might cause quality decrease" : "Tenga en cuenta que el área a recortar es menor al redimensionamiento aplicado lo que puede causar pérdida de calidad",
     "Actual size (100%)" : "Tamaño actual (100%)",
     "Fit size" : "Ajustar tamaño",
+    "Transcoding failed." : "Falló el transcoding",
     "Auto" : "Auto",
     "Shared Folder" : "Carpeta compartida",
     "Failed to create {albumName}." : "Fallo al crear {albumName}",
diff --git a/l10n/tr.js b/l10n/tr.js
index dc0cdd5b9..44772e8ac 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Folders Path" : "Klasörlerin yolu",
     "Show hidden folders" : "Gizli klasörleri görüntüle",
     "Square grid mode" : "Kare tablo kipi",
+    "Choose Timeline Paths" : "Zaman tüneli yollarını seçin",
     "Choose the root for the folders view" : "Klasörler görünümünün kök klasörünü seçin",
     "Your Timeline" : "Zaman tüneliniz",
     "Failed to load some photos" : "Bazı fotoğraflar yüklenemedi",
@@ -130,6 +131,8 @@ OC.L10N.register(
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Herkese açık bir bağlantı paylaşımı oluşturduktan sonra yenile üzerine tıklayın. Anılar için ilgili bağlantı aşağıda görüntülenir.",
     "Refresh" : "Yenlle",
     "Remove" : "Kaldır",
+    "Add Path" : "Yol ekle",
+    "Add a root to your timeline" : "Zaman tünelinize bir kök klasör ekleyin",
     "Share album" : "Albümü paylaş",
     "Delete album" : "Albümü sil",
     "Merge with different person" : "Başka bir kişi ile birleştir",
diff --git a/l10n/tr.json b/l10n/tr.json
index fe7db7356..55d1540e5 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -52,6 +52,7 @@
     "Folders Path" : "Klasörlerin yolu",
     "Show hidden folders" : "Gizli klasörleri görüntüle",
     "Square grid mode" : "Kare tablo kipi",
+    "Choose Timeline Paths" : "Zaman tüneli yollarını seçin",
     "Choose the root for the folders view" : "Klasörler görünümünün kök klasörünü seçin",
     "Your Timeline" : "Zaman tüneliniz",
     "Failed to load some photos" : "Bazı fotoğraflar yüklenemedi",
@@ -128,6 +129,8 @@
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Herkese açık bir bağlantı paylaşımı oluşturduktan sonra yenile üzerine tıklayın. Anılar için ilgili bağlantı aşağıda görüntülenir.",
     "Refresh" : "Yenlle",
     "Remove" : "Kaldır",
+    "Add Path" : "Yol ekle",
+    "Add a root to your timeline" : "Zaman tünelinize bir kök klasör ekleyin",
     "Share album" : "Albümü paylaş",
     "Delete album" : "Albümü sil",
     "Merge with different person" : "Başka bir kişi ile birleştir",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index b850f4ffd..ab08e3fd6 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Folders Path" : "資料夾路徑",
     "Show hidden folders" : "顯示隱藏資料夾",
     "Square grid mode" : "方形網格模式",
+    "Choose Timeline Paths" : "選擇時間線途徑",
     "Choose the root for the folders view" : "選擇資料夾檢視的根",
     "Your Timeline" : "您的時間線",
     "Failed to load some photos" : "未能加載一些照片",
@@ -130,6 +131,8 @@ OC.L10N.register(
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "若您建立公開連結分享，請點擊「重新整理」，下方將會顯示對應的 Memories 連結。",
     "Refresh" : "刷新",
     "Remove" : "移除",
+    "Add Path" : "添加途徑",
+    "Add a root to your timeline" : "添加您時間線的根",
     "Share album" : "分享相簿",
     "Delete album" : "刪除相簿",
     "Merge with different person" : "與其他人合併",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index 56cc93cd2..35af76192 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -52,6 +52,7 @@
     "Folders Path" : "資料夾路徑",
     "Show hidden folders" : "顯示隱藏資料夾",
     "Square grid mode" : "方形網格模式",
+    "Choose Timeline Paths" : "選擇時間線途徑",
     "Choose the root for the folders view" : "選擇資料夾檢視的根",
     "Your Timeline" : "您的時間線",
     "Failed to load some photos" : "未能加載一些照片",
@@ -128,6 +129,8 @@
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "若您建立公開連結分享，請點擊「重新整理」，下方將會顯示對應的 Memories 連結。",
     "Refresh" : "刷新",
     "Remove" : "移除",
+    "Add Path" : "添加途徑",
+    "Add a root to your timeline" : "添加您時間線的根",
     "Share album" : "分享相簿",
     "Delete album" : "刪除相簿",
     "Merge with different person" : "與其他人合併",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 562e06081..f64f29a3a 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Folders Path" : "資料夾路徑",
     "Show hidden folders" : "顯示隱藏的資料夾",
     "Square grid mode" : "方形網格模式",
+    "Choose Timeline Paths" : "選擇時間軸路徑",
     "Choose the root for the folders view" : "選擇資料夾檢視的根",
     "Your Timeline" : "您的時間軸",
     "Failed to load some photos" : "載入部份照片時失敗",
@@ -130,6 +131,8 @@ OC.L10N.register(
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "若您建立公開連結分享，請點擊「重新整理」，下方將會顯示對應的 Memories 連結。",
     "Refresh" : "重新整理",
     "Remove" : "移除",
+    "Add Path" : "新增路徑",
+    "Add a root to your timeline" : "新增您時間軸的根",
     "Share album" : "分享相簿",
     "Delete album" : "刪除相簿",
     "Merge with different person" : "與其他人合併",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 2ae7c6672..08add1fa0 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -52,6 +52,7 @@
     "Folders Path" : "資料夾路徑",
     "Show hidden folders" : "顯示隱藏的資料夾",
     "Square grid mode" : "方形網格模式",
+    "Choose Timeline Paths" : "選擇時間軸路徑",
     "Choose the root for the folders view" : "選擇資料夾檢視的根",
     "Your Timeline" : "您的時間軸",
     "Failed to load some photos" : "載入部份照片時失敗",
@@ -128,6 +129,8 @@
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "若您建立公開連結分享，請點擊「重新整理」，下方將會顯示對應的 Memories 連結。",
     "Refresh" : "重新整理",
     "Remove" : "移除",
+    "Add Path" : "新增路徑",
+    "Add a root to your timeline" : "新增您時間軸的根",
     "Share album" : "分享相簿",
     "Delete album" : "刪除相簿",
     "Merge with different person" : "與其他人合併",

From e210c323beff144b32211aec59eee7415563843e Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Sat, 19 Nov 2022 03:24:13 +0000
Subject: [PATCH 163/163] [tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/cs.js   | 3 +++
 l10n/cs.json | 3 +++
 l10n/ru.js   | 5 +++++
 l10n/ru.json | 5 +++++
 4 files changed, 16 insertions(+)

diff --git a/l10n/cs.js b/l10n/cs.js
index daf6ae796..75e3c4924 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Folders Path" : "Popis umístění složek",
     "Show hidden folders" : "Zobrazit skryté složky",
     "Square grid mode" : "Režim se čtvercovou mřížkou",
+    "Choose Timeline Paths" : "Zvolte trasy časovou osou",
     "Choose the root for the folders view" : "Zvolte kořen pro zobrazení složek",
     "Your Timeline" : "Vaše časová osa",
     "Failed to load some photos" : "Některé fotky se nepodařilo načíst",
@@ -130,6 +131,8 @@ OC.L10N.register(
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Pokud vytváříte odkaz pro veřejné sdílení, klikněte na opětovné načtení a níže se ukáže příslušný odkaz do Vzpomínek.",
     "Refresh" : "Znovu načíst",
     "Remove" : "Odebrat",
+    "Add Path" : "Přidat trasu",
+    "Add a root to your timeline" : "Přidat do časové osy kořen",
     "Share album" : "Nasdílet album",
     "Delete album" : "Smazat album",
     "Merge with different person" : "Sloučit s jinou osobou",
diff --git a/l10n/cs.json b/l10n/cs.json
index 09b9102c6..d82d6c1cb 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -52,6 +52,7 @@
     "Folders Path" : "Popis umístění složek",
     "Show hidden folders" : "Zobrazit skryté složky",
     "Square grid mode" : "Režim se čtvercovou mřížkou",
+    "Choose Timeline Paths" : "Zvolte trasy časovou osou",
     "Choose the root for the folders view" : "Zvolte kořen pro zobrazení složek",
     "Your Timeline" : "Vaše časová osa",
     "Failed to load some photos" : "Některé fotky se nepodařilo načíst",
@@ -128,6 +129,8 @@
     "If you create a public link share, click on refresh and a corresponding link to Memories will be shown below." : "Pokud vytváříte odkaz pro veřejné sdílení, klikněte na opětovné načtení a níže se ukáže příslušný odkaz do Vzpomínek.",
     "Refresh" : "Znovu načíst",
     "Remove" : "Odebrat",
+    "Add Path" : "Přidat trasu",
+    "Add a root to your timeline" : "Přidat do časové osy kořen",
     "Share album" : "Nasdílet album",
     "Delete album" : "Smazat album",
     "Merge with different person" : "Sloučit s jinou osobou",
diff --git a/l10n/ru.js b/l10n/ru.js
index d8d2fb384..da55dfcca 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -34,8 +34,13 @@ OC.L10N.register(
     "Sidebar" : "Боковая панель",
     "Copy public link" : "Скопировать общедоступную ссылку",
     "Public link" : "Общедоступная ссылка",
+    "Name of the album" : "Название альбома",
+    "Location of the album" : "Расположение альбома",
+    "Go back to the previous view." : "Вернуться к предыдущему режиму просмотра.",
     "Back" : "Назад",
+    "Add collaborators" : "Добавить соавторов",
     "Save" : "Сохранить",
+    "Create album" : "Создать альбом",
     "Year" : "Год",
     "Month" : "Месяц",
     "Day" : "День",
diff --git a/l10n/ru.json b/l10n/ru.json
index 22c40c281..c9be45635 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -32,8 +32,13 @@
     "Sidebar" : "Боковая панель",
     "Copy public link" : "Скопировать общедоступную ссылку",
     "Public link" : "Общедоступная ссылка",
+    "Name of the album" : "Название альбома",
+    "Location of the album" : "Расположение альбома",
+    "Go back to the previous view." : "Вернуться к предыдущему режиму просмотра.",
     "Back" : "Назад",
+    "Add collaborators" : "Добавить соавторов",
     "Save" : "Сохранить",
+    "Create album" : "Создать альбом",
     "Year" : "Год",
     "Month" : "Месяц",
     "Day" : "День",