diff --git a/src/backend/middlewares/RenderingMWs.ts b/src/backend/middlewares/RenderingMWs.ts
index 44b280c4..6d5da82d 100644
--- a/src/backend/middlewares/RenderingMWs.ts
+++ b/src/backend/middlewares/RenderingMWs.ts
@@ -6,6 +6,7 @@ import {UserDTO, UserRoles} from '../../common/entities/UserDTO';
 import {NotificationManager} from '../model/NotifocationManager';
 import {Logger} from '../Logger';
 import {SharingDTO} from '../../common/entities/SharingDTO';
+import {Utils} from '../../common/Utils';
 
 export class RenderingMWs {
 
@@ -54,8 +55,12 @@ export class RenderingMWs {
       return next();
     }
 
-    req.resultPipe.forEach((s: SharingDTO) => delete s.password);
-    return RenderingMWs.renderMessage(res, req.resultPipe);
+    const shares: SharingDTO[] = Utils.clone(req.resultPipe);
+    shares.forEach(s => {
+      delete s.password;
+      delete s.creator.password;
+    });
+    return RenderingMWs.renderMessage(res, shares);
   }
 
   public static renderFile(req: Request, res: Response, next: NextFunction) {
diff --git a/src/backend/middlewares/SharingMWs.ts b/src/backend/middlewares/SharingMWs.ts
index 01c2ece4..9ef50858 100644
--- a/src/backend/middlewares/SharingMWs.ts
+++ b/src/backend/middlewares/SharingMWs.ts
@@ -125,7 +125,7 @@ export class SharingMWs {
       return next();
     }
     try {
-      req.resultPipe = await ObjectManagers.getInstance().SharingManager.find({});
+      req.resultPipe = await ObjectManagers.getInstance().SharingManager.listAll();
       return next();
     } catch (err) {
       return next(new ErrorDTO(ErrorCodes.GENERAL_ERROR, 'Error during listing shares', err));
diff --git a/src/backend/model/database/interfaces/ISharingManager.ts b/src/backend/model/database/interfaces/ISharingManager.ts
index b5e38ed1..85823bc6 100644
--- a/src/backend/model/database/interfaces/ISharingManager.ts
+++ b/src/backend/model/database/interfaces/ISharingManager.ts
@@ -7,7 +7,7 @@ export interface ISharingManager {
 
   updateSharing(sharing: SharingDTO, forceUpdate: boolean): Promise<SharingDTO>;
 
-  find(filter: any): Promise<SharingDTO[]>;
+  listAll(): Promise<SharingDTO[]>;
 
   deleteSharing(sharingKey: string): Promise<void>;
 }
diff --git a/src/backend/model/database/memory/SharingManager.ts b/src/backend/model/database/memory/SharingManager.ts
index 96d9bf6b..d0f1c6a1 100644
--- a/src/backend/model/database/memory/SharingManager.ts
+++ b/src/backend/model/database/memory/SharingManager.ts
@@ -7,7 +7,7 @@ export class SharingManager implements ISharingManager {
     throw new Error('not implemented');
   }
 
-  find(filter: any): Promise<SharingDTO[]> {
+  listAll(): Promise<SharingDTO[]> {
     throw new Error('not implemented');
   }
 
diff --git a/src/backend/model/database/sql/SharingManager.ts b/src/backend/model/database/sql/SharingManager.ts
index e4b7b031..fc9cb144 100644
--- a/src/backend/model/database/sql/SharingManager.ts
+++ b/src/backend/model/database/sql/SharingManager.ts
@@ -5,7 +5,6 @@ import {SharingEntity} from './enitites/SharingEntity';
 import {Config} from '../../../../common/config/private/Config';
 import {PasswordHelper} from '../../PasswordHelper';
 import {DeleteResult} from 'typeorm';
-import {UserEntity} from './enitites/UserEntity';
 
 export class SharingManager implements ISharingManager {
 
@@ -25,10 +24,12 @@ export class SharingManager implements ISharingManager {
     await connection.getRepository(SharingEntity).remove(sharing);
   }
 
-  async find(filter: any): Promise<SharingDTO[]> {
+  async listAll(): Promise<SharingDTO[]> {
     await SharingManager.removeExpiredLink();
     const connection = await SQLConnection.getConnection();
-    return await connection.getRepository(SharingEntity).find(filter);
+    return await connection.getRepository(SharingEntity)
+      .createQueryBuilder('share')
+      .leftJoinAndSelect('share.creator', 'creator').getMany();
   }
 
   async findOne(filter: any): Promise<SharingDTO> {
diff --git a/src/backend/routes/SharingRouter.ts b/src/backend/routes/SharingRouter.ts
index b8e49b61..79965ee8 100644
--- a/src/backend/routes/SharingRouter.ts
+++ b/src/backend/routes/SharingRouter.ts
@@ -13,6 +13,7 @@ export class SharingRouter {
     this.addCreateSharing(app);
     this.addUpdateSharing(app);
     this.addListSharing(app);
+    this.addDeleteSharing(app);
   }
 
   private static addShareLogin(app: express.Express) {
@@ -55,7 +56,7 @@ export class SharingRouter {
     app.delete(['/api/share/:sharingKey'],
       AuthenticationMWs.authenticate,
       AuthenticationMWs.authorise(UserRoles.Admin),
-      SharingMWs.updateSharing,
+      SharingMWs.deleteSharing,
       RenderingMWs.renderOK
     );
   }
diff --git a/src/frontend/app/ui/settings/share/share.settings.component.css b/src/frontend/app/ui/settings/share/share.settings.component.css
index a5800fa2..604cf37a 100644
--- a/src/frontend/app/ui/settings/share/share.settings.component.css
+++ b/src/frontend/app/ui/settings/share/share.settings.component.css
@@ -1,3 +1,7 @@
 .panel-info {
   text-align: center;
 }
+
+.share-settings-save-buttons .btn{
+  margin-bottom: 10px;
+}
diff --git a/src/frontend/app/ui/settings/share/share.settings.component.html b/src/frontend/app/ui/settings/share/share.settings.component.html
index 548462f1..4c334729 100644
--- a/src/frontend/app/ui/settings/share/share.settings.component.html
+++ b/src/frontend/app/ui/settings/share/share.settings.component.html
@@ -38,14 +38,53 @@
       <div class="panel-info" *ngIf="(!states.enabled.value && !_settingsService.isSupported())" i18n>
         Sharing is not supported with these settings
       </div>
-      <button class="btn btn-success float-right"
-              [disabled]="!settingsForm.form.valid || !changed || inProgress"
-              (click)="save()" i18n>Save
-      </button>
-      <button class="btn btn-secondary float-right"
-              [disabled]=" !changed || inProgress"
-              (click)="reset()" i18n>Reset
-      </button>
+
+      <div class="share-settings-save-buttons">
+        <button class="btn btn-success float-right"
+                [disabled]="!settingsForm.form.valid || !changed || inProgress"
+                (click)="save()" i18n>Save
+        </button>
+        <button class="btn btn-secondary float-right"
+                [disabled]=" !changed || inProgress"
+                (click)="reset()" i18n>Reset
+        </button>
+      </div>
+
+      <br>
+      <br>
+      <hr/>
+      <p class="title" i18n>Shared links:</p>
+
+      <ng-container *ngIf="shares && shares.length >0">
+        <table class="table table-hover">
+          <thead>
+          <tr>
+            <th i18n>Key</th>
+            <th i18n>Folder</th>
+            <th i18n>Creator</th>
+            <th i18n>Expires</th>
+            <th></th>
+          </tr>
+          </thead>
+          <tr *ngFor="let share of shares">
+            <td>{{share.sharingKey}}</td>
+            <td>{{share.path}}</td>
+            <td>{{share.creator.name}}</td>
+            <td>{{share.expires | date}}</td>
+            <td>
+              <button (click)="deleteSharing(share)" class="btn btn-danger float-right">
+                <span class="oi oi-trash" aria-hidden="true" aria-label="Delete"></span>
+              </button>
+            </td>
+          </tr>
+        </table>
+      </ng-container>
+
+      <ng-container *ngIf="!shares || shares.length  == 0">
+        <div class="panel-info" i18n>
+          No sharing was created.
+        </div>
+      </ng-container>
     </div>
   </div>
 
diff --git a/src/frontend/app/ui/settings/share/share.settings.component.ts b/src/frontend/app/ui/settings/share/share.settings.component.ts
index 73a521a3..f2f4e5bc 100644
--- a/src/frontend/app/ui/settings/share/share.settings.component.ts
+++ b/src/frontend/app/ui/settings/share/share.settings.component.ts
@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {SettingsComponent} from '../_abstract/abstract.settings.component';
 import {AuthenticationService} from '../../../model/network/authentication.service';
 import {NavigationService} from '../../../model/navigation.service';
@@ -6,6 +6,7 @@ import {NotificationService} from '../../../model/notification.service';
 import {ShareSettingsService} from './share.settings.service';
 import {I18n} from '@ngx-translate/i18n-polyfill';
 import {ClientConfig} from '../../../../../common/config/public/ClientConfig';
+import {SharingDTO} from '../../../../../common/entities/SharingDTO';
 
 @Component({
   selector: 'app-settings-share',
@@ -14,7 +15,10 @@ import {ClientConfig} from '../../../../../common/config/public/ClientConfig';
     '../_abstract/abstract.settings.component.css'],
   providers: [ShareSettingsService],
 })
-export class ShareSettingsComponent extends SettingsComponent<ClientConfig.SharingConfig> {
+export class ShareSettingsComponent extends SettingsComponent<ClientConfig.SharingConfig, ShareSettingsService> implements OnInit {
+
+
+  public shares: SharingDTO[] = [];
 
   constructor(_authService: AuthenticationService,
               _navigation: NavigationService,
@@ -25,6 +29,25 @@ export class ShareSettingsComponent extends SettingsComponent<ClientConfig.Shari
   }
 
 
+  ngOnInit() {
+    super.ngOnInit();
+    this.getSharingList();
+  }
+
+  async deleteSharing(sharing: SharingDTO) {
+    await this._settingsService.deleteSharing(sharing);
+    await this.getSharingList();
+  }
+
+  private async getSharingList() {
+    try {
+      this.shares = await this._settingsService.getSharingList();
+    } catch (err) {
+      this.shares = [];
+      throw err;
+    }
+  }
+
 }
 
 
diff --git a/src/frontend/app/ui/settings/share/share.settings.service.ts b/src/frontend/app/ui/settings/share/share.settings.service.ts
index 06e6f0bd..c4f5d6b1 100644
--- a/src/frontend/app/ui/settings/share/share.settings.service.ts
+++ b/src/frontend/app/ui/settings/share/share.settings.service.ts
@@ -4,6 +4,7 @@ import {SettingsService} from '../settings.service';
 import {AbstractSettingsService} from '../_abstract/abstract.settings.service';
 import {ClientConfig} from '../../../../../common/config/public/ClientConfig';
 import {ServerConfig} from '../../../../../common/config/private/PrivateConfig';
+import {SharingDTO} from '../../../../../common/entities/SharingDTO';
 
 @Injectable()
 export class ShareSettingsService extends AbstractSettingsService<ClientConfig.SharingConfig> {
@@ -23,4 +24,14 @@ export class ShareSettingsService extends AbstractSettingsService<ClientConfig.S
     return this._networkService.putJson('/settings/share', {settings: settings});
   }
 
+
+  public getSharingList(): Promise<SharingDTO[]> {
+    return this._networkService.getJson('/share/list');
+  }
+
+
+  public deleteSharing(sharing: SharingDTO): Promise<void> {
+    return this._networkService.deleteJson('/share/' + sharing.sharingKey);
+  }
+
 }
diff --git a/src/frontend/translate/messages.en.xlf b/src/frontend/translate/messages.en.xlf
index 070cda1d..11eb06bf 100644
--- a/src/frontend/translate/messages.en.xlf
+++ b/src/frontend/translate/messages.en.xlf
@@ -842,10 +842,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">53</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">43</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">40</context>
@@ -899,10 +895,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">57</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">47</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">44</context>
@@ -1376,6 +1368,84 @@
         </context-group>
         <target>Sharing is not supported with these settings</target>
       </trans-unit>
+      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
+        <source>Save
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+        <target>Save</target>
+      </trans-unit>
+      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
+        <source>Reset
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+        <target>Reset</target>
+      </trans-unit>
+      <trans-unit id="ec4a974407cc4ee8128ffc3ec50f6effd1b197ec" datatype="html">
+        <source>Shared links:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+        <target>Shared links:</target>
+      </trans-unit>
+      <trans-unit id="a6493c6ca346cd052da40423eda9c132de2b2002" datatype="html">
+        <source>Key</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">62</context>
+        </context-group>
+        <target>Key</target>
+      </trans-unit>
+      <trans-unit id="d8e057d4fa08fbdb6f98af2073eff5ae0b47f5e1" datatype="html">
+        <source>Folder</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+        <target>Folder</target>
+      </trans-unit>
+      <trans-unit id="a20424156b8816671f61879f0574a4f27d7b16b9" datatype="html">
+        <source>Creator</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+        <target>Creator</target>
+      </trans-unit>
+      <trans-unit id="010f9db84d98441fa1e899158f1e1536b02ed4fb" datatype="html">
+        <source>Expires</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+        <target>Expires</target>
+      </trans-unit>
+      <trans-unit id="872dd821d70fa57f36740b19aaed7a2228ff1388" datatype="html">
+        <source>
+          No sharing was created.
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+        <target>
+          No sharing was created.
+        </target>
+      </trans-unit>
       <trans-unit id="445a71ab2f91f21a6d54acf86fb9796b1ac20bbb" datatype="html">
         <source>
           This feature enables you to generate 'random photo' urls.
@@ -1796,24 +1866,6 @@
         </context-group>
         <target>Exclude File List</target>
       </trans-unit>
-      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
-        <source>Save
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
-        <target>Save</target>
-      </trans-unit>
-      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
-        <source>Reset
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">76</context>
-        </context-group>
-        <target>Reset</target>
-      </trans-unit>
       <trans-unit id="b0eaa3abce5af3b71c03fe678062333b7b950430" datatype="html">
         <source>If you add a new folder to your gallery, the site indexes it automatically.</source>
         <context-group purpose="location">
diff --git a/src/frontend/translate/messages.fr.xlf b/src/frontend/translate/messages.fr.xlf
index c9a85d9b..9c873197 100644
--- a/src/frontend/translate/messages.fr.xlf
+++ b/src/frontend/translate/messages.fr.xlf
@@ -842,10 +842,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">53</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">43</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">40</context>
@@ -899,10 +895,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">57</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">47</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">44</context>
@@ -1376,6 +1368,84 @@
         </context-group>
         <target>Le partage n'est pas supporté avec ces paramètres</target>
       </trans-unit>
+      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
+        <source>Save
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+        <target>Enregistrer</target>
+      </trans-unit>
+      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
+        <source>Reset
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+        <target>Réinitialiser</target>
+      </trans-unit>
+      <trans-unit id="ec4a974407cc4ee8128ffc3ec50f6effd1b197ec" datatype="html">
+        <source>Shared links:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+        <target>Shared links:</target>
+      </trans-unit>
+      <trans-unit id="a6493c6ca346cd052da40423eda9c132de2b2002" datatype="html">
+        <source>Key</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">62</context>
+        </context-group>
+        <target>Key</target>
+      </trans-unit>
+      <trans-unit id="d8e057d4fa08fbdb6f98af2073eff5ae0b47f5e1" datatype="html">
+        <source>Folder</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+        <target>Folder</target>
+      </trans-unit>
+      <trans-unit id="a20424156b8816671f61879f0574a4f27d7b16b9" datatype="html">
+        <source>Creator</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+        <target>Creator</target>
+      </trans-unit>
+      <trans-unit id="010f9db84d98441fa1e899158f1e1536b02ed4fb" datatype="html">
+        <source>Expires</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+        <target>Expires</target>
+      </trans-unit>
+      <trans-unit id="872dd821d70fa57f36740b19aaed7a2228ff1388" datatype="html">
+        <source>
+          No sharing was created.
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+        <target>
+          No sharing was created.
+        </target>
+      </trans-unit>
       <trans-unit id="445a71ab2f91f21a6d54acf86fb9796b1ac20bbb" datatype="html">
         <source>
           This feature enables you to generate 'random photo' urls.
@@ -1796,24 +1866,6 @@
         </context-group>
         <target>Exclude File List</target>
       </trans-unit>
-      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
-        <source>Save
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
-        <target>Enregistrer</target>
-      </trans-unit>
-      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
-        <source>Reset
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">76</context>
-        </context-group>
-        <target>Réinitialiser</target>
-      </trans-unit>
       <trans-unit id="b0eaa3abce5af3b71c03fe678062333b7b950430" datatype="html">
         <source>If you add a new folder to your gallery, the site indexes it automatically.</source>
         <context-group purpose="location">
diff --git a/src/frontend/translate/messages.hu.xlf b/src/frontend/translate/messages.hu.xlf
index 4a00b32f..4d943c1f 100644
--- a/src/frontend/translate/messages.hu.xlf
+++ b/src/frontend/translate/messages.hu.xlf
@@ -842,10 +842,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">53</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">43</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">40</context>
@@ -899,10 +895,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">57</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">47</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">44</context>
@@ -1376,6 +1368,84 @@
         </context-group>
         <target>A megosztás nem támogatott ezekkel a beállításokkal</target>
       </trans-unit>
+      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
+        <source>Save
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+        <target>Mentés</target>
+      </trans-unit>
+      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
+        <source>Reset
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+        <target>Visszaállítás</target>
+      </trans-unit>
+      <trans-unit id="ec4a974407cc4ee8128ffc3ec50f6effd1b197ec" datatype="html">
+        <source>Shared links:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+        <target>Megosztások:</target>
+      </trans-unit>
+      <trans-unit id="a6493c6ca346cd052da40423eda9c132de2b2002" datatype="html">
+        <source>Key</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">62</context>
+        </context-group>
+        <target>Kulcs</target>
+      </trans-unit>
+      <trans-unit id="d8e057d4fa08fbdb6f98af2073eff5ae0b47f5e1" datatype="html">
+        <source>Folder</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+        <target>Mappa</target>
+      </trans-unit>
+      <trans-unit id="a20424156b8816671f61879f0574a4f27d7b16b9" datatype="html">
+        <source>Creator</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+        <target>Létre hozta</target>
+      </trans-unit>
+      <trans-unit id="010f9db84d98441fa1e899158f1e1536b02ed4fb" datatype="html">
+        <source>Expires</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+        <target>Lejár</target>
+      </trans-unit>
+      <trans-unit id="872dd821d70fa57f36740b19aaed7a2228ff1388" datatype="html">
+        <source>
+          No sharing was created.
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+        <target>
+          Még nem hoztak létre megosztást.
+        </target>
+      </trans-unit>
       <trans-unit id="445a71ab2f91f21a6d54acf86fb9796b1ac20bbb" datatype="html">
         <source>
           This feature enables you to generate 'random photo' urls.
@@ -1796,24 +1866,6 @@
         </context-group>
         <target>Mappa kihagyó fájlok</target>
       </trans-unit>
-      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
-        <source>Save
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
-        <target>Mentés</target>
-      </trans-unit>
-      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
-        <source>Reset
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">76</context>
-        </context-group>
-        <target>Visszaállítás</target>
-      </trans-unit>
       <trans-unit id="b0eaa3abce5af3b71c03fe678062333b7b950430" datatype="html">
         <source>If you add a new folder to your gallery, the site indexes it automatically.</source>
         <context-group purpose="location">
@@ -2776,4 +2828,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/frontend/translate/messages.ro.xlf b/src/frontend/translate/messages.ro.xlf
index 9540a73f..a23517d7 100644
--- a/src/frontend/translate/messages.ro.xlf
+++ b/src/frontend/translate/messages.ro.xlf
@@ -842,10 +842,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">53</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">43</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">40</context>
@@ -899,10 +895,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">57</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">47</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">44</context>
@@ -1376,6 +1368,84 @@
         </context-group>
         <target>Partajarea nu este suportată cu aceste setări</target>
       </trans-unit>
+      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
+        <source>Save
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+        <target>Salvare</target>
+      </trans-unit>
+      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
+        <source>Reset
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+        <target>Restabilire</target>
+      </trans-unit>
+      <trans-unit id="ec4a974407cc4ee8128ffc3ec50f6effd1b197ec" datatype="html">
+        <source>Shared links:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+        <target>Shared links:</target>
+      </trans-unit>
+      <trans-unit id="a6493c6ca346cd052da40423eda9c132de2b2002" datatype="html">
+        <source>Key</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">62</context>
+        </context-group>
+        <target>Key</target>
+      </trans-unit>
+      <trans-unit id="d8e057d4fa08fbdb6f98af2073eff5ae0b47f5e1" datatype="html">
+        <source>Folder</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+        <target>Folder</target>
+      </trans-unit>
+      <trans-unit id="a20424156b8816671f61879f0574a4f27d7b16b9" datatype="html">
+        <source>Creator</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+        <target>Creator</target>
+      </trans-unit>
+      <trans-unit id="010f9db84d98441fa1e899158f1e1536b02ed4fb" datatype="html">
+        <source>Expires</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+        <target>Expires</target>
+      </trans-unit>
+      <trans-unit id="872dd821d70fa57f36740b19aaed7a2228ff1388" datatype="html">
+        <source>
+          No sharing was created.
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+        <target>
+          No sharing was created.
+        </target>
+      </trans-unit>
       <trans-unit id="445a71ab2f91f21a6d54acf86fb9796b1ac20bbb" datatype="html">
         <source>
           This feature enables you to generate 'random photo' urls.
@@ -1796,24 +1866,6 @@
         </context-group>
         <target>Exclude File List</target>
       </trans-unit>
-      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
-        <source>Save
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
-        <target>Salvare</target>
-      </trans-unit>
-      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
-        <source>Reset
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">76</context>
-        </context-group>
-        <target>Restabilire</target>
-      </trans-unit>
       <trans-unit id="b0eaa3abce5af3b71c03fe678062333b7b950430" datatype="html">
         <source>If you add a new folder to your gallery, the site indexes it automatically.</source>
         <context-group purpose="location">
diff --git a/src/frontend/translate/messages.ru.xlf b/src/frontend/translate/messages.ru.xlf
index a4bc28ac..f0ed8972 100644
--- a/src/frontend/translate/messages.ru.xlf
+++ b/src/frontend/translate/messages.ru.xlf
@@ -842,10 +842,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">53</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">43</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">40</context>
@@ -899,10 +895,6 @@
           <context context-type="sourcefile">app/ui/settings/search/search.settings.component.html</context>
           <context context-type="linenumber">57</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
-          <context context-type="linenumber">47</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ui/settings/random-photo/random-photo.settings.component.html</context>
           <context context-type="linenumber">44</context>
@@ -1376,6 +1368,84 @@
         </context-group>
         <target>Совместное использование не поддерживается с указанными настройками</target>
       </trans-unit>
+      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
+        <source>Save
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+        <target>Сохранить</target>
+      </trans-unit>
+      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
+        <source>Reset
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+        <target>Сбросить</target>
+      </trans-unit>
+      <trans-unit id="ec4a974407cc4ee8128ffc3ec50f6effd1b197ec" datatype="html">
+        <source>Shared links:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+        <target>Shared links:</target>
+      </trans-unit>
+      <trans-unit id="a6493c6ca346cd052da40423eda9c132de2b2002" datatype="html">
+        <source>Key</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">62</context>
+        </context-group>
+        <target>Key</target>
+      </trans-unit>
+      <trans-unit id="d8e057d4fa08fbdb6f98af2073eff5ae0b47f5e1" datatype="html">
+        <source>Folder</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+        <target>Folder</target>
+      </trans-unit>
+      <trans-unit id="a20424156b8816671f61879f0574a4f27d7b16b9" datatype="html">
+        <source>Creator</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">64</context>
+        </context-group>
+        <target>Creator</target>
+      </trans-unit>
+      <trans-unit id="010f9db84d98441fa1e899158f1e1536b02ed4fb" datatype="html">
+        <source>Expires</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+        <target>Expires</target>
+      </trans-unit>
+      <trans-unit id="872dd821d70fa57f36740b19aaed7a2228ff1388" datatype="html">
+        <source>
+          No sharing was created.
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/ui/settings/share/share.settings.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
+        <target>
+          No sharing was created.
+        </target>
+      </trans-unit>
       <trans-unit id="445a71ab2f91f21a6d54acf86fb9796b1ac20bbb" datatype="html">
         <source>
           This feature enables you to generate 'random photo' urls.
@@ -1796,24 +1866,6 @@
         </context-group>
         <target>Exclude File List</target>
       </trans-unit>
-      <trans-unit id="b8f78167ef95c21d032b15614e8239cc033a0fd2" datatype="html">
-        <source>Save
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
-        <target>Сохранить</target>
-      </trans-unit>
-      <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
-        <source>Reset
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/ui/settings/indexing/indexing.settings.component.html</context>
-          <context context-type="linenumber">76</context>
-        </context-group>
-        <target>Сбросить</target>
-      </trans-unit>
       <trans-unit id="b0eaa3abce5af3b71c03fe678062333b7b950430" datatype="html">
         <source>If you add a new folder to your gallery, the site indexes it automatically.</source>
         <context-group purpose="location">