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

l10n/bg.js

@@ -13,7 +13,25 @@ OC.L10N.register(
     "On this day" : "На този ден",
     "Tags" : "Етикети",
     "Settings" : "Настройки",
+    "Cancel" : "Отказ",
+    "Delete" : "Изтриване",
+    "Download" : "Изтегляне",
+    "Favorite" : "Любими",
+    "Unarchive" : "Разархивиране",
     "Edit Date/Time" : "Редактиране на Дата/Час",
+    "View in folder" : "Преглед в папката",
+    "Remove from person" : "Премахване от лице",
+    "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?" : "Предстои ви да изтриете голям брой файлове. Сигурни ли сте?",
+    "You are about to touch a large number of files. Are you sure?" : "Вие сте на път да засегнете голям брой файлове. Сигурни ли сте?",
+    "_{n} selected_::_{n} selected_" : ["{n} избрани","{n} избрани"],
+    "Timeline Path" : "Път на времева линия/хронология/",
+    "Show hidden folders" : "Показване на скрити папки",
+    "Update" : "Обновяване",
+    "Error updating settings" : "Грешка при актуализиране на настройки",
+    "Your Timeline" : "Вашата времева линия",
+    "Failed to load some photos" : "Неуспешно зареждане на някои снимки",
+    "Cannot find this photo anymore!" : "Вече не мога да открия тази снимка!",
     "Update Exif" : "Актуализиране на Exif",
     "Newest" : "Най-новият",
     "Year" : "Година",
@@ -28,26 +46,18 @@ OC.L10N.register(
     "Exercise caution and make sure you have backups." : "Внимавайте и се уверете, че имате резервни копия.",
     "Loading data … {n}/{m}" : "Зареждане на данни ... {n}/{m}",
     "Remove person" : "Премахване на лице",
-    "Delete" : "Изтриване",
+    "Are you sure you want to remove {name}" : "Сигурни ли сте, че искате премахване на {name}",
+    "Failed to delete {name}." : "Неуспешно изтриване на {name}.",
     "Rename person" : "Преименуване на лице",
     "Name" : "Име",
-    "Update" : "Обновяване",
+    "Failed to rename {oldName} to {name}." : "Неуспешно преименуване от {oldName} на {name}.",
-    "Cancel" : "Отказ",
+    "Merge {name} with person" : "Обединяване на {name} с лице",
+    "Are you sure you want to merge {name} with {newName}?" : "Сигурни ли сте, че искате да обедините {name} с {newName}?",
+    "Too many failures, aborting" : "Твърде много грешки от общ характер, прекъсване",
+    "Error while moving {basename}" : "Грешка при преместване на {basename}",
+    "Failed to move {name}." : "Неуспешно преместване на {name}.",
     "Back" : "Назад",
     "Merge with different person" : "Обединяване с различно лице",
-    "Cannot find this photo anymore!" : "Вече не мога да открия тази снимка!",
-    "Timeline Path" : "Път на времева линия/хронология/",
-    "Show hidden folders" : "Показване на скрити папки",
-    "Error updating settings" : "Грешка при актуализиране на настройки",
-    "Download" : "Изтегляне",
-    "Favorite" : "Любими",
-    "Unarchive" : "Разархивиране",
-    "View in folder" : "Преглед в папката",
-    "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?" : "Предстои ви да изтриете голям брой файлове. Сигурни ли сте?",
-    "You are about to touch a large number of files. Are you sure?" : "Вие сте на път да засегнете голям брой файлове. Сигурни ли сте?",
-    "_{n} selected_::_{n} selected_" : ["{n} избрани","{n} избрани"],
     "Failed to delete files." : "Неуспешно изтриване на файлове.",
     "Failed to delete {fileName}." : "Неуспешно изтриване на {fileName}.",
     "General Failure" : "Грешка от общ характер",

l10n/bg.json

@@ -11,7 +11,25 @@
     "On this day" : "На този ден",
     "Tags" : "Етикети",
     "Settings" : "Настройки",
+    "Cancel" : "Отказ",
+    "Delete" : "Изтриване",
+    "Download" : "Изтегляне",
+    "Favorite" : "Любими",
+    "Unarchive" : "Разархивиране",
     "Edit Date/Time" : "Редактиране на Дата/Час",
+    "View in folder" : "Преглед в папката",
+    "Remove from person" : "Премахване от лице",
+    "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?" : "Предстои ви да изтриете голям брой файлове. Сигурни ли сте?",
+    "You are about to touch a large number of files. Are you sure?" : "Вие сте на път да засегнете голям брой файлове. Сигурни ли сте?",
+    "_{n} selected_::_{n} selected_" : ["{n} избрани","{n} избрани"],
+    "Timeline Path" : "Път на времева линия/хронология/",
+    "Show hidden folders" : "Показване на скрити папки",
+    "Update" : "Обновяване",
+    "Error updating settings" : "Грешка при актуализиране на настройки",
+    "Your Timeline" : "Вашата времева линия",
+    "Failed to load some photos" : "Неуспешно зареждане на някои снимки",
+    "Cannot find this photo anymore!" : "Вече не мога да открия тази снимка!",
     "Update Exif" : "Актуализиране на Exif",
     "Newest" : "Най-новият",
     "Year" : "Година",
@@ -26,26 +44,18 @@
     "Exercise caution and make sure you have backups." : "Внимавайте и се уверете, че имате резервни копия.",
     "Loading data … {n}/{m}" : "Зареждане на данни ... {n}/{m}",
     "Remove person" : "Премахване на лице",
-    "Delete" : "Изтриване",
+    "Are you sure you want to remove {name}" : "Сигурни ли сте, че искате премахване на {name}",
+    "Failed to delete {name}." : "Неуспешно изтриване на {name}.",
     "Rename person" : "Преименуване на лице",
     "Name" : "Име",
-    "Update" : "Обновяване",
+    "Failed to rename {oldName} to {name}." : "Неуспешно преименуване от {oldName} на {name}.",
-    "Cancel" : "Отказ",
+    "Merge {name} with person" : "Обединяване на {name} с лице",
+    "Are you sure you want to merge {name} with {newName}?" : "Сигурни ли сте, че искате да обедините {name} с {newName}?",
+    "Too many failures, aborting" : "Твърде много грешки от общ характер, прекъсване",
+    "Error while moving {basename}" : "Грешка при преместване на {basename}",
+    "Failed to move {name}." : "Неуспешно преместване на {name}.",
     "Back" : "Назад",
     "Merge with different person" : "Обединяване с различно лице",
-    "Cannot find this photo anymore!" : "Вече не мога да открия тази снимка!",
-    "Timeline Path" : "Път на времева линия/хронология/",
-    "Show hidden folders" : "Показване на скрити папки",
-    "Error updating settings" : "Грешка при актуализиране на настройки",
-    "Download" : "Изтегляне",
-    "Favorite" : "Любими",
-    "Unarchive" : "Разархивиране",
-    "View in folder" : "Преглед в папката",
-    "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?" : "Предстои ви да изтриете голям брой файлове. Сигурни ли сте?",
-    "You are about to touch a large number of files. Are you sure?" : "Вие сте на път да засегнете голям брой файлове. Сигурни ли сте?",
-    "_{n} selected_::_{n} selected_" : ["{n} избрани","{n} избрани"],
     "Failed to delete files." : "Неуспешно изтриване на файлове.",
     "Failed to delete {fileName}." : "Неуспешно изтриване на {fileName}.",
     "General Failure" : "Грешка от общ характер",

l10n/de.js

@@ -11,7 +11,25 @@ OC.L10N.register(
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Settings" : "Einstellungen",
+    "Cancel" : "Abbrechen",
+    "Delete" : "Löschen",
+    "Download" : "Herunterladen",
+    "Favorite" : "Favorit",
+    "Unarchive" : "Dearchivieren",
     "Edit Date/Time" : "Datum/Uhrzeit bearbeiten",
+    "View in folder" : "In Ordner anzeigen",
+    "Remove from person" : "Von der Person entfernen",
+    "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?",
+    "_{n} selected_::_{n} selected_" : ["{n} ausgewählt","{n} ausgewählt"],
+    "Timeline Path" : "Pfad der Zeitlachse",
+    "Show hidden folders" : "Zeige versteckte Ordner",
+    "Update" : "Aktualisieren",
+    "Error updating settings" : "Fehler bei der Aktualisierung der Einstellungen",
+    "Your Timeline" : "Deine Zeitleiste",
+    "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
+    "Cannot find this photo anymore!" : "Kann dieses Foto nicht mehr finden!",
     "Update Exif" : "Exif aktualisieren",
     "Newest" : "Neueste",
     "Year" : "Jahr",
@@ -27,32 +45,21 @@ OC.L10N.register(
     "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",
+    "Error while moving {basename}" : "Fehler beim Verschieben von {basename}",
+    "Failed to move {name}." : "{name} konnte nicht verschoben werden.",
     "Back" : "Zurück",
     "Merge with different person" : "Mit einer anderen Person zusammenführen",
-    "Cannot find this photo anymore!" : "Kann dieses Foto nicht mehr finden!",
-    "Timeline Path" : "Pfad der Zeitlachse",
-    "Show hidden folders" : "Zeige versteckte Ordner",
-    "Error updating settings" : "Fehler bei der Aktualisierung der Einstellungen",
-    "Download" : "Herunterladen",
-    "Favorite" : "Favorit",
-    "Unarchive" : "Dearchivieren",
-    "View in folder" : "In Ordner anzeigen",
-    "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
-    "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?",
     "Failed to delete files." : "Löschen der Dateien fehlgeschlagen",
     "Failed to delete {fileName}." : "{fileName} konnte nicht gelöscht werden.",
+    "General Failure" : "Allgemeiner Fehler",
+    "Error: {msg}" : "Fehler: {msg}",
     "Failed to favorite {fileName}." : "{fileName} konnte nicht zu den Favoriten hinzugefügt werden.",
     "Failed to favorite files." : "Favorisieren von Dateien fehlgeschlagen"
 },

l10n/de.json

@@ -9,7 +9,25 @@
     "On this day" : "An diesem Tag",
     "Tags" : "Schlagworte",
     "Settings" : "Einstellungen",
+    "Cancel" : "Abbrechen",
+    "Delete" : "Löschen",
+    "Download" : "Herunterladen",
+    "Favorite" : "Favorit",
+    "Unarchive" : "Dearchivieren",
     "Edit Date/Time" : "Datum/Uhrzeit bearbeiten",
+    "View in folder" : "In Ordner anzeigen",
+    "Remove from person" : "Von der Person entfernen",
+    "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?",
+    "_{n} selected_::_{n} selected_" : ["{n} ausgewählt","{n} ausgewählt"],
+    "Timeline Path" : "Pfad der Zeitlachse",
+    "Show hidden folders" : "Zeige versteckte Ordner",
+    "Update" : "Aktualisieren",
+    "Error updating settings" : "Fehler bei der Aktualisierung der Einstellungen",
+    "Your Timeline" : "Deine Zeitleiste",
+    "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
+    "Cannot find this photo anymore!" : "Kann dieses Foto nicht mehr finden!",
     "Update Exif" : "Exif aktualisieren",
     "Newest" : "Neueste",
     "Year" : "Jahr",
@@ -25,32 +43,21 @@
     "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",
+    "Error while moving {basename}" : "Fehler beim Verschieben von {basename}",
+    "Failed to move {name}." : "{name} konnte nicht verschoben werden.",
     "Back" : "Zurück",
     "Merge with different person" : "Mit einer anderen Person zusammenführen",
-    "Cannot find this photo anymore!" : "Kann dieses Foto nicht mehr finden!",
-    "Timeline Path" : "Pfad der Zeitlachse",
-    "Show hidden folders" : "Zeige versteckte Ordner",
-    "Error updating settings" : "Fehler bei der Aktualisierung der Einstellungen",
-    "Download" : "Herunterladen",
-    "Favorite" : "Favorit",
-    "Unarchive" : "Dearchivieren",
-    "View in folder" : "In Ordner anzeigen",
-    "Failed to load some photos" : "Laden einiger Fotos fehlgeschlagen",
-    "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?",
     "Failed to delete files." : "Löschen der Dateien fehlgeschlagen",
     "Failed to delete {fileName}." : "{fileName} konnte nicht gelöscht werden.",
+    "General Failure" : "Allgemeiner Fehler",
+    "Error: {msg}" : "Fehler: {msg}",
     "Failed to favorite {fileName}." : "{fileName} konnte nicht zu den Favoriten hinzugefügt werden.",
     "Failed to favorite files." : "Favorisieren von Dateien fehlgeschlagen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"

l10n/eu.js

@@ -13,7 +13,25 @@ OC.L10N.register(
     "On this day" : "Egun honetan",
     "Tags" : "Etiketak",
     "Settings" : "Ezarpenak",
+    "Cancel" : "Utzi",
+    "Delete" : "Ezabatu",
+    "Download" : "Deskargatu",
+    "Favorite" : "Egin gogoko",
+    "Unarchive" : "Ez artxibatu",
     "Edit Date/Time" : "Editatu data/ordua",
+    "View in folder" : "Ikusi karpetan",
+    "Remove from person" : "Kendu pertsonatik",
+    "You are about to download a large number of files. Are you sure?" : "Fitxategi asko deskargatuko dituzu. Ziur zaude?",
+    "You are about to delete a large number of files. Are you sure?" : "Fitxategi asko ezabatuko dituzu. Ziur zaude?",
+    "You are about to touch a large number of files. Are you sure?" : "Fitxategi asko ukituko dituzu. Ziur zaude?",
+    "_{n} selected_::_{n} selected_" : ["{n} hautatuta","{n} hautatuta"],
+    "Timeline Path" : "Denbora-lerroa",
+    "Show hidden folders" : "Erakutsi ezkutuko karpetak",
+    "Update" : "Eguneratu",
+    "Error updating settings" : "Errorea ezarpenak eguneratzen",
+    "Your Timeline" : "Zure denbora-lerroa",
+    "Failed to load some photos" : "Argazki batzuk kargatzeak huts egin du",
+    "Cannot find this photo anymore!" : "Ezin da argazki hau dagoeneko aurkitu!",
     "Update Exif" : "Eguneratu Exif",
     "Newest" : "Berrienak",
     "Year" : "Urtea",
@@ -28,26 +46,12 @@ OC.L10N.register(
     "Exercise caution and make sure you have backups." : "Kontuz ibili eta ziurtatu babeskopiak dituzula.",
     "Loading data … {n}/{m}" : "Datuak kargatzen … {n}/{m}",
     "Remove person" : "Kendu pertsona",
-    "Delete" : "Ezabatu",
+    "Failed to delete {name}." : "{name} ezabatzeak huts egin du.",
     "Rename person" : "Berridatzi pertsonaren izena",
     "Name" : "Izena",
-    "Update" : "Eguneratu",
+    "Failed to move {name}." : "{name} mugitzeak huts egin du.",
-    "Cancel" : "Utzi",
     "Back" : "Atzera",
     "Merge with different person" : "Bateratu beste pertsona batekin",
-    "Cannot find this photo anymore!" : "Ezin da argazki hau dagoeneko aurkitu!",
-    "Timeline Path" : "Denbora-lerroa",
-    "Show hidden folders" : "Erakutsi ezkutuko karpetak",
-    "Error updating settings" : "Errorea ezarpenak eguneratzen",
-    "Download" : "Deskargatu",
-    "Favorite" : "Egin gogoko",
-    "Unarchive" : "Ez artxibatu",
-    "View in folder" : "Ikusi karpetan",
-    "Failed to load some photos" : "Argazki batzuk kargatzeak huts egin du",
-    "You are about to download a large number of files. Are you sure?" : "Fitxategi asko deskargatuko dituzu. Ziur zaude?",
-    "You are about to delete a large number of files. Are you sure?" : "Fitxategi asko ezabatuko dituzu. Ziur zaude?",
-    "You are about to touch a large number of files. Are you sure?" : "Fitxategi asko ukituko dituzu. Ziur zaude?",
-    "_{n} selected_::_{n} selected_" : ["{n} hautatuta","{n} hautatuta"],
     "Failed to delete files." : "Fitxategiak ezabatzeak huts egin du.",
     "Failed to delete {fileName}." : "{fileName} ezabatzeak huts egin du.",
     "General Failure" : "Hutsegite orokorra",

l10n/eu.json

@@ -11,7 +11,25 @@
     "On this day" : "Egun honetan",
     "Tags" : "Etiketak",
     "Settings" : "Ezarpenak",
+    "Cancel" : "Utzi",
+    "Delete" : "Ezabatu",
+    "Download" : "Deskargatu",
+    "Favorite" : "Egin gogoko",
+    "Unarchive" : "Ez artxibatu",
     "Edit Date/Time" : "Editatu data/ordua",
+    "View in folder" : "Ikusi karpetan",
+    "Remove from person" : "Kendu pertsonatik",
+    "You are about to download a large number of files. Are you sure?" : "Fitxategi asko deskargatuko dituzu. Ziur zaude?",
+    "You are about to delete a large number of files. Are you sure?" : "Fitxategi asko ezabatuko dituzu. Ziur zaude?",
+    "You are about to touch a large number of files. Are you sure?" : "Fitxategi asko ukituko dituzu. Ziur zaude?",
+    "_{n} selected_::_{n} selected_" : ["{n} hautatuta","{n} hautatuta"],
+    "Timeline Path" : "Denbora-lerroa",
+    "Show hidden folders" : "Erakutsi ezkutuko karpetak",
+    "Update" : "Eguneratu",
+    "Error updating settings" : "Errorea ezarpenak eguneratzen",
+    "Your Timeline" : "Zure denbora-lerroa",
+    "Failed to load some photos" : "Argazki batzuk kargatzeak huts egin du",
+    "Cannot find this photo anymore!" : "Ezin da argazki hau dagoeneko aurkitu!",
     "Update Exif" : "Eguneratu Exif",
     "Newest" : "Berrienak",
     "Year" : "Urtea",
@@ -26,26 +44,12 @@
     "Exercise caution and make sure you have backups." : "Kontuz ibili eta ziurtatu babeskopiak dituzula.",
     "Loading data … {n}/{m}" : "Datuak kargatzen … {n}/{m}",
     "Remove person" : "Kendu pertsona",
-    "Delete" : "Ezabatu",
+    "Failed to delete {name}." : "{name} ezabatzeak huts egin du.",
     "Rename person" : "Berridatzi pertsonaren izena",
     "Name" : "Izena",
-    "Update" : "Eguneratu",
+    "Failed to move {name}." : "{name} mugitzeak huts egin du.",
-    "Cancel" : "Utzi",
     "Back" : "Atzera",
     "Merge with different person" : "Bateratu beste pertsona batekin",
-    "Cannot find this photo anymore!" : "Ezin da argazki hau dagoeneko aurkitu!",
-    "Timeline Path" : "Denbora-lerroa",
-    "Show hidden folders" : "Erakutsi ezkutuko karpetak",
-    "Error updating settings" : "Errorea ezarpenak eguneratzen",
-    "Download" : "Deskargatu",
-    "Favorite" : "Egin gogoko",
-    "Unarchive" : "Ez artxibatu",
-    "View in folder" : "Ikusi karpetan",
-    "Failed to load some photos" : "Argazki batzuk kargatzeak huts egin du",
-    "You are about to download a large number of files. Are you sure?" : "Fitxategi asko deskargatuko dituzu. Ziur zaude?",
-    "You are about to delete a large number of files. Are you sure?" : "Fitxategi asko ezabatuko dituzu. Ziur zaude?",
-    "You are about to touch a large number of files. Are you sure?" : "Fitxategi asko ukituko dituzu. Ziur zaude?",
-    "_{n} selected_::_{n} selected_" : ["{n} hautatuta","{n} hautatuta"],
     "Failed to delete files." : "Fitxategiak ezabatzeak huts egin du.",
     "Failed to delete {fileName}." : "{fileName} ezabatzeak huts egin du.",
     "General Failure" : "Hutsegite orokorra",

l10n/pt_BR.js

@@ -12,7 +12,25 @@ OC.L10N.register(
     "On this day" : "Nesse dia",
     "Tags" : "Etiquetas",
     "Settings" : "Configurações",
+    "Cancel" : "Cancelar",
+    "Delete" : "Excluir",
+    "Download" : "Baixar",
+    "Favorite" : "Favorito",
+    "Unarchive" : "Desarquivar",
     "Edit Date/Time" : "Editar data/hora",
+    "View in folder" : "Exibir na pasta",
+    "Remove from person" : "Remover da pessoa",
+    "You are about to download a large number of files. Are you sure?" : "Você está prestes a baixar um grande número de arquivos. Tem certeza?",
+    "You are about to delete a large number of files. Are you sure?" : "Você está prestes a excluir um grande número de arquivos. Tem certeza?",
+    "You are about to touch a large number of files. Are you sure?" : "Você está prestes a tocar em um grande número de arquivos. Tem certeza?",
+    "_{n} selected_::_{n} selected_" : ["{n} selecionado","{n} selecionado","{n} selecionados"],
+    "Timeline Path" : "Caminho da linha do tempo",
+    "Show hidden folders" : "Mostrar pastas ocultas",
+    "Update" : "Atualizar",
+    "Error updating settings" : "Erro ao atualizar as configurações",
+    "Your Timeline" : "Sua Linha-do-Tempo",
+    "Failed to load some photos" : "Falha ao carregar algumas fotos",
+    "Cannot find this photo anymore!" : "Não é mais possível encontrar esta foto!",
     "Update Exif" : "Atualizar Exif",
     "Newest" : "O mais novo",
     "Year" : "Ano",
@@ -27,26 +45,18 @@ OC.L10N.register(
     "Exercise caution and make sure you have backups." : "Tenha cuidado e certifique-se de ter backups.",
     "Loading data … {n}/{m}" : "Carregando dados… {n}/{m}",
     "Remove person" : "Remover pessoa",
-    "Delete" : "Excluir",
+    "Are you sure you want to remove {name}" : "Tem certeza que deseja remover {name}",
+    "Failed to delete {name}." : "Falha ao remover {name}.",
     "Rename person" : "Renomear pessoa",
     "Name" : "Nome",
-    "Update" : "Atualizar",
+    "Failed to rename {oldName} to {name}." : "Falha ao renomear {oldName} para {name}.",
-    "Cancel" : "Cancelar",
+    "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",
+    "Error while moving {basename}" : "Erro ao mover {basename}",
+    "Failed to move {name}." : "Falha ao mover {name}.",
     "Back" : "Voltar",
     "Merge with different person" : "Unir com outra pessoa",
-    "Cannot find this photo anymore!" : "Não é mais possível encontrar esta foto!",
-    "Timeline Path" : "Caminho da linha do tempo",
-    "Show hidden folders" : "Mostrar pastas ocultas",
-    "Error updating settings" : "Erro ao atualizar as configurações",
-    "Download" : "Baixar",
-    "Favorite" : "Favorito",
-    "Unarchive" : "Desarquivar",
-    "View in folder" : "Exibir na pasta",
-    "Failed to load some photos" : "Falha ao carregar algumas fotos",
-    "You are about to download a large number of files. Are you sure?" : "Você está prestes a baixar um grande número de arquivos. Tem certeza?",
-    "You are about to delete a large number of files. Are you sure?" : "Você está prestes a excluir um grande número de arquivos. Tem certeza?",
-    "You are about to touch a large number of files. Are you sure?" : "Você está prestes a tocar em um grande número de arquivos. Tem certeza?",
-    "_{n} selected_::_{n} selected_" : ["{n} selecionado","{n} selecionado","{n} selecionados"],
     "Failed to delete files." : "Falha ao excluir arquivos.",
     "Failed to delete {fileName}." : "Falha ao excluir {fileName}.",
     "General Failure" : "Falha Geral",

l10n/pt_BR.json

@@ -10,7 +10,25 @@
     "On this day" : "Nesse dia",
     "Tags" : "Etiquetas",
     "Settings" : "Configurações",
+    "Cancel" : "Cancelar",
+    "Delete" : "Excluir",
+    "Download" : "Baixar",
+    "Favorite" : "Favorito",
+    "Unarchive" : "Desarquivar",
     "Edit Date/Time" : "Editar data/hora",
+    "View in folder" : "Exibir na pasta",
+    "Remove from person" : "Remover da pessoa",
+    "You are about to download a large number of files. Are you sure?" : "Você está prestes a baixar um grande número de arquivos. Tem certeza?",
+    "You are about to delete a large number of files. Are you sure?" : "Você está prestes a excluir um grande número de arquivos. Tem certeza?",
+    "You are about to touch a large number of files. Are you sure?" : "Você está prestes a tocar em um grande número de arquivos. Tem certeza?",
+    "_{n} selected_::_{n} selected_" : ["{n} selecionado","{n} selecionado","{n} selecionados"],
+    "Timeline Path" : "Caminho da linha do tempo",
+    "Show hidden folders" : "Mostrar pastas ocultas",
+    "Update" : "Atualizar",
+    "Error updating settings" : "Erro ao atualizar as configurações",
+    "Your Timeline" : "Sua Linha-do-Tempo",
+    "Failed to load some photos" : "Falha ao carregar algumas fotos",
+    "Cannot find this photo anymore!" : "Não é mais possível encontrar esta foto!",
     "Update Exif" : "Atualizar Exif",
     "Newest" : "O mais novo",
     "Year" : "Ano",
@@ -25,26 +43,18 @@
     "Exercise caution and make sure you have backups." : "Tenha cuidado e certifique-se de ter backups.",
     "Loading data … {n}/{m}" : "Carregando dados… {n}/{m}",
     "Remove person" : "Remover pessoa",
-    "Delete" : "Excluir",
+    "Are you sure you want to remove {name}" : "Tem certeza que deseja remover {name}",
+    "Failed to delete {name}." : "Falha ao remover {name}.",
     "Rename person" : "Renomear pessoa",
     "Name" : "Nome",
-    "Update" : "Atualizar",
+    "Failed to rename {oldName} to {name}." : "Falha ao renomear {oldName} para {name}.",
-    "Cancel" : "Cancelar",
+    "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",
+    "Error while moving {basename}" : "Erro ao mover {basename}",
+    "Failed to move {name}." : "Falha ao mover {name}.",
     "Back" : "Voltar",
     "Merge with different person" : "Unir com outra pessoa",
-    "Cannot find this photo anymore!" : "Não é mais possível encontrar esta foto!",
-    "Timeline Path" : "Caminho da linha do tempo",
-    "Show hidden folders" : "Mostrar pastas ocultas",
-    "Error updating settings" : "Erro ao atualizar as configurações",
-    "Download" : "Baixar",
-    "Favorite" : "Favorito",
-    "Unarchive" : "Desarquivar",
-    "View in folder" : "Exibir na pasta",
-    "Failed to load some photos" : "Falha ao carregar algumas fotos",
-    "You are about to download a large number of files. Are you sure?" : "Você está prestes a baixar um grande número de arquivos. Tem certeza?",
-    "You are about to delete a large number of files. Are you sure?" : "Você está prestes a excluir um grande número de arquivos. Tem certeza?",
-    "You are about to touch a large number of files. Are you sure?" : "Você está prestes a tocar em um grande número de arquivos. Tem certeza?",
-    "_{n} selected_::_{n} selected_" : ["{n} selecionado","{n} selecionado","{n} selecionados"],
     "Failed to delete files." : "Falha ao excluir arquivos.",
     "Failed to delete {fileName}." : "Falha ao excluir {fileName}.",
     "General Failure" : "Falha Geral",