Merge branch 'stable24' of https://github.com/pulsejet/memories into stable24

l10n/cs.js

@@ -52,6 +52,7 @@ OC.L10N.register(
     "Unarchive" : "Zrušit archivování",
     "View in folder" : "Zobrazit ve složce",
     "Remove from person" : "Odebrat z osoby",
+    "Your Timeline" : "Vaše časová osa",
     "Failed to load some photos" : "Některé fotky se nepodařilo načíst",
     "You are about to download a large number of files. Are you sure?" : "Chystáte se stahovat si velký počet souborů. Opravdu to chcete?",
     "You are about to delete a large number of files. Are you sure?" : "Chystáte se smazat velké množství souborů. Opravdu to chcete?",

l10n/cs.json

@@ -50,6 +50,7 @@
     "Unarchive" : "Zrušit archivování",
     "View in folder" : "Zobrazit ve složce",
     "Remove from person" : "Odebrat z osoby",
+    "Your Timeline" : "Vaše časová osa",
     "Failed to load some photos" : "Některé fotky se nepodařilo načíst",
     "You are about to download a large number of files. Are you sure?" : "Chystáte se stahovat si velký počet souborů. Opravdu to chcete?",
     "You are about to delete a large number of files. Are you sure?" : "Chystáte se smazat velké množství souborů. Opravdu to chcete?",

l10n/de.js

@@ -11,20 +11,32 @@ OC.L10N.register(
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Settings" : "Einstellungen",
+    "Edit Date/Time" : "Datum/Uhrzeit bearbeiten",
+    "Update Exif" : "Exif aktualisieren",
+    "Newest" : "Neueste",
     "Year" : "Jahr",
     "Month" : "Monat",
     "Day" : "Tag",
     "Time" : "Zeit",
     "Hour" : "Stunde",
     "Minute" : "Minute",
+    "Oldest" : "Älteste",
+    "Processing … {n}/{m}" : "Verarbeite … {n}/{m}",
     "This feature modifies files in your storage to update Exif data." : "Diese Funktion ändert Dateien in deinem Speicher, um Exif-Daten zu aktualisieren.",
     "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}" : "Möchtest du {name} wirklich entfernen?",
     "Delete" : "Löschen",
+    "Failed to delete {name}." : "{name} konnte nicht gelöscht werden.",
     "Rename person" : "Person umbenennen",
     "Name" : "Name",
     "Update" : "Aktualisieren",
+    "Failed to rename {oldName} to {name}." : "{oldName} konnte nicht in {name} umbenannt werden.",
+    "Merge {name} with person" : "{name} mit Person zusammenführen",
     "Cancel" : "Abbrechen",
+    "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",
     "Back" : "Zurück",
     "Merge with different person" : "Mit einer anderen Person zusammenführen",
     "Cannot find this photo anymore!" : "Kann dieses Foto nicht mehr finden!",

l10n/de.json

@@ -9,20 +9,32 @@
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Settings" : "Einstellungen",
+    "Edit Date/Time" : "Datum/Uhrzeit bearbeiten",
+    "Update Exif" : "Exif aktualisieren",
+    "Newest" : "Neueste",
     "Year" : "Jahr",
     "Month" : "Monat",
     "Day" : "Tag",
     "Time" : "Zeit",
     "Hour" : "Stunde",
     "Minute" : "Minute",
+    "Oldest" : "Älteste",
+    "Processing … {n}/{m}" : "Verarbeite … {n}/{m}",
     "This feature modifies files in your storage to update Exif data." : "Diese Funktion ändert Dateien in deinem Speicher, um Exif-Daten zu aktualisieren.",
     "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}" : "Möchtest du {name} wirklich entfernen?",
     "Delete" : "Löschen",
+    "Failed to delete {name}." : "{name} konnte nicht gelöscht werden.",
     "Rename person" : "Person umbenennen",
     "Name" : "Name",
     "Update" : "Aktualisieren",
+    "Failed to rename {oldName} to {name}." : "{oldName} konnte nicht in {name} umbenannt werden.",
+    "Merge {name} with person" : "{name} mit Person zusammenführen",
     "Cancel" : "Abbrechen",
+    "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",
     "Back" : "Zurück",
     "Merge with different person" : "Mit einer anderen Person zusammenführen",
     "Cannot find this photo anymore!" : "Kann dieses Foto nicht mehr finden!",

l10n/de_DE.js

@@ -52,6 +52,7 @@ OC.L10N.register(
     "Unarchive" : "Dearchivieren",
     "View in folder" : "In Ordner anzeigen",
     "Remove from person" : "Von der Person entfernen",
+    "Your Timeline" : "Ihre Zeitleiste",
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
     "You are about to download a large number of files. Are you sure?" : "Sie sind dabei, eine große Anzahl an Dateien herunterzuladen. Sind Sie sich sicher?",
     "You are about to delete a large number of files. Are you sure?" : "Sie sind dabei, eine große Anzahl an Dateien zu löschen. Sind Sie sich sicher?",

l10n/de_DE.json

@@ -50,6 +50,7 @@
     "Unarchive" : "Dearchivieren",
     "View in folder" : "In Ordner anzeigen",
     "Remove from person" : "Von der Person entfernen",
+    "Your Timeline" : "Ihre Zeitleiste",
     "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
     "You are about to download a large number of files. Are you sure?" : "Sie sind dabei, eine große Anzahl an Dateien herunterzuladen. Sind Sie sich sicher?",
     "You are about to delete a large number of files. Are you sure?" : "Sie sind dabei, eine große Anzahl an Dateien zu löschen. Sind Sie sich sicher?",

l10n/es.js

@@ -16,14 +16,18 @@ OC.L10N.register(
     "Time" : "Fecha",
     "Hour" : "Hora",
     "Minute" : "Minuto",
+    "Remove person" : "Eliminar persona",
     "Delete" : "Eliminar",
+    "Rename person" : "Renombrar persona",
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Cancel" : "Cancelar",
     "Back" : "Atrás",
+    "Merge with different person" : "Unir con una persona diferente",
     "Download" : "Descargar",
     "Favorite" : "Marcar como favorito",
     "Unarchive" : "Desarchivar",
-    "View in folder" : "Ver en carpeta"
+    "View in folder" : "Ver en carpeta",
+    "Failed to delete {fileName}." : "Fallo al borrar {fileName}."
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");

l10n/es.json

@@ -14,14 +14,18 @@
     "Time" : "Fecha",
     "Hour" : "Hora",
     "Minute" : "Minuto",
+    "Remove person" : "Eliminar persona",
     "Delete" : "Eliminar",
+    "Rename person" : "Renombrar persona",
     "Name" : "Nombre",
     "Update" : "Actualizar",
     "Cancel" : "Cancelar",
     "Back" : "Atrás",
+    "Merge with different person" : "Unir con una persona diferente",
     "Download" : "Descargar",
     "Favorite" : "Marcar como favorito",
     "Unarchive" : "Desarchivar",
-    "View in folder" : "Ver en carpeta"
+    "View in folder" : "Ver en carpeta",
+    "Failed to delete {fileName}." : "Fallo al borrar {fileName}."
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }

l10n/lt_LT.js

@@ -1,6 +1,7 @@
 OC.L10N.register(
     "memories",
     {
+    "Yet another photo management app" : "Dar viena nuotraukų tvarkymo programėlė",
     "Timeline" : "Laiko juosta",
     "Folders" : "Aplankai",
     "Favorites" : "Mėgstami",
@@ -11,6 +12,7 @@ OC.L10N.register(
     "Tags" : "Žymės",
     "Settings" : "Nustatymai",
     "Edit Date/Time" : "Taisyti datą/laiką",
+    "Update Exif" : "Atnaujinti EXIF",
     "Year" : "Metai",
     "Month" : "Mėnuo",
     "Day" : "Diena",
@@ -25,6 +27,7 @@ OC.L10N.register(
     "Name" : "Pavadinimas",
     "Update" : "Atnaujinti",
     "Cancel" : "Atsisakyti",
+    "Too many failures, aborting" : "Per daug nesėkmių, nutraukiama",
     "Back" : "Atgal",
     "Merge with different person" : "Sulieti su kitu žmogumi",
     "Cannot find this photo anymore!" : "Daugiau nebepavyksta rasti šios nuotraukos!",
@@ -34,6 +37,7 @@ OC.L10N.register(
     "Favorite" : "Mėgstamas",
     "Unarchive" : "Išskleisti",
     "View in folder" : "Rodyti aplanke",
+    "Your Timeline" : "Jūsų laiko juostą",
     "Failed to load some photos" : "Nepavyko įkelti kai kurių nuotraukų",
     "You are about to download a large number of files. Are you sure?" : "Jūs ketinate atsisiųsti didelį failų skaičių. Ar esate tikri?",
     "You are about to delete a large number of files. Are you sure?" : "Jūs ketinate ištrinti didelį failų skaičių. Ar esate tikri?",

l10n/lt_LT.json

@@ -1,4 +1,5 @@
 { "translations": {
+    "Yet another photo management app" : "Dar viena nuotraukų tvarkymo programėlė",
     "Timeline" : "Laiko juosta",
     "Folders" : "Aplankai",
     "Favorites" : "Mėgstami",
@@ -9,6 +10,7 @@
     "Tags" : "Žymės",
     "Settings" : "Nustatymai",
     "Edit Date/Time" : "Taisyti datą/laiką",
+    "Update Exif" : "Atnaujinti EXIF",
     "Year" : "Metai",
     "Month" : "Mėnuo",
     "Day" : "Diena",
@@ -23,6 +25,7 @@
     "Name" : "Pavadinimas",
     "Update" : "Atnaujinti",
     "Cancel" : "Atsisakyti",
+    "Too many failures, aborting" : "Per daug nesėkmių, nutraukiama",
     "Back" : "Atgal",
     "Merge with different person" : "Sulieti su kitu žmogumi",
     "Cannot find this photo anymore!" : "Daugiau nebepavyksta rasti šios nuotraukos!",
@@ -32,6 +35,7 @@
     "Favorite" : "Mėgstamas",
     "Unarchive" : "Išskleisti",
     "View in folder" : "Rodyti aplanke",
+    "Your Timeline" : "Jūsų laiko juostą",
     "Failed to load some photos" : "Nepavyko įkelti kai kurių nuotraukų",
     "You are about to download a large number of files. Are you sure?" : "Jūs ketinate atsisiųsti didelį failų skaičių. Ar esate tikri?",
     "You are about to delete a large number of files. Are you sure?" : "Jūs ketinate ištrinti didelį failų skaičių. Ar esate tikri?",

l10n/sk.js

@@ -28,11 +28,19 @@ OC.L10N.register(
     "Exercise caution and make sure you have backups." : "Buďte opatrní a uistite sa, že máte zálohy.",
     "Loading data … {n}/{m}" : "Nahrávanie údajov ... {n}/{m}",
     "Remove person" : "Odstrániť osobu",
+    "Are you sure you want to remove {name}" : "Naozaj chcete odstrániť {name}",
     "Delete" : "Vymazať",
+    "Failed to delete {name}." : "Nepodarilo sa zmazať {name}.",
     "Rename person" : "Premenovať osobu",
     "Name" : "Meno",
     "Update" : "Aktualizovať",
+    "Failed to rename {oldName} to {name}." : "Nepodarilo sa premenovať {oldName} na {name}.",
+    "Merge {name} with person" : "Zlúčiť {name} s osobou",
     "Cancel" : "Zrušiť",
+    "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",
+    "Error while moving {basename}" : "Chyba pri presúvaní {basename}",
+    "Failed to move {name}." : "Nepodarilo sa presunúť {name}.",
     "Back" : "Späť",
     "Merge with different person" : "Spojiť s inou osobou",
     "Cannot find this photo anymore!" : "Túto fotografiu už nemožno nájsť!",
@@ -43,6 +51,8 @@ OC.L10N.register(
     "Favorite" : "Obľúbené",
     "Unarchive" : "Vybrať z archívu",
     "View in folder" : "Zobraziť v priečinku",
+    "Remove from person" : "Odobrať z osoby",
+    "Your Timeline" : "Vaša časová os",
     "Failed to load some photos" : "Načítanie akýchkoľvek fotiek zlyhalo",
     "You are about to download a large number of files. Are you sure?" : "Chystáte sa stiahnuť veľké množstvo súborov. Si si istý?",
     "You are about to delete a large number of files. Are you sure?" : "Chystáte sa odstrániť veľké množstvo súborov. Si si istý?",

l10n/sk.json

@@ -26,11 +26,19 @@
     "Exercise caution and make sure you have backups." : "Buďte opatrní a uistite sa, že máte zálohy.",
     "Loading data … {n}/{m}" : "Nahrávanie údajov ... {n}/{m}",
     "Remove person" : "Odstrániť osobu",
+    "Are you sure you want to remove {name}" : "Naozaj chcete odstrániť {name}",
     "Delete" : "Vymazať",
+    "Failed to delete {name}." : "Nepodarilo sa zmazať {name}.",
     "Rename person" : "Premenovať osobu",
     "Name" : "Meno",
     "Update" : "Aktualizovať",
+    "Failed to rename {oldName} to {name}." : "Nepodarilo sa premenovať {oldName} na {name}.",
+    "Merge {name} with person" : "Zlúčiť {name} s osobou",
     "Cancel" : "Zrušiť",
+    "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",
+    "Error while moving {basename}" : "Chyba pri presúvaní {basename}",
+    "Failed to move {name}." : "Nepodarilo sa presunúť {name}.",
     "Back" : "Späť",
     "Merge with different person" : "Spojiť s inou osobou",
     "Cannot find this photo anymore!" : "Túto fotografiu už nemožno nájsť!",
@@ -41,6 +49,8 @@
     "Favorite" : "Obľúbené",
     "Unarchive" : "Vybrať z archívu",
     "View in folder" : "Zobraziť v priečinku",
+    "Remove from person" : "Odobrať z osoby",
+    "Your Timeline" : "Vaša časová os",
     "Failed to load some photos" : "Načítanie akýchkoľvek fotiek zlyhalo",
     "You are about to download a large number of files. Are you sure?" : "Chystáte sa stiahnuť veľké množstvo súborov. Si si istý?",
     "You are about to delete a large number of files. Are you sure?" : "Chystáte sa odstrániť veľké množstvo súborov. Si si istý?",

l10n/uk.js

@@ -5,7 +5,7 @@ OC.L10N.register(
     "Yet another photo management app" : "Іще один застосунок для роботи зі світлинами",
     "Timeline" : "Дії",
     "Folders" : "Каталоги",
-    "Favorites" : "Вподобані",
+    "Favorites" : "Із зірочкою",
     "Videos" : "Відео",
     "People" : "Люди",
     "Archive" : "Архів",

l10n/uk.json

@@ -3,7 +3,7 @@
     "Yet another photo management app" : "Іще один застосунок для роботи зі світлинами",
     "Timeline" : "Дії",
     "Folders" : "Каталоги",
-    "Favorites" : "Вподобані",
+    "Favorites" : "Із зірочкою",
     "Videos" : "Відео",
     "People" : "Люди",
     "Archive" : "Архів",

l10n/zh_HK.js

@@ -52,6 +52,7 @@ OC.L10N.register(
     "Unarchive" : "取消封存",
     "View in folder" : "在資料夾中檢視",
     "Remove from person" : "從人中刪除",
+    "Your Timeline" : "您的時間線",
     "Failed to load some photos" : "未能加載一些照片",
     "You are about to download a large number of files. Are you sure?" : "您即將下載大量檔案。你確定嗎？",
     "You are about to delete a large number of files. Are you sure?" : "您即將刪除大量檔案。你確定嗎？",

l10n/zh_HK.json

@@ -50,6 +50,7 @@
     "Unarchive" : "取消封存",
     "View in folder" : "在資料夾中檢視",
     "Remove from person" : "從人中刪除",
+    "Your Timeline" : "您的時間線",
     "Failed to load some photos" : "未能加載一些照片",
     "You are about to download a large number of files. Are you sure?" : "您即將下載大量檔案。你確定嗎？",
     "You are about to delete a large number of files. Are you sure?" : "您即將刪除大量檔案。你確定嗎？",

l10n/zh_TW.js

@@ -52,6 +52,7 @@ OC.L10N.register(
     "Unarchive" : "取消封存",
     "View in folder" : "在資料夾中檢視",
     "Remove from person" : "從人中移除",
+    "Your Timeline" : "您的時間軸",
     "Failed to load some photos" : "載入部份照片時失敗",
     "You are about to download a large number of files. Are you sure?" : "您將要下載大量檔案。您確定嗎？",
     "You are about to delete a large number of files. Are you sure?" : "您將要刪除大量檔案。您確定嗎？",

l10n/zh_TW.json

@@ -50,6 +50,7 @@
     "Unarchive" : "取消封存",
     "View in folder" : "在資料夾中檢視",
     "Remove from person" : "從人中移除",
+    "Your Timeline" : "您的時間軸",
     "Failed to load some photos" : "載入部份照片時失敗",
     "You are about to download a large number of files. Are you sure?" : "您將要下載大量檔案。您確定嗎？",
     "You are about to delete a large number of files. Are you sure?" : "您將要刪除大量檔案。您確定嗎？",