Merge pull request #275 from nextcloud/master-sync-upstream

[Master] Sync upstream

202 files changed, 3213 insertions, 227 deletions

diff --git a/apps/comments/l10n/en_GB.js b/apps/comments/l10n/en_GB.js
index d8e5c5d8240..057ac775a6b 100644
--- a/apps/comments/l10n/en_GB.js
+++ b/apps/comments/l10n/en_GB.js
@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "More comments...",
     "Save" : "Save",
     "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
+    "Error occurred while retrieving comment with id {id}" : "Error occurred while retrieving comment with id {id}",
+    "Error occurred while updating comment with id {id}" : "Error occurred while updating comment with id {id}",
+    "Error occurred while posting comment" : "Error occurred while posting comment",
     "{count} unread comments" : "{count} unread comments",
     "Comment" : "Comment",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comments</strong> for files <em>(always listed in stream)</em>",
diff --git a/apps/comments/l10n/en_GB.json b/apps/comments/l10n/en_GB.json
index ccf4a1338d1..13335d5d989 100644
--- a/apps/comments/l10n/en_GB.json
+++ b/apps/comments/l10n/en_GB.json
@@ -10,6 +10,9 @@
     "More comments..." : "More comments...",
     "Save" : "Save",
     "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
+    "Error occurred while retrieving comment with id {id}" : "Error occurred while retrieving comment with id {id}",
+    "Error occurred while updating comment with id {id}" : "Error occurred while updating comment with id {id}",
+    "Error occurred while posting comment" : "Error occurred while posting comment",
     "{count} unread comments" : "{count} unread comments",
     "Comment" : "Comment",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comments</strong> for files <em>(always listed in stream)</em>",
diff --git a/apps/comments/l10n/fr.js b/apps/comments/l10n/fr.js
index 720c9518b2e..adb5bc00c1c 100644
--- a/apps/comments/l10n/fr.js
+++ b/apps/comments/l10n/fr.js
@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Plus de commentaires...",
     "Save" : "Enregistrer",
     "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
+    "Error occurred while retrieving comment with id {id}" : "Une erreur est survenue lors de la récupération du commentaire avec l'id {id}",
+    "Error occurred while updating comment with id {id}" : "Une erreur est survenue lors de la mise à jour du commentaire avec l'id {id}",
+    "Error occurred while posting comment" : "Une erreur est survenue lors de l'envoi du commentaire",
     "{count} unread comments" : "{count} commentaires non lus",
     "Comment" : "Commenter",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commentaires</strong> pour les fichiers <em>(toujours listés dans le flux)</em>",
diff --git a/apps/comments/l10n/fr.json b/apps/comments/l10n/fr.json
index 25cbfa4daa2..9a7dce480c8 100644
--- a/apps/comments/l10n/fr.json
+++ b/apps/comments/l10n/fr.json
@@ -10,6 +10,9 @@
     "More comments..." : "Plus de commentaires...",
     "Save" : "Enregistrer",
     "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
+    "Error occurred while retrieving comment with id {id}" : "Une erreur est survenue lors de la récupération du commentaire avec l'id {id}",
+    "Error occurred while updating comment with id {id}" : "Une erreur est survenue lors de la mise à jour du commentaire avec l'id {id}",
+    "Error occurred while posting comment" : "Une erreur est survenue lors de l'envoi du commentaire",
     "{count} unread comments" : "{count} commentaires non lus",
     "Comment" : "Commenter",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commentaires</strong> pour les fichiers <em>(toujours listés dans le flux)</em>",
diff --git a/apps/comments/l10n/nl.js b/apps/comments/l10n/nl.js
index 01cfc704536..56434689471 100644
--- a/apps/comments/l10n/nl.js
+++ b/apps/comments/l10n/nl.js
@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Meer reacties...",
     "Save" : "Opslaan",
     "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens",
+    "Error occurred while retrieving comment with id {id}" : "Er trad een fout op bij het ophalen van reactie met id {id}",
+    "Error occurred while updating comment with id {id}" : "Er trad een fout op bij het bijwerken van reactie met id {id}",
+    "Error occurred while posting comment" : "Er trad een fout op bij het plaatsten van een reactie",
     "{count} unread comments" : "{count} ongelezen reacties",
     "Comment" : "Reactie",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Reacties</strong> voor bestanden <em>(altijd getoond in de stroom)</em>",
diff --git a/apps/comments/l10n/nl.json b/apps/comments/l10n/nl.json
index 1bdb76aabd5..d8de61d10cb 100644
--- a/apps/comments/l10n/nl.json
+++ b/apps/comments/l10n/nl.json
@@ -10,6 +10,9 @@
     "More comments..." : "Meer reacties...",
     "Save" : "Opslaan",
     "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens",
+    "Error occurred while retrieving comment with id {id}" : "Er trad een fout op bij het ophalen van reactie met id {id}",
+    "Error occurred while updating comment with id {id}" : "Er trad een fout op bij het bijwerken van reactie met id {id}",
+    "Error occurred while posting comment" : "Er trad een fout op bij het plaatsten van een reactie",
     "{count} unread comments" : "{count} ongelezen reacties",
     "Comment" : "Reactie",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Reacties</strong> voor bestanden <em>(altijd getoond in de stroom)</em>",
diff --git a/apps/comments/l10n/pt_BR.js b/apps/comments/l10n/pt_BR.js
index 173fc5395fb..a366f3bcda1 100644
--- a/apps/comments/l10n/pt_BR.js
+++ b/apps/comments/l10n/pt_BR.js
@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Mais comentários...",
     "Save" : "Salvar",
     "Allowed characters {count} of {max}" : "Caracteres permitidos  {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Ocorreu um erro ao recuperar comentário com o id {id}",
+    "Error occurred while updating comment with id {id}" : "Ocorreu um erro durante a atualização do comentário com o id {id}",
+    "Error occurred while posting comment" : "Ocorreu um erro ao postar o comentário",
     "{count} unread comments" : "{count} comentários não lidos",
     "Comment" : "Comentário",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comemtários</strong> para arquivos <em>(sempre listados no fluxo)</em>",
diff --git a/apps/comments/l10n/pt_BR.json b/apps/comments/l10n/pt_BR.json
index b20ea2620b1..11fa6bc3f68 100644
--- a/apps/comments/l10n/pt_BR.json
+++ b/apps/comments/l10n/pt_BR.json
@@ -10,6 +10,9 @@
     "More comments..." : "Mais comentários...",
     "Save" : "Salvar",
     "Allowed characters {count} of {max}" : "Caracteres permitidos  {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Ocorreu um erro ao recuperar comentário com o id {id}",
+    "Error occurred while updating comment with id {id}" : "Ocorreu um erro durante a atualização do comentário com o id {id}",
+    "Error occurred while posting comment" : "Ocorreu um erro ao postar o comentário",
     "{count} unread comments" : "{count} comentários não lidos",
     "Comment" : "Comentário",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comemtários</strong> para arquivos <em>(sempre listados no fluxo)</em>",
diff --git a/apps/comments/l10n/pt_PT.js b/apps/comments/l10n/pt_PT.js
index a015d02ae6b..17632c2f046 100644
--- a/apps/comments/l10n/pt_PT.js
+++ b/apps/comments/l10n/pt_PT.js
@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Mais comentários...",
     "Save" : "Guardar",
     "Allowed characters {count} of {max}" : "{count} de {max} caracteres restantes",
+    "Error occurred while retrieving comment with id {id}" : "Ocorreu um erro ao tentar obter o comentário com o id {id}",
+    "Error occurred while updating comment with id {id}" : "Ocorreu um erro ao tentar atualizar o comentário com o id {id}",
+    "Error occurred while posting comment" : "Ocorreu um erro ao tentar publicar o comentário",
     "{count} unread comments" : "{count} comentários não lidos",
     "Comment" : "Comentário",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentários</strong> aos ficheiros <em>(listados sempre na transmissão)</em>",
diff --git a/apps/comments/l10n/pt_PT.json b/apps/comments/l10n/pt_PT.json
index 244892c4ac7..00f024034d2 100644
--- a/apps/comments/l10n/pt_PT.json
+++ b/apps/comments/l10n/pt_PT.json
@@ -10,6 +10,9 @@
     "More comments..." : "Mais comentários...",
     "Save" : "Guardar",
     "Allowed characters {count} of {max}" : "{count} de {max} caracteres restantes",
+    "Error occurred while retrieving comment with id {id}" : "Ocorreu um erro ao tentar obter o comentário com o id {id}",
+    "Error occurred while updating comment with id {id}" : "Ocorreu um erro ao tentar atualizar o comentário com o id {id}",
+    "Error occurred while posting comment" : "Ocorreu um erro ao tentar publicar o comentário",
     "{count} unread comments" : "{count} comentários não lidos",
     "Comment" : "Comentário",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentários</strong> aos ficheiros <em>(listados sempre na transmissão)</em>",
diff --git a/apps/comments/l10n/ru.js b/apps/comments/l10n/ru.js
index 3ee5e1fb4d4..c7719d185e8 100644
--- a/apps/comments/l10n/ru.js
+++ b/apps/comments/l10n/ru.js
@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Ещё комментарии...",
     "Save" : "Сохранить",
     "Allowed characters {count} of {max}" : "Допустимых символов {count} из {max}",
+    "Error occurred while retrieving comment with id {id}" : "Произошла ошибка при извлечении комментария с id {id}",
+    "Error occurred while updating comment with id {id}" : "Произошла ошибка при обновлении комментария с id {id}",
+    "Error occurred while posting comment" : "При сохранении комментария произошла ошибка",
     "{count} unread comments" : "{count} непрочитанных комментариев",
     "Comment" : "Коментарий",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Комментарии</strong> к файлам <em>(всегда перечислены в потоке)</em>",
diff --git a/apps/comments/l10n/ru.json b/apps/comments/l10n/ru.json
index fcafda4c9cb..3de3e3d8ecd 100644
--- a/apps/comments/l10n/ru.json
+++ b/apps/comments/l10n/ru.json
@@ -10,6 +10,9 @@
     "More comments..." : "Ещё комментарии...",
     "Save" : "Сохранить",
     "Allowed characters {count} of {max}" : "Допустимых символов {count} из {max}",
+    "Error occurred while retrieving comment with id {id}" : "Произошла ошибка при извлечении комментария с id {id}",
+    "Error occurred while updating comment with id {id}" : "Произошла ошибка при обновлении комментария с id {id}",
+    "Error occurred while posting comment" : "При сохранении комментария произошла ошибка",
     "{count} unread comments" : "{count} непрочитанных комментариев",
     "Comment" : "Коментарий",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Комментарии</strong> к файлам <em>(всегда перечислены в потоке)</em>",
diff --git a/apps/comments/l10n/sl.js b/apps/comments/l10n/sl.js
index 263522cf3e5..f6b66a634f0 100644
--- a/apps/comments/l10n/sl.js
+++ b/apps/comments/l10n/sl.js
@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Več opomb ...",
     "Save" : "Shrani",
     "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}",
+    "Error occurred while retrieving comment with id {id}" : "Napaka se je zgodila med prenosom komentarja z oznako {id}",
+    "Error occurred while updating comment with id {id}" : "Napaka se je zgodila med posodabljanjem komentarja z oznako {id}",
+    "Error occurred while posting comment" : "Napaka se je zgodila med predajo komentarja",
     "{count} unread comments" : "{count} neprebranih opomb",
     "Comment" : "Opomba",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Opombe</strong> k datotekam <em>(vedno pokaži)</em>",
diff --git a/apps/comments/l10n/sl.json b/apps/comments/l10n/sl.json
index 8a52d03c8c3..5bf96f2773b 100644
--- a/apps/comments/l10n/sl.json
+++ b/apps/comments/l10n/sl.json
@@ -10,6 +10,9 @@
     "More comments..." : "Več opomb ...",
     "Save" : "Shrani",
     "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}",
+    "Error occurred while retrieving comment with id {id}" : "Napaka se je zgodila med prenosom komentarja z oznako {id}",
+    "Error occurred while updating comment with id {id}" : "Napaka se je zgodila med posodabljanjem komentarja z oznako {id}",
+    "Error occurred while posting comment" : "Napaka se je zgodila med predajo komentarja",
     "{count} unread comments" : "{count} neprebranih opomb",
     "Comment" : "Opomba",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Opombe</strong> k datotekam <em>(vedno pokaži)</em>",
diff --git a/apps/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php
index 3f505222491..fcd36b3ff35 100644
--- a/apps/dav/lib/CardDAV/ImageExportPlugin.php
+++ b/apps/dav/lib/CardDAV/ImageExportPlugin.php
@@ -108,8 +108,18 @@ class ImageExportPlugin extends ServerPlugin {
 			$photo = $vObject->PHOTO;
 			$type = $this->getType($photo);
 
-			$valType = $photo->getValueType();
-			$val = ($valType === 'URI' ? $photo->getRawMimeDirValue() : $photo->getValue());
+			$val = $photo->getValue();
+			if ($photo->getValueType() === 'URI') {
+				$parsed = \Sabre\URI\parse($val);
+				//only allow data://
+				if ($parsed['scheme'] !== 'data') {
+					return false;
+				}
+				if (substr_count($parsed['path'], ';') === 1) {
+					list($type,) = explode(';', $parsed['path']);
+				}
+				$val = file_get_contents($val);
+			}
 			return [
 				'Content-Type' => $type,
 				'body' => $val
diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
index 8583df0b6f9..3a9dc144584 100644
--- a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
+++ b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
@@ -140,12 +140,9 @@ class ImageExportPluginTest extends TestCase {
 			'empty vcard' => [false, ''],
 			'vcard without PHOTO' => [false, "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nEND:VCARD\r\n"],
 			'vcard 3 with PHOTO' => [['Content-Type' => 'image/jpeg', 'body' => '12345'], "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO;ENCODING=b;TYPE=JPEG:MTIzNDU=\r\nEND:VCARD\r\n"],
-			//
-			// TODO: these three below are not working - needs debugging
-			//
-			//'vcard 3 with PHOTO URL' => [['Content-Type' => 'image/jpeg', 'body' => '12345'], "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO;TYPE=JPEG:http://example.org/photo.jpg\r\nEND:VCARD\r\n"],
-			//'vcard 4 with PHOTO' => [['Content-Type' => 'image/jpeg', 'body' => '12345'], "BEGIN:VCARD\r\nVERSION:4.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO:data:image/jpeg;MTIzNDU=\r\nEND:VCARD\r\n"],
-			'vcard 4 with PHOTO URL' => [['Content-Type' => 'image/jpeg', 'body' => 'http://example.org/photo.jpg'], "BEGIN:VCARD\r\nVERSION:4.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO;MEDIATYPE=image/jpeg:http://example.org/photo.jpg\r\nEND:VCARD\r\n"],
+			'vcard 3 with PHOTO URL' => [false, "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO;TYPE=JPEG;VALUE=URI:http://example.com/photo.jpg\r\nEND:VCARD\r\n"],
+			'vcard 4 with PHOTO' => [['Content-Type' => 'image/jpeg', 'body' => '12345'], "BEGIN:VCARD\r\nVERSION:4.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO:data:image/jpeg;base64,MTIzNDU=\r\nEND:VCARD\r\n"],
+			'vcard 4 with PHOTO URL' => [false, "BEGIN:VCARD\r\nVERSION:4.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO;MEDIATYPE=image/jpeg:http://example.org/photo.jpg\r\nEND:VCARD\r\n"],
 		];
 	}
 }
diff --git a/apps/federatedfilesharing/l10n/fr.js b/apps/federatedfilesharing/l10n/fr.js
index 36e05254aa6..be792375639 100644
--- a/apps/federatedfilesharing/l10n/fr.js
+++ b/apps/federatedfilesharing/l10n/fr.js
@@ -7,6 +7,8 @@ OC.L10N.register(
     "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur",
     "File is already shared with %s" : "Le fichier est déjà partagé avec %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Le partage de %s a échoué : impossible de trouver %s. Peut-être le serveur est-il momentanément injoignable.",
+    "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Vous recevez \"/%3$s\" comme un partage distant depuis %1$s (au nom de %2$s)",
+    "You received \"/%3$s\" as a remote share from %1$s" : "Vous recevez \"/%3$s\" comme un partage distant depuis %1$s",
     "Accept" : "Accepter",
     "Decline" : "Refuser",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #Nextcloud %s",
diff --git a/apps/federatedfilesharing/l10n/fr.json b/apps/federatedfilesharing/l10n/fr.json
index 12040fa7481..fae2627bdd7 100644
--- a/apps/federatedfilesharing/l10n/fr.json
+++ b/apps/federatedfilesharing/l10n/fr.json
@@ -5,6 +5,8 @@
     "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur",
     "File is already shared with %s" : "Le fichier est déjà partagé avec %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Le partage de %s a échoué : impossible de trouver %s. Peut-être le serveur est-il momentanément injoignable.",
+    "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Vous recevez \"/%3$s\" comme un partage distant depuis %1$s (au nom de %2$s)",
+    "You received \"/%3$s\" as a remote share from %1$s" : "Vous recevez \"/%3$s\" comme un partage distant depuis %1$s",
     "Accept" : "Accepter",
     "Decline" : "Refuser",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #Nextcloud %s",
diff --git a/apps/federation/l10n/lb.js b/apps/federation/l10n/lb.js
new file mode 100644
index 00000000000..df0f6d5d07a
--- /dev/null
+++ b/apps/federation/l10n/lb.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "federation",
+    {
+    "Server added to the list of trusted ownClouds" : "De Server gouf op d'Lëscht vun den zouverlässegen ownClouds gesat.",
+    "Server is already in the list of trusted servers." : "De Server ass schonn op der Lëscht vun den zouverlässegen Serveren.",
+    "No ownCloud server found" : "Keen ownCloud Server fonnt",
+    "Could not add server" : "De Server konnt net derbäi gesat ginn",
+    "Federation" : "Federatioun",
+    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "D'ownCloud Federatioun erlaabt der fir dech mat aneren zouverlässegen ownClouds ze verbannen an d'Benotzer Verzeechnes auszetauschen. Zum Beispill gëtt dëst hei benotzt fir extern Benotzer automatesch fir federatiivt Deelen ze vervollstännegen.",
+    "Add server automatically once a federated share was created successfully" : "Setz de Server automatesch derbäi soubal e federativen Undeel erfollegräich erstallt gouf",
+    "Trusted ownCloud Servers" : "Zouverlässeg ownCloud Serveren",
+    "+ Add ownCloud server" : "+ ownCloud Server derbäi setzen",
+    "ownCloud Server" : "ownCloud Server"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/federation/l10n/lb.json b/apps/federation/l10n/lb.json
new file mode 100644
index 00000000000..03179a4b8ee
--- /dev/null
+++ b/apps/federation/l10n/lb.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Server added to the list of trusted ownClouds" : "De Server gouf op d'Lëscht vun den zouverlässegen ownClouds gesat.",
+    "Server is already in the list of trusted servers." : "De Server ass schonn op der Lëscht vun den zouverlässegen Serveren.",
+    "No ownCloud server found" : "Keen ownCloud Server fonnt",
+    "Could not add server" : "De Server konnt net derbäi gesat ginn",
+    "Federation" : "Federatioun",
+    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "D'ownCloud Federatioun erlaabt der fir dech mat aneren zouverlässegen ownClouds ze verbannen an d'Benotzer Verzeechnes auszetauschen. Zum Beispill gëtt dëst hei benotzt fir extern Benotzer automatesch fir federatiivt Deelen ze vervollstännegen.",
+    "Add server automatically once a federated share was created successfully" : "Setz de Server automatesch derbäi soubal e federativen Undeel erfollegräich erstallt gouf",
+    "Trusted ownCloud Servers" : "Zouverlässeg ownCloud Serveren",
+    "+ Add ownCloud server" : "+ ownCloud Server derbäi setzen",
+    "ownCloud Server" : "ownCloud Server"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 0813d2cc30e..593f182cf73 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2352,13 +2352,16 @@
 		 */
 		setFilter:function(filter) {
 			var total = 0;
+			if (this._filter === filter) {
+				return;
+			}
 			this._filter = filter;
 			this.fileSummary.setFilter(filter, this.files);
 			total = this.fileSummary.getTotal();
 			if (!this.$el.find('.mask').exists()) {
 				this.hideIrrelevantUIWhenNoFilesMatch();
 			}
-			var that = this;
+
 			var visibleCount = 0;
 			filter = filter.toLowerCase();
 
@@ -2378,7 +2381,7 @@
 				if (visibleCount < total) {
 					$trs = this._nextPage(false);
 				}
-			} while (visibleCount < total);
+			} while (visibleCount < total && $trs.length > 0);
 
 			this.$container.trigger('scroll');
 		},
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index b2d6662a9ce..b09bea28607 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -33,7 +33,15 @@ OC.L10N.register(
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "Uploading..." : "Téléversement en cours…",
     "..." : "...",
+    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} heure{plural_s} restante{plural_s}",
+    "{hours}:{minutes}h" : "{hours}:{minutes}h",
+    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} restante{plural_s}",
+    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
+    "{seconds} second{plural_s} left" : "{seconds} seconde{plural_s} restante{plural_s}",
+    "{seconds}s" : "{seconds}s",
+    "Any moment now..." : "D'un instant à l'autre...",
     "Soon..." : "Bientôt...",
+    "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
     "Actions" : "Actions",
     "Download" : "Télécharger",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 780ef364b9f..882c40094df 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -31,7 +31,15 @@
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "Uploading..." : "Téléversement en cours…",
     "..." : "...",
+    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} heure{plural_s} restante{plural_s}",
+    "{hours}:{minutes}h" : "{hours}:{minutes}h",
+    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} restante{plural_s}",
+    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
+    "{seconds} second{plural_s} left" : "{seconds} seconde{plural_s} restante{plural_s}",
+    "{seconds}s" : "{seconds}s",
+    "Any moment now..." : "D'un instant à l'autre...",
     "Soon..." : "Bientôt...",
+    "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
     "Actions" : "Actions",
     "Download" : "Télécharger",
diff --git a/apps/files/l10n/lb.js b/apps/files/l10n/lb.js
index d7888f9f197..9fa3a0fdfaa 100644
--- a/apps/files/l10n/lb.js
+++ b/apps/files/l10n/lb.js
@@ -29,14 +29,18 @@ OC.L10N.register(
     "Size" : "Gréisst",
     "Modified" : "Geännert",
     "New" : "Nei",
+    "\"{name}\" is an invalid file name." : "\"{Numm}\" ass een ongültegen Numm fir e Fichier.",
+    "File name cannot be empty." : "Den Numm vum Fichier kann net eidel sinn.",
     "Folder" : "Dossier",
     "New folder" : "Neien Dossier",
     "Upload" : "Eroplueden",
+    "Upload (max. %s)" : "Eroplueden (max. %s)",
     "File handling" : "Fichier handling",
     "Maximum upload size" : "Maximum Upload Gréisst ",
     "max. possible: " : "max. méiglech:",
     "Save" : "Späicheren",
     "Settings" : "Astellungen",
+    "No files in here" : "Hei sinn keng Fichieren",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
     "Upload too large" : "Upload ze grouss",
diff --git a/apps/files/l10n/lb.json b/apps/files/l10n/lb.json
index a736e06570b..67da26b1ece 100644
--- a/apps/files/l10n/lb.json
+++ b/apps/files/l10n/lb.json
@@ -27,14 +27,18 @@
     "Size" : "Gréisst",
     "Modified" : "Geännert",
     "New" : "Nei",
+    "\"{name}\" is an invalid file name." : "\"{Numm}\" ass een ongültegen Numm fir e Fichier.",
+    "File name cannot be empty." : "Den Numm vum Fichier kann net eidel sinn.",
     "Folder" : "Dossier",
     "New folder" : "Neien Dossier",
     "Upload" : "Eroplueden",
+    "Upload (max. %s)" : "Eroplueden (max. %s)",
     "File handling" : "Fichier handling",
     "Maximum upload size" : "Maximum Upload Gréisst ",
     "max. possible: " : "max. méiglech:",
     "Save" : "Späicheren",
     "Settings" : "Astellungen",
+    "No files in here" : "Hei sinn keng Fichieren",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
     "Upload too large" : "Upload ze grouss",
diff --git a/apps/files_external/l10n/lb.js b/apps/files_external/l10n/lb.js
index 50bb06ff7f9..29014e55190 100644
--- a/apps/files_external/l10n/lb.js
+++ b/apps/files_external/l10n/lb.js
@@ -15,7 +15,10 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "Share" : "Deelen",
     "Name" : "Numm",
+    "Enable encryption" : "Verschlësselung aschalten",
+    "External Storage" : "Externt Lager",
     "Folder name" : "Dossiers Numm:",
+    "Advanced settings" : "Erweidert Astellungen",
     "Delete" : "Läschen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/lb.json b/apps/files_external/l10n/lb.json
index 9f7aa84bb1a..ef3f3d2f333 100644
--- a/apps/files_external/l10n/lb.json
+++ b/apps/files_external/l10n/lb.json
@@ -13,7 +13,10 @@
     "ownCloud" : "ownCloud",
     "Share" : "Deelen",
     "Name" : "Numm",
+    "Enable encryption" : "Verschlësselung aschalten",
+    "External Storage" : "Externt Lager",
     "Folder name" : "Dossiers Numm:",
+    "Advanced settings" : "Erweidert Astellungen",
     "Delete" : "Läschen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js
index 3de90f516e7..4b8be728155 100644
--- a/apps/files_external/l10n/sl.js
+++ b/apps/files_external/l10n/sl.js
@@ -18,6 +18,7 @@ OC.L10N.register(
     "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
+    "Compatibility with Mac NFD encoding (slow)" : "Usklajenost z Mac NFD šifriranjem (počasno)",
     "Admin defined" : "Skrbnik je določen",
     "Saved" : "Shranjeno",
     "Empty response from the server" : "S strežnika je prejet odziv brez vsebine.",
diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json
index de512656d0c..26648ce76df 100644
--- a/apps/files_external/l10n/sl.json
+++ b/apps/files_external/l10n/sl.json
@@ -16,6 +16,7 @@
     "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
+    "Compatibility with Mac NFD encoding (slow)" : "Usklajenost z Mac NFD šifriranjem (počasno)",
     "Admin defined" : "Skrbnik je določen",
     "Saved" : "Shranjeno",
     "Empty response from the server" : "S strežnika je prejet odziv brez vsebine.",
diff --git a/apps/files_sharing/l10n/ast.js b/apps/files_sharing/l10n/ast.js
index 2dea9485001..96e83dc54d4 100644
--- a/apps/files_sharing/l10n/ast.js
+++ b/apps/files_sharing/l10n/ast.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Remote share password" : "Contraseña de compartición remota",
     "Cancel" : "Encaboxar",
     "Add remote share" : "Amestar compartición remota",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Nun s'atopó nenguna instalación ownCloud (7 o cimera) en { } remotu",
     "Invalid ownCloud url" : "Url ownCloud inválida",
     "Shared by" : "Compartíos por",
     "Sharing" : "Compartiendo",
diff --git a/apps/files_sharing/l10n/ast.json b/apps/files_sharing/l10n/ast.json
index f06f63a44b7..78318f9a479 100644
--- a/apps/files_sharing/l10n/ast.json
+++ b/apps/files_sharing/l10n/ast.json
@@ -11,6 +11,7 @@
     "Remote share password" : "Contraseña de compartición remota",
     "Cancel" : "Encaboxar",
     "Add remote share" : "Amestar compartición remota",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Nun s'atopó nenguna instalación ownCloud (7 o cimera) en { } remotu",
     "Invalid ownCloud url" : "Url ownCloud inválida",
     "Shared by" : "Compartíos por",
     "Sharing" : "Compartiendo",
diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php
index e338e6e509c..3f665b0978d 100644
--- a/apps/files_sharing/lib/External/Manager.php
+++ b/apps/files_sharing/lib/External/Manager.php
@@ -328,7 +328,7 @@ class Manager {
 	public function removeShare($mountPoint) {
 
 		$mountPointObj = $this->mountManager->find($mountPoint);
-		$id = $mountPointObj->getStorage()->getCache()->getId();
+		$id = $mountPointObj->getStorage()->getCache()->getId('');
 
 		$mountPoint = $this->stripPath($mountPoint);
 		$hash = md5($mountPoint);
diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php
index 29b9c7b563c..bc8d898f8ef 100644
--- a/apps/files_sharing/lib/External/Storage.php
+++ b/apps/files_sharing/lib/External/Storage.php
@@ -32,6 +32,7 @@ use OC\Files\Storage\DAV;
 use OC\ForbiddenException;
 use OCA\FederatedFileSharing\DiscoveryManager;
 use OCA\Files_Sharing\ISharedStorage;
+use OCP\AppFramework\Http;
 use OCP\Files\NotFoundException;
 use OCP\Files\StorageInvalidException;
 use OCP\Files\StorageNotAvailableException;
@@ -181,6 +182,20 @@ class Storage extends DAV implements ISharedStorage {
 		}
 	}
 
+	public function test() {
+		try {
+			parent::test();
+		} catch (StorageInvalidException $e) {
+			// check if it needs to be removed
+			$this->checkStorageAvailability();
+			throw $e;
+		} catch (StorageNotAvailableException $e) {
+			// check if it needs to be removed or just temp unavailable
+			$this->checkStorageAvailability();
+			throw $e;
+		}
+	}
+
 	/**
 	 * Check whether this storage is permanently or temporarily
 	 * unavailable
@@ -310,10 +325,10 @@ class Storage extends DAV implements ISharedStorage {
 				'connect_timeout' => 10,
 			]);
 		} catch (\GuzzleHttp\Exception\RequestException $e) {
-			if ($e->getCode() === 401 || $e->getCode() === 403) {
+			if ($e->getCode() === Http::STATUS_UNAUTHORIZED || $e->getCode() === Http::STATUS_FORBIDDEN) {
 				throw new ForbiddenException();
 			}
-			if ($e->getCode() === 404) {
+			if ($e->getCode() === Http::STATUS_NOT_FOUND) {
 				throw new NotFoundException();
 			}
 			// throw this to be on the safe side: the share will still be visible
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
index 0e17fff466a..b9ccf03c3e2 100644
--- a/apps/files_versions/js/versionstabview.js
+++ b/apps/files_versions/js/versionstabview.js
@@ -15,7 +15,9 @@
 		'<a href="{{downloadUrl}}" class="downloadVersion"><img src="{{downloadIconUrl}}" />' +
 		'<span class="versiondate has-tooltip" title="{{formattedTimestamp}}">{{relativeTimestamp}}</span>' +
 		'</a>' +
+		'{{#canRevert}}' +
 		'<a href="#" class="revertVersion" title="{{revertLabel}}"><img src="{{revertIconUrl}}" /></a>' +
+		'{{/canRevert}}' +
 		'</li>';
 
 	var TEMPLATE =
@@ -109,6 +111,9 @@
 				},
 
 				error: function() {
+					fileInfoModel.trigger('busy', fileInfoModel, false);
+					self.$el.find('.versions').removeClass('hidden');
+					self._toggleLoading(false);
 					OC.Notification.showTemporary(
 						t('files_version', 'Failed to revert {file} to revision {timestamp}.', {
 							file: versionModel.getFullPath(),
@@ -183,6 +188,7 @@
 				revertIconUrl: OC.imagePath('core', 'actions/history'),
 				previewUrl: version.getPreviewUrl(),
 				revertLabel: t('files_versions', 'Restore'),
+				canRevert: (this.collection.getFileInfo().get('permissions') & OC.PERMISSION_UPDATE) !== 0
 			}, version.attributes);
 		},
 
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index b14210af7b1..9a0fe0a7b37 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -320,8 +320,16 @@ class Storage {
 			// add expected leading slash
 			$file = '/' . ltrim($file, '/');
 			list($uid, $filename) = self::getUidAndFilename($file);
+			if ($uid === null || trim($filename, '/') === '') {
+				return false;
+			}
 			$users_view = new View('/'.$uid);
 			$files_view = new View('/'. User::getUser().'/files');
+
+			if (!$files_view->isUpdatable($filename)) {
+				return false;
+			}
+
 			$versionCreated = false;
 
 			$fileInfo = $files_view->getFileInfo($file);
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index 2a65682f0fe..832f7bcc66f 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -625,6 +625,40 @@ class VersioningTest extends \Test\TestCase {
 		$this->doTestRestore();
 	}
 
+	public function testRestoreNoPermission() {
+		$this->loginAsUser(self::TEST_VERSIONS_USER);
+
+		$userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
+		$node = $userHome->newFolder('folder');
+		$file = $node->newFile('test.txt');
+
+		$share = \OC::$server->getShareManager()->newShare();
+		$share->setNode($node)
+			->setShareType(\OCP\Share::SHARE_TYPE_USER)
+			->setSharedBy(self::TEST_VERSIONS_USER)
+			->setSharedWith(self::TEST_VERSIONS_USER2)
+			->setPermissions(\OCP\Constants::PERMISSION_READ);
+		$share = \OC::$server->getShareManager()->createShare($share);
+
+		$versions = $this->createAndCheckVersions(
+			\OC\Files\Filesystem::getView(),
+			'folder/test.txt'
+		);
+
+		$file->putContent('test file');
+
+		$this->loginAsUser(self::TEST_VERSIONS_USER2);
+
+		$firstVersion = current($versions);
+
+		$this->assertFalse(\OCA\Files_Versions\Storage::rollback('folder/test.txt', $firstVersion['version']), 'Revert did not happen');
+
+		$this->loginAsUser(self::TEST_VERSIONS_USER);
+
+		\OC::$server->getShareManager()->deleteShare($share);
+		$this->assertEquals('test file', $file->getContent(), 'File content has not changed');
+	}
+
 	/**
 	 * @param string $hookName name of hook called
 	 * @param string $params variable to receive parameters provided by hook
@@ -685,7 +719,7 @@ class VersioningTest extends \Test\TestCase {
 		$params = array();
 		$this->connectMockHooks('rollback', $params);
 
-		\OCA\Files_Versions\Storage::rollback('sub/test.txt', $t2);
+		$this->assertTrue(\OCA\Files_Versions\Storage::rollback('sub/test.txt', $t2));
 		$expectedParams = array(
 			'path' => '/sub/test.txt',
 		);
@@ -829,6 +863,8 @@ class VersioningTest extends \Test\TestCase {
 		// note: we cannot predict how many versions are created due to
 		// test run timing
 		$this->assertGreaterThan(0, count($versions));
+
+		return $versions;
 	}
 
 	/**
diff --git a/apps/files_versions/tests/js/versionstabviewSpec.js b/apps/files_versions/tests/js/versionstabviewSpec.js
index 306dd66be2a..94285c93aba 100644
--- a/apps/files_versions/tests/js/versionstabviewSpec.js
+++ b/apps/files_versions/tests/js/versionstabviewSpec.js
@@ -39,7 +39,8 @@ describe('OCA.Versions.VersionsTabView', function() {
 		fetchStub = sinon.stub(VersionCollection.prototype, 'fetch');
 		fileInfoModel = new OCA.Files.FileInfoModel({
 			id: 123,
-			name: 'test.txt'
+			name: 'test.txt',
+			permissions: OC.PERMISSION_READ | OC.PERMISSION_UPDATE
 		});
 		tabView = new VersionsTabView();
 		tabView.render();
@@ -86,12 +87,37 @@ describe('OCA.Versions.VersionsTabView', function() {
 			expect($item.find('.revertVersion').length).toEqual(1);
 			expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl());
 		});
+
+		it('does not render revert button when no update permissions', function() {
+
+			fileInfoModel.set('permissions', OC.PERMISSION_READ);
+			tabView.setFileInfo(fileInfoModel);
+			tabView.collection.set(testVersions);
+
+			var version1 = testVersions[0];
+			var version2 = testVersions[1];
+			var $versions = tabView.$el.find('.versions>li');
+			expect($versions.length).toEqual(2);
+			var $item = $versions.eq(0);
+			expect($item.find('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl());
+			expect($item.find('.versiondate').text()).toEqual('seconds ago');
+			expect($item.find('.revertVersion').length).toEqual(0);
+			expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl());
+
+			$item = $versions.eq(1);
+			expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl());
+			expect($item.find('.versiondate').text()).toEqual('2 days ago');
+			expect($item.find('.revertVersion').length).toEqual(0);
+			expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl());
+		});
 	});
 
 	describe('More versions', function() {
 		var hasMoreResultsStub;
 
 		beforeEach(function() {
+			tabView.setFileInfo(fileInfoModel);
+			fetchStub.reset();
 			tabView.collection.set(testVersions);
 			hasMoreResultsStub = sinon.stub(VersionCollection.prototype, 'hasMoreResults');
 		});
diff --git a/apps/systemtags/l10n/lb.js b/apps/systemtags/l10n/lb.js
index aa83421b4f1..6af879ce2f4 100644
--- a/apps/systemtags/l10n/lb.js
+++ b/apps/systemtags/l10n/lb.js
@@ -2,6 +2,28 @@ OC.L10N.register(
     "systemtags",
     {
     "Tags" : "Etiketten",
+    "Tagged files" : "Etikettéiert Fichieren",
+    "Select tags to filter by" : "Wiel d'Etiketten fir ze siften aus",
+    "Please select tags to filter by" : "Wiel w.e.g. d'Etiketten fir ze siften aus",
+    "No files found for the selected tags" : "Keng Fichieren fir d'ausgewielten Etiketten fonnt",
+    "<strong>System tags</strong> for a file have been modified" : "<strong>System Etiketten</strong> fir e Fichier goufen verännert",
+    "You assigned system tag %3$s" : "Du hues d'System Etikett %3$s zougewisen ",
+    "%1$s assigned system tag %3$s" : "%1$s zougewise System Etikett %3$s",
+    "You unassigned system tag %3$s" : "Du hues d'System Etikett %3$s ewechgeholl",
+    "%1$s unassigned system tag %3$s" : "%1$s System Etikett ewechgeholl %3$s",
+    "You created system tag %2$s" : "Du hues d'System Etikett %2$s erschafen",
+    "%1$s created system tag %2$s" : "%1$s System Etikett erschaf %2$s ",
+    "You deleted system tag %2$s" : "Du hues d'System Etikett %2$s ewechgeholl",
+    "%1$s deleted system tag %2$s" : "%1$s System Etikett ewechgeholl %2$s",
+    "You updated system tag %3$s to %2$s" : "Du hues d'System Etikett %3$s op %2$s erneiert",
+    "%1$s updated system tag %3$s to %2$s" : "%1$s System Etikett erneiert %3$s op %2$s",
+    "You assigned system tag %3$s to %2$s" : "Du hues d'System Etikett %3$s op %2$s zougewisen",
+    "%1$s assigned system tag %3$s to %2$s" : "%1$s zougewise System Etikett %3$s op %2$s",
+    "You unassigned system tag %3$s from %2$s" : "Du hues d'System Etikett %3$s vum %2$s ewechgeholl",
+    "%1$s unassigned system tag %3$s from %2$s" : "%1$s System Etikett ewechgeholl %3$s vum %2$s",
+    "%s (restricted)" : "%s (ageschränkt)",
+    "%s (invisible)" : "%s (onsiichtbar)",
+    "No files in here" : "Hei sinn keng Fichieren",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Name" : "Numm",
     "Size" : "Gréisst",
diff --git a/apps/systemtags/l10n/lb.json b/apps/systemtags/l10n/lb.json
index e905615bcd7..c94e08b607b 100644
--- a/apps/systemtags/l10n/lb.json
+++ b/apps/systemtags/l10n/lb.json
@@ -1,5 +1,27 @@
 { "translations": {
     "Tags" : "Etiketten",
+    "Tagged files" : "Etikettéiert Fichieren",
+    "Select tags to filter by" : "Wiel d'Etiketten fir ze siften aus",
+    "Please select tags to filter by" : "Wiel w.e.g. d'Etiketten fir ze siften aus",
+    "No files found for the selected tags" : "Keng Fichieren fir d'ausgewielten Etiketten fonnt",
+    "<strong>System tags</strong> for a file have been modified" : "<strong>System Etiketten</strong> fir e Fichier goufen verännert",
+    "You assigned system tag %3$s" : "Du hues d'System Etikett %3$s zougewisen ",
+    "%1$s assigned system tag %3$s" : "%1$s zougewise System Etikett %3$s",
+    "You unassigned system tag %3$s" : "Du hues d'System Etikett %3$s ewechgeholl",
+    "%1$s unassigned system tag %3$s" : "%1$s System Etikett ewechgeholl %3$s",
+    "You created system tag %2$s" : "Du hues d'System Etikett %2$s erschafen",
+    "%1$s created system tag %2$s" : "%1$s System Etikett erschaf %2$s ",
+    "You deleted system tag %2$s" : "Du hues d'System Etikett %2$s ewechgeholl",
+    "%1$s deleted system tag %2$s" : "%1$s System Etikett ewechgeholl %2$s",
+    "You updated system tag %3$s to %2$s" : "Du hues d'System Etikett %3$s op %2$s erneiert",
+    "%1$s updated system tag %3$s to %2$s" : "%1$s System Etikett erneiert %3$s op %2$s",
+    "You assigned system tag %3$s to %2$s" : "Du hues d'System Etikett %3$s op %2$s zougewisen",
+    "%1$s assigned system tag %3$s to %2$s" : "%1$s zougewise System Etikett %3$s op %2$s",
+    "You unassigned system tag %3$s from %2$s" : "Du hues d'System Etikett %3$s vum %2$s ewechgeholl",
+    "%1$s unassigned system tag %3$s from %2$s" : "%1$s System Etikett ewechgeholl %3$s vum %2$s",
+    "%s (restricted)" : "%s (ageschränkt)",
+    "%s (invisible)" : "%s (onsiichtbar)",
+    "No files in here" : "Hei sinn keng Fichieren",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Name" : "Numm",
     "Size" : "Gréisst",
diff --git a/apps/updatenotification/l10n/fr.js b/apps/updatenotification/l10n/fr.js
index 61381427700..afcc041fa51 100644
--- a/apps/updatenotification/l10n/fr.js
+++ b/apps/updatenotification/l10n/fr.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Update notifications" : "Notifications de mises à jour",
     "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations sur comment mettre à jour.",
     "Updated channel" : "Canal à jour",
+    "ownCloud core" : "Base d'ownCloud",
     "Update for %1$s to version %2$s is available." : "Une mise à jour de %1$s vers la version %2$s est disponible.",
     "Updater" : "Mises à jour",
     "A new version is available: %s" : "Une nouvelle version est disponible : %s",
@@ -12,6 +13,7 @@ OC.L10N.register(
     "Checked on %s" : "Vérifié le %s",
     "Update channel:" : "Canal de mise à jour :",
     "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Vous pouvez à tout moment mettre à jour vers une version plus récente ou un canal expérimental. Cependant vous ne pourrez jamais revenir à un canal plus stable.",
-    "Notify members of the following groups about available updates:" : "Notifier les membres des groupes suivants des mises à jours disponibles :"
+    "Notify members of the following groups about available updates:" : "Notifier les membres des groupes suivants des mises à jours disponibles :",
+    "Only notification for app updates are available, because the selected update channel for ownCloud itself does not allow notifications." : "Seules les notifications pour le mises à jour d'apllication sont disponibles, car le canal de mise à jour sélectionné pour ownCloud ne propose pas lui-même les mises à jour."
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/updatenotification/l10n/fr.json b/apps/updatenotification/l10n/fr.json
index 590c3cbb27d..0bd2bb57f83 100644
--- a/apps/updatenotification/l10n/fr.json
+++ b/apps/updatenotification/l10n/fr.json
@@ -2,6 +2,7 @@
     "Update notifications" : "Notifications de mises à jour",
     "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations sur comment mettre à jour.",
     "Updated channel" : "Canal à jour",
+    "ownCloud core" : "Base d'ownCloud",
     "Update for %1$s to version %2$s is available." : "Une mise à jour de %1$s vers la version %2$s est disponible.",
     "Updater" : "Mises à jour",
     "A new version is available: %s" : "Une nouvelle version est disponible : %s",
@@ -10,6 +11,7 @@
     "Checked on %s" : "Vérifié le %s",
     "Update channel:" : "Canal de mise à jour :",
     "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Vous pouvez à tout moment mettre à jour vers une version plus récente ou un canal expérimental. Cependant vous ne pourrez jamais revenir à un canal plus stable.",
-    "Notify members of the following groups about available updates:" : "Notifier les membres des groupes suivants des mises à jours disponibles :"
+    "Notify members of the following groups about available updates:" : "Notifier les membres des groupes suivants des mises à jours disponibles :",
+    "Only notification for app updates are available, because the selected update channel for ownCloud itself does not allow notifications." : "Seules les notifications pour le mises à jour d'apllication sont disponibles, car le canal de mise à jour sélectionné pour ownCloud ne propose pas lui-même les mises à jour."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/updatenotification/l10n/sl.js b/apps/updatenotification/l10n/sl.js
index a59a58731fb..550f2055d22 100644
--- a/apps/updatenotification/l10n/sl.js
+++ b/apps/updatenotification/l10n/sl.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Checked on %s" : "Zadnjič preverjeno %s",
     "Update channel:" : "Posodobi kanal:",
     "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Nadgradnja na višjo različico ali preizkusni kanal je vedno mogoča, ne pa tudi povrnitev na predhodno, bolj stabilno različico.",
-    "Notify members of the following groups about available updates:" : "Obvestite člane naslednjih skupin o posodobitvah, ki so na voljo:"
+    "Notify members of the following groups about available updates:" : "Obvestite člane naslednjih skupin o posodobitvah, ki so na voljo:",
+    "Only notification for app updates are available, because the selected update channel for ownCloud itself does not allow notifications." : "Na voljo so samo obvestila za posodobitev aplikacije, ker izbrani ownCloud posodobitveni kanal ne omogoča obveščanja."
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/updatenotification/l10n/sl.json b/apps/updatenotification/l10n/sl.json
index c96c9666fb1..c3575fcfacd 100644
--- a/apps/updatenotification/l10n/sl.json
+++ b/apps/updatenotification/l10n/sl.json
@@ -11,6 +11,7 @@
     "Checked on %s" : "Zadnjič preverjeno %s",
     "Update channel:" : "Posodobi kanal:",
     "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Nadgradnja na višjo različico ali preizkusni kanal je vedno mogoča, ne pa tudi povrnitev na predhodno, bolj stabilno različico.",
-    "Notify members of the following groups about available updates:" : "Obvestite člane naslednjih skupin o posodobitvah, ki so na voljo:"
+    "Notify members of the following groups about available updates:" : "Obvestite člane naslednjih skupin o posodobitvah, ki so na voljo:",
+    "Only notification for app updates are available, because the selected update channel for ownCloud itself does not allow notifications." : "Na voljo so samo obvestila za posodobitev aplikacije, ker izbrani ownCloud posodobitveni kanal ne omogoča obveščanja."
 },"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/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js
index 8ff1a2037e4..f0eb5d35297 100644
--- a/apps/user_ldap/l10n/he.js
+++ b/apps/user_ldap/l10n/he.js
@@ -97,6 +97,7 @@ OC.L10N.register(
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "נמנע מבקשות אוטומטיות של LDAP. מועדף עבור התקנות גדולות, אבל מחייב ידע מסויים של LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "הכנסת מסנני LDAP ידנית (מומלץ עבוק תיקיות גדולות)",
     "%s access is limited to users meeting these criteria:" : "%s גישה מוגבלת למשתמשים שעונים על קריטריונים אלו:",
+    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "העצמים הבסיסיים למשתמשים הם organizationalPerson, person, user, וכן inetOrgPerson. אם אינך בטוח איזה עצם לבחור, יש להתייעף עם מנהל התיקייה.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "הסינון קובע לאיזו משתמשי LDAP תהיה יכולת כניסה למקרה %s.",
     "Verify settings and count users" : "מאמת הגדרות וסופר משתמשים",
     "Saving" : "שמירה",
@@ -123,17 +124,21 @@ OC.L10N.register(
     "User Display Name Field" : "שדה שם תצוגה למשתמש",
     "The LDAP attribute to use to generate the user's display name." : "תכונת LDAP לשימוש כדי להפיק את שם התצוגה של המשתמש.",
     "2nd User Display Name Field" : "שדה שני לשם תצוגת משתמש",
+    "Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«." : "אופציונאלי. מאפיין LDAP שיתווסף לפני השם בסוגריים. לדוגמא »John Doe (john.doe@example.org)«.",
     "Base User Tree" : "עץ משתמש בסיסי",
     "One User Base DN per line" : "משתמש DN בסיסי אחד לשורה",
     "User Search Attributes" : "מאפייני חיפוש משתמש",
     "Optional; one attribute per line" : "אופציונאלי; מאפיין אחד בשורה",
     "Group Display Name Field" : "שדה שם תצוגה לקבוצה",
+    "The LDAP attribute to use to generate the groups's display name." : "מאפיין LDAP לשימוש בהפקת שם תצוגת הקבוצה.",
     "Base Group Tree" : "עץ קבוצה בסיסי",
     "One Group Base DN per line" : "קבוצת DN בסיסית לשורה",
     "Group Search Attributes" : "מאפייני חיפוש קבוצה",
     "Group-Member association" : "שיוך חברי-קבוצה",
     "Dynamic Group Member URL" : "נתיב חבר קבוצה דינמית",
+    "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "מאפיין LDAP שבעצם קבוצה מכיל נתיב חיפוש שקובע אילו עצמים שייכים לקבוצה. (הגדרה ריקה מבטלת אפשרות לחברות בקבוצה דינמית.)",
     "Nested Groups" : "קבוצות משנה",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "כאשר מופעל, קיימת תמיכה לקבוצות המכילות קבוצות משנה. (עובד רק אם מאפיין חבר הקבוצה מכיל DN-ים.)",
     "Paging chunksize" : "Paging chunksize",
     "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize משמש לחיפושי paged LDAP שעלולים להחזיר תוצאות גסות כמו ספירת משתמש או קבוצה. (הגדרה כ- 0 מנטרל חיפושי paged LDAP במצבים אלה.)",
     "Special Attributes" : "מאפיינים מיוחדים",
@@ -142,6 +147,7 @@ OC.L10N.register(
     "in bytes" : "בבתים",
     "Email Field" : "שדה דואר אלקטרוני",
     "User Home Folder Naming Rule" : "כלל קביעת שם תיקיית בית למשתמש",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "יש להשאיר ריק לשם משתמש (ברירת מחדל). לחילופין, יש להגדיר מאפיין LDAP/AD.",
     "Internal Username" : "שם משתמש פנימי",
     "Internal Username Attribute:" : "מאפיין שם משתמש פנימי:",
     "Override UUID detection" : "דריסת זיהוי UUID",
diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json
index 0ad2d1fc61b..75fa25130cc 100644
--- a/apps/user_ldap/l10n/he.json
+++ b/apps/user_ldap/l10n/he.json
@@ -95,6 +95,7 @@
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "נמנע מבקשות אוטומטיות של LDAP. מועדף עבור התקנות גדולות, אבל מחייב ידע מסויים של LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "הכנסת מסנני LDAP ידנית (מומלץ עבוק תיקיות גדולות)",
     "%s access is limited to users meeting these criteria:" : "%s גישה מוגבלת למשתמשים שעונים על קריטריונים אלו:",
+    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "העצמים הבסיסיים למשתמשים הם organizationalPerson, person, user, וכן inetOrgPerson. אם אינך בטוח איזה עצם לבחור, יש להתייעף עם מנהל התיקייה.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "הסינון קובע לאיזו משתמשי LDAP תהיה יכולת כניסה למקרה %s.",
     "Verify settings and count users" : "מאמת הגדרות וסופר משתמשים",
     "Saving" : "שמירה",
@@ -121,17 +122,21 @@
     "User Display Name Field" : "שדה שם תצוגה למשתמש",
     "The LDAP attribute to use to generate the user's display name." : "תכונת LDAP לשימוש כדי להפיק את שם התצוגה של המשתמש.",
     "2nd User Display Name Field" : "שדה שני לשם תצוגת משתמש",
+    "Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«." : "אופציונאלי. מאפיין LDAP שיתווסף לפני השם בסוגריים. לדוגמא »John Doe (john.doe@example.org)«.",
     "Base User Tree" : "עץ משתמש בסיסי",
     "One User Base DN per line" : "משתמש DN בסיסי אחד לשורה",
     "User Search Attributes" : "מאפייני חיפוש משתמש",
     "Optional; one attribute per line" : "אופציונאלי; מאפיין אחד בשורה",
     "Group Display Name Field" : "שדה שם תצוגה לקבוצה",
+    "The LDAP attribute to use to generate the groups's display name." : "מאפיין LDAP לשימוש בהפקת שם תצוגת הקבוצה.",
     "Base Group Tree" : "עץ קבוצה בסיסי",
     "One Group Base DN per line" : "קבוצת DN בסיסית לשורה",
     "Group Search Attributes" : "מאפייני חיפוש קבוצה",
     "Group-Member association" : "שיוך חברי-קבוצה",
     "Dynamic Group Member URL" : "נתיב חבר קבוצה דינמית",
+    "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "מאפיין LDAP שבעצם קבוצה מכיל נתיב חיפוש שקובע אילו עצמים שייכים לקבוצה. (הגדרה ריקה מבטלת אפשרות לחברות בקבוצה דינמית.)",
     "Nested Groups" : "קבוצות משנה",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "כאשר מופעל, קיימת תמיכה לקבוצות המכילות קבוצות משנה. (עובד רק אם מאפיין חבר הקבוצה מכיל DN-ים.)",
     "Paging chunksize" : "Paging chunksize",
     "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize משמש לחיפושי paged LDAP שעלולים להחזיר תוצאות גסות כמו ספירת משתמש או קבוצה. (הגדרה כ- 0 מנטרל חיפושי paged LDAP במצבים אלה.)",
     "Special Attributes" : "מאפיינים מיוחדים",
@@ -140,6 +145,7 @@
     "in bytes" : "בבתים",
     "Email Field" : "שדה דואר אלקטרוני",
     "User Home Folder Naming Rule" : "כלל קביעת שם תיקיית בית למשתמש",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "יש להשאיר ריק לשם משתמש (ברירת מחדל). לחילופין, יש להגדיר מאפיין LDAP/AD.",
     "Internal Username" : "שם משתמש פנימי",
     "Internal Username Attribute:" : "מאפיין שם משתמש פנימי:",
     "Override UUID detection" : "דריסת זיהוי UUID",
diff --git a/autotest-js.sh b/autotest-js.sh
index 2d8552811cf..475a61df59e 100755
--- a/autotest-js.sh
+++ b/autotest-js.sh
@@ -22,19 +22,7 @@ fi
 # update/install test packages
 mkdir -p "$PREFIX" && $NPM install --link --prefix "$PREFIX" || exit 3
 
-KARMA="$(which karma 2>/dev/null)"
-
-# If not installed globally, try local version
-if test -z "$KARMA"
-then
-	KARMA="$PREFIX/node_modules/karma/bin/karma"
-fi
-
-if test -z "$KARMA"
-then
-	echo 'Karma module executable not found' >&2
-	exit 2
-fi
+KARMA="$PREFIX/node_modules/karma/bin/karma"
 
 NODE_PATH='build/node_modules' KARMA_TESTSUITE="$1" $KARMA start tests/karma.config.js --single-run
 
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index af094772166..edb72d12205 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -1,13 +1,21 @@
 OC.L10N.register(
     "core",
     {
+    "Please select a file." : "Por favor esbilla un ficheru.",
+    "File is too big" : "Ficheru ye demasiáu grande",
+    "Invalid file provided" : "el ficheru apurríu nun ye válidu",
     "No image or file provided" : "Nun s'especificó nenguna imaxe o ficheru",
     "Unknown filetype" : "Triba de ficheru desconocida",
     "Invalid image" : "Imaxe inválida",
+    "An error occurred. Please contact your admin." : "Hebo un fallu. Por favor, contauta col to alministrador",
     "No temporary profile picture available, try again" : "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
     "No crop data provided" : "Nun s'apurrió'l retayu de datos",
+    "No valid crop data provided" : "El retayu de datos apurríu nun ye válidu",
+    "Crop is not square" : "El retayu nun ye cuadráu",
     "Couldn't reset password because the token is invalid" : "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
+    "Couldn't reset password because the token is expired" : "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
     "Couldn't send reset email. Please make sure your username is correct." : "Nun pudo unviase'l corréu. Por favor, asegurate que'l to nome d'usuariu seya correutu",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador.",
     "%s password reset" : "%s restablecer contraseña",
     "Couldn't send reset email. Please contact your administrator." : "Nun pudo unviase'l corréu de reaniciu. Por favor, contauta col alministrador.",
     "Error loading tags" : "Fallu cargando les etiquetes",
@@ -18,12 +26,31 @@ OC.L10N.register(
     "Error favoriting" : "Fallu al marcar favoritos",
     "Error unfavoriting" : "Fallu al desmarcar favoritos",
     "Couldn't send mail to following users: %s " : "Nun pudo unviase'l corréu a los usuarios siguientes: %s",
+    "Preparing update" : "Preparando anovamientu",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Reparar avisu:",
+    "Repair error: " : "Reparar erru:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Por favor, usa l'actualización de llínea de comandos porque l'actualización automática ta deshabilitada nel config.php.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Comprobando tabla %s",
     "Turned on maintenance mode" : "Activáu'l mou de caltenimientu",
     "Turned off maintenance mode" : "Apagáu'l mou de caltenimientu",
+    "Maintenance mode is kept active" : "La mou de caltenimientu caltiense activu",
+    "Updating database schema" : "Anovando esquema de base de datos",
     "Updated database" : "Base de datos anovada",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Comprobando si l'esquema de base de datos puede ser actualizáu (esto puede llevar tiempu abondo, dependiendo del tamañu la base de datos)",
     "Checked database schema update" : "Anovamientu del esquema de base de datos revisáu",
+    "Checking updates of apps" : "Comprobando anovamientos d'aplicaciones",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Comprobando si l'esquema de base de datos para %s puede ser actualizáu (esto puede llevar tiempu abondo, dependiendo del tamañu la base de datos)",
     "Checked database schema update for apps" : "Anovamientu del esquema de base de datos p'aplicaciones revisáu",
     "Updated \"%s\" to %s" : "Anováu \"%s\" a %s",
+    "Set log level to debug" : "Afita'l nivel de rexistru pa depurar",
+    "Reset log level" : "Reafitar nivel de rexistru",
+    "Starting code integrity check" : "Entamando la comprobación de la integridá del códigu",
+    "Finished code integrity check" : "Finada la comprobación de la integridá del códigu",
+    "%s (3rdparty)" : "%s (3rdparty)",
+    "%s (incompatible)" : "%s (incompatible)",
+    "Following apps have been disabled: %s" : "Siguientes aplicaciones deshabilitáronse: %s",
+    "Already up to date" : "Yá ta actualizáu",
     "Sunday" : "Domingu",
     "Monday" : "Llunes",
     "Tuesday" : "Martes",
@@ -38,6 +65,13 @@ OC.L10N.register(
     "Thu." : "Xue.",
     "Fri." : "Vie.",
     "Sat." : "Sáb.",
+    "Su" : "Do",
+    "Mo" : "Llu",
+    "Tu" : "Ma",
+    "We" : "Mie",
+    "Th" : "Xue",
+    "Fr" : "Vie",
+    "Sa" : "Sa",
     "January" : "Xineru",
     "February" : "Febreru",
     "March" : "Marzu",
@@ -62,7 +96,9 @@ OC.L10N.register(
     "Oct." : "Och.",
     "Nov." : "Pay.",
     "Dec." : "Avi.",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Hebo un problema cola comprobación de la integridá del códigu. Más información...</a>",
     "Settings" : "Axustes",
+    "Problem loading page, reloading in 5 seconds" : "Problema al cargar la páxina, volver cargar en 5 segundos",
     "Saving..." : "Guardando...",
     "Dismiss" : "Encaboxar",
     "seconds ago" : "hai segundos",
@@ -76,6 +112,7 @@ OC.L10N.register(
     "Error loading file picker template: {error}" : "Fallu cargando'l ficheru de plantía d'escoyeta: {error}",
     "Ok" : "Aceutar",
     "Error loading message template: {error}" : "Fallu cargando'l mensaxe de la plantía: {error}",
+    "read-only" : "namái llectura",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflictu de ficheru","{count} conflictos de ficheru "],
     "One file conflict" : "Conflictu nun ficheru",
     "New Files" : "Ficheros nuevos",
@@ -92,6 +129,20 @@ OC.L10N.register(
     "So-so password" : "Contraseña pasable",
     "Good password" : "Contraseña bona",
     "Strong password" : "Contraseña mui bona",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "El to sirvidor web nun ta configuráu correchamente pa resolver  \"{url}\". Pues atopar más información en nuesa documentación <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\"></a>.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Configuróse ensin la memoria caché. P'ameyorar el so rendimientu configure un Memcache si ta disponible. Puede atopar más información na nuesa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentación</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom nun ye llexible por PHP que amás nun ye recomendable por razones de seguridá. Pues atopar más información na nuesa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentación</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Ta executándose anguaño la {version} PHP. Convidamoste a actualizar la to versión PHP p'aprovechate del <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\"> rendimientu y actualizaciones de seguridá proporcionaes pol Grupu PHP</a> desque la so distribución sofitelo.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuración de les cabeceres de proxy inverses ye incorrecta , o tas aportando ownCloud dende un proxy d'enfotu . Si nun tas aportando a ownCloud dende un proxy d'enfotu, esto ye un problema de seguridá y puede dexar a un atacante falsificar la so dirección IP como visible pa ownCloud . Más información puede atopase na nuesa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentación</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached configúrase como caché distribuyida, pero instalóse'l módulu de PHP \"Memcache\" equivocáu.  \\OC\\Memcache\\Memcached namás almite \"memcached\"  y non  \"memcache\". Vea la <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\"> wiki memcached sobre ambos módulos</a> .",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Dellos arquivos nun pasaron la comprobación d'integridá. Pues atopas más información sobre cómo resolver esti problema na nuesa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\"> Llista de ficheros non válidos...</a>/ <a href=\"{rescanEndpoint}\">Volver a guetar…</a>)",
+    "Error occurred while checking server setup" : "Asocedió un fallu mientres se comprobaba la configuración del sirvidor",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web.",
+    "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" HTTP nun ta configurada pa igualar a \"{expected}\". Esto ye una seguridá o privacidá potencial de riesgu y encamentamos axustar esta opción.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "La cabecera HTTP \"Estrictu-Tresporte-Seguridá\" nun ta configurada pa siquier \"{seconds}\"  segundos. Pa mayor seguridá encamentámos-y habilitar HSTS como se describe en nuesos <a href=\"{docUrl}\" rel=\"noreferrer\">conseyos de seguridá</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Tas ingresando a esti sitiu vía HTTP. Encamentámoste que configures el sirvidor pa solicitar HTTPS como describimos en nuesos  <a href=\"{docUrl}\">conseyos de seguridá</a>.",
     "Shared" : "Compartíu",
     "Shared with {recipients}" : "Compartío con {recipients}",
     "Error" : "Fallu",
@@ -113,6 +164,7 @@ OC.L10N.register(
     "Send" : "Unviar",
     "Sending ..." : "Unviando ...",
     "Email sent" : "Corréu unviáu",
+    "Send link via email" : "Unviáu enllaz por email",
     "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
     "Shared with you by {owner}" : "Compartíu contigo por {owner}",
     "group" : "grupu",
@@ -125,17 +177,44 @@ OC.L10N.register(
     "change" : "camudar",
     "delete" : "desaniciar",
     "access control" : "control d'accesu",
+    "Could not unshare" : "Nun pudo dexase de compartir",
+    "Share details could not be loaded for this item." : "Los detalles de les acciones nun pudieron cargase por esti elementu.",
+    "No users or groups found for {search}" : "Nun s'atopó nengún usuariu o grupu por {search}",
+    "No users found for {search}" : "Nun s'atoparon usuarios por {search}",
+    "An error occurred. Please try again" : "Hebo un fallu. Por favor, inténtalo de nueves",
+    "{sharee} (group)" : "{sharee} (grupu)",
+    "{sharee} (at {server})" : "{sharee} (en {server})",
+    "{sharee} (remote)" : "{sharee} (remotu)",
     "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir con xente d'otros ownClouds usando la sintaxis usuariu@exemplu.com/owncloud",
+    "Share with users…" : "Compartir con usuarios...",
+    "Share with users, groups or remote users…" : "Compartir con usuarios, grupos o usuarios remotos...",
+    "Share with users or groups…" : "Compartir con usuarios o grupos...",
+    "Share with users or remote users…" : "Compartir con usuarios o usuarios remotos...",
+    "Error removing share" : "Fallu desaniciando compartición",
     "Warning" : "Avisu",
+    "Error while sending notification" : "Fallu mientres s'unviaba la notificación",
+    "Non-existing tag #{tag}" : "Nun esiste la etiqueta #{tag}",
+    "restricted" : "torgáu",
+    "invisible" : "invisible",
+    "({scope})" : "({scope})",
     "Delete" : "Desaniciar",
     "Rename" : "Renomar",
+    "Collaborative tags" : "Etiquetes colaboratives",
     "The object type is not specified." : "El tipu d'oxetu nun ta especificáu.",
     "Enter new" : "Introducir nueva",
     "Add" : "Amestar",
     "Edit tags" : "Editar etiquetes",
     "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
     "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
+    "unknown text" : "testu desconocíu",
+    "Hello world!" : "¡Hola mundiu!",
+    "sunny" : "soleyeru",
+    "Hello {name}, the weather is {weather}" : "Hola {name}, el tiempu ta {weather}",
+    "Hello {name}" : "Hola {name}",
+    "new" : "nuevu",
+    "_download %n file_::_download %n files_" : ["descargando %n ficheru","descargando %n ficheros"],
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "L'actualización ta en cursu, salir d'esta páxina podría atayar el procesu en dellos entornos.",
     "Please reload the page." : "Por favor, recarga la páxina",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "L'anovamientu fízose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>.",
     "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index ee885ba3272..58bd5f3fa85 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -1,11 +1,19 @@
 { "translations": {
+    "Please select a file." : "Por favor esbilla un ficheru.",
+    "File is too big" : "Ficheru ye demasiáu grande",
+    "Invalid file provided" : "el ficheru apurríu nun ye válidu",
     "No image or file provided" : "Nun s'especificó nenguna imaxe o ficheru",
     "Unknown filetype" : "Triba de ficheru desconocida",
     "Invalid image" : "Imaxe inválida",
+    "An error occurred. Please contact your admin." : "Hebo un fallu. Por favor, contauta col to alministrador",
     "No temporary profile picture available, try again" : "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
     "No crop data provided" : "Nun s'apurrió'l retayu de datos",
+    "No valid crop data provided" : "El retayu de datos apurríu nun ye válidu",
+    "Crop is not square" : "El retayu nun ye cuadráu",
     "Couldn't reset password because the token is invalid" : "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
+    "Couldn't reset password because the token is expired" : "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
     "Couldn't send reset email. Please make sure your username is correct." : "Nun pudo unviase'l corréu. Por favor, asegurate que'l to nome d'usuariu seya correutu",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador.",
     "%s password reset" : "%s restablecer contraseña",
     "Couldn't send reset email. Please contact your administrator." : "Nun pudo unviase'l corréu de reaniciu. Por favor, contauta col alministrador.",
     "Error loading tags" : "Fallu cargando les etiquetes",
@@ -16,12 +24,31 @@
     "Error favoriting" : "Fallu al marcar favoritos",
     "Error unfavoriting" : "Fallu al desmarcar favoritos",
     "Couldn't send mail to following users: %s " : "Nun pudo unviase'l corréu a los usuarios siguientes: %s",
+    "Preparing update" : "Preparando anovamientu",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Reparar avisu:",
+    "Repair error: " : "Reparar erru:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Por favor, usa l'actualización de llínea de comandos porque l'actualización automática ta deshabilitada nel config.php.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Comprobando tabla %s",
     "Turned on maintenance mode" : "Activáu'l mou de caltenimientu",
     "Turned off maintenance mode" : "Apagáu'l mou de caltenimientu",
+    "Maintenance mode is kept active" : "La mou de caltenimientu caltiense activu",
+    "Updating database schema" : "Anovando esquema de base de datos",
     "Updated database" : "Base de datos anovada",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Comprobando si l'esquema de base de datos puede ser actualizáu (esto puede llevar tiempu abondo, dependiendo del tamañu la base de datos)",
     "Checked database schema update" : "Anovamientu del esquema de base de datos revisáu",
+    "Checking updates of apps" : "Comprobando anovamientos d'aplicaciones",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Comprobando si l'esquema de base de datos para %s puede ser actualizáu (esto puede llevar tiempu abondo, dependiendo del tamañu la base de datos)",
     "Checked database schema update for apps" : "Anovamientu del esquema de base de datos p'aplicaciones revisáu",
     "Updated \"%s\" to %s" : "Anováu \"%s\" a %s",
+    "Set log level to debug" : "Afita'l nivel de rexistru pa depurar",
+    "Reset log level" : "Reafitar nivel de rexistru",
+    "Starting code integrity check" : "Entamando la comprobación de la integridá del códigu",
+    "Finished code integrity check" : "Finada la comprobación de la integridá del códigu",
+    "%s (3rdparty)" : "%s (3rdparty)",
+    "%s (incompatible)" : "%s (incompatible)",
+    "Following apps have been disabled: %s" : "Siguientes aplicaciones deshabilitáronse: %s",
+    "Already up to date" : "Yá ta actualizáu",
     "Sunday" : "Domingu",
     "Monday" : "Llunes",
     "Tuesday" : "Martes",
@@ -36,6 +63,13 @@
     "Thu." : "Xue.",
     "Fri." : "Vie.",
     "Sat." : "Sáb.",
+    "Su" : "Do",
+    "Mo" : "Llu",
+    "Tu" : "Ma",
+    "We" : "Mie",
+    "Th" : "Xue",
+    "Fr" : "Vie",
+    "Sa" : "Sa",
     "January" : "Xineru",
     "February" : "Febreru",
     "March" : "Marzu",
@@ -60,7 +94,9 @@
     "Oct." : "Och.",
     "Nov." : "Pay.",
     "Dec." : "Avi.",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Hebo un problema cola comprobación de la integridá del códigu. Más información...</a>",
     "Settings" : "Axustes",
+    "Problem loading page, reloading in 5 seconds" : "Problema al cargar la páxina, volver cargar en 5 segundos",
     "Saving..." : "Guardando...",
     "Dismiss" : "Encaboxar",
     "seconds ago" : "hai segundos",
@@ -74,6 +110,7 @@
     "Error loading file picker template: {error}" : "Fallu cargando'l ficheru de plantía d'escoyeta: {error}",
     "Ok" : "Aceutar",
     "Error loading message template: {error}" : "Fallu cargando'l mensaxe de la plantía: {error}",
+    "read-only" : "namái llectura",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflictu de ficheru","{count} conflictos de ficheru "],
     "One file conflict" : "Conflictu nun ficheru",
     "New Files" : "Ficheros nuevos",
@@ -90,6 +127,20 @@
     "So-so password" : "Contraseña pasable",
     "Good password" : "Contraseña bona",
     "Strong password" : "Contraseña mui bona",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "El to sirvidor web nun ta configuráu correchamente pa resolver  \"{url}\". Pues atopar más información en nuesa documentación <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\"></a>.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Configuróse ensin la memoria caché. P'ameyorar el so rendimientu configure un Memcache si ta disponible. Puede atopar más información na nuesa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentación</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom nun ye llexible por PHP que amás nun ye recomendable por razones de seguridá. Pues atopar más información na nuesa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentación</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Ta executándose anguaño la {version} PHP. Convidamoste a actualizar la to versión PHP p'aprovechate del <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\"> rendimientu y actualizaciones de seguridá proporcionaes pol Grupu PHP</a> desque la so distribución sofitelo.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuración de les cabeceres de proxy inverses ye incorrecta , o tas aportando ownCloud dende un proxy d'enfotu . Si nun tas aportando a ownCloud dende un proxy d'enfotu, esto ye un problema de seguridá y puede dexar a un atacante falsificar la so dirección IP como visible pa ownCloud . Más información puede atopase na nuesa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentación</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached configúrase como caché distribuyida, pero instalóse'l módulu de PHP \"Memcache\" equivocáu.  \\OC\\Memcache\\Memcached namás almite \"memcached\"  y non  \"memcache\". Vea la <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\"> wiki memcached sobre ambos módulos</a> .",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Dellos arquivos nun pasaron la comprobación d'integridá. Pues atopas más información sobre cómo resolver esti problema na nuesa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\"> Llista de ficheros non válidos...</a>/ <a href=\"{rescanEndpoint}\">Volver a guetar…</a>)",
+    "Error occurred while checking server setup" : "Asocedió un fallu mientres se comprobaba la configuración del sirvidor",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web.",
+    "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" HTTP nun ta configurada pa igualar a \"{expected}\". Esto ye una seguridá o privacidá potencial de riesgu y encamentamos axustar esta opción.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "La cabecera HTTP \"Estrictu-Tresporte-Seguridá\" nun ta configurada pa siquier \"{seconds}\"  segundos. Pa mayor seguridá encamentámos-y habilitar HSTS como se describe en nuesos <a href=\"{docUrl}\" rel=\"noreferrer\">conseyos de seguridá</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Tas ingresando a esti sitiu vía HTTP. Encamentámoste que configures el sirvidor pa solicitar HTTPS como describimos en nuesos  <a href=\"{docUrl}\">conseyos de seguridá</a>.",
     "Shared" : "Compartíu",
     "Shared with {recipients}" : "Compartío con {recipients}",
     "Error" : "Fallu",
@@ -111,6 +162,7 @@
     "Send" : "Unviar",
     "Sending ..." : "Unviando ...",
     "Email sent" : "Corréu unviáu",
+    "Send link via email" : "Unviáu enllaz por email",
     "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
     "Shared with you by {owner}" : "Compartíu contigo por {owner}",
     "group" : "grupu",
@@ -123,17 +175,44 @@
     "change" : "camudar",
     "delete" : "desaniciar",
     "access control" : "control d'accesu",
+    "Could not unshare" : "Nun pudo dexase de compartir",
+    "Share details could not be loaded for this item." : "Los detalles de les acciones nun pudieron cargase por esti elementu.",
+    "No users or groups found for {search}" : "Nun s'atopó nengún usuariu o grupu por {search}",
+    "No users found for {search}" : "Nun s'atoparon usuarios por {search}",
+    "An error occurred. Please try again" : "Hebo un fallu. Por favor, inténtalo de nueves",
+    "{sharee} (group)" : "{sharee} (grupu)",
+    "{sharee} (at {server})" : "{sharee} (en {server})",
+    "{sharee} (remote)" : "{sharee} (remotu)",
     "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir con xente d'otros ownClouds usando la sintaxis usuariu@exemplu.com/owncloud",
+    "Share with users…" : "Compartir con usuarios...",
+    "Share with users, groups or remote users…" : "Compartir con usuarios, grupos o usuarios remotos...",
+    "Share with users or groups…" : "Compartir con usuarios o grupos...",
+    "Share with users or remote users…" : "Compartir con usuarios o usuarios remotos...",
+    "Error removing share" : "Fallu desaniciando compartición",
     "Warning" : "Avisu",
+    "Error while sending notification" : "Fallu mientres s'unviaba la notificación",
+    "Non-existing tag #{tag}" : "Nun esiste la etiqueta #{tag}",
+    "restricted" : "torgáu",
+    "invisible" : "invisible",
+    "({scope})" : "({scope})",
     "Delete" : "Desaniciar",
     "Rename" : "Renomar",
+    "Collaborative tags" : "Etiquetes colaboratives",
     "The object type is not specified." : "El tipu d'oxetu nun ta especificáu.",
     "Enter new" : "Introducir nueva",
     "Add" : "Amestar",
     "Edit tags" : "Editar etiquetes",
     "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
     "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
+    "unknown text" : "testu desconocíu",
+    "Hello world!" : "¡Hola mundiu!",
+    "sunny" : "soleyeru",
+    "Hello {name}, the weather is {weather}" : "Hola {name}, el tiempu ta {weather}",
+    "Hello {name}" : "Hola {name}",
+    "new" : "nuevu",
+    "_download %n file_::_download %n files_" : ["descargando %n ficheru","descargando %n ficheros"],
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "L'actualización ta en cursu, salir d'esta páxina podría atayar el procesu en dellos entornos.",
     "Please reload the page." : "Por favor, recarga la páxina",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "L'anovamientu fízose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>.",
     "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index 5c00a8f707c..5f4e11ea7ab 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -29,6 +29,7 @@ OC.L10N.register(
     "Preparing update" : "Forbereder opdatering",
     "Repair warning: " : "Reparationsadvarsel:",
     "Repair error: " : "Reparationsfejl:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Brug kommandolinje-updateren, da automatisk opdatering er slået fra i config.php",
     "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
     "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
     "Maintenance mode is kept active" : "Vedligeholdelsestilstanden holdes kørende",
@@ -93,7 +94,9 @@ OC.L10N.register(
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Der var problemer med integritetskontrollen af koden. Mere information...</a>",
     "Settings" : "Indstillinger",
+    "Problem loading page, reloading in 5 seconds" : "Problem med indlæsning af side, genindlæser om 5 sekunder",
     "Saving..." : "Gemmer...",
     "Dismiss" : "Afvis",
     "seconds ago" : "sekunder siden",
@@ -126,9 +129,16 @@ OC.L10N.register(
     "Strong password" : "Stærkt kodeord",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat korrekt op til at tillade filsynkronisering, fordi WebDAV-grænsefladen ser ud til at være i stykker.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af applikationer fra tredjepart ikke fungerer. Det vil sandsynligvis heller ikke være muligt at tilgå filer fra eksterne drev eller afsendelse af e-mail med notifikationer virker sandsynligvis heller ikke. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Der er ikke konfigureret noget hukommelsesmellemlager. For at forbedre din ydelse bør du om muligt konfigurere en mamcache. Yderligere information findes i <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentationen</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke læses af PHP, hvilket stærkt frarådes af sikkerhedsgrunde. Yderligere information kan findes i vores <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du kører i øjeblikket med PHP {version}. Vi anbefaler dig at opgradere din PHP version for at få glæde af <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">ydelses- og sikkerhedsopdateringer udgivet af the PHP Group</a> så snart din dintribution understøtter dem.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurationen af reverse proxy-headere er ikke korrekt eller du tilgår ownCloud fra en betroet proxy. Hvis du ikke tilgår ownCloud fra en betroet proxy, så er dette et sikkerhedsproblem og kan tillade en angriber af forfalske deres IP-adresse som synlig for ownCloud. Yderligere information kan findes i vores <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er konfigureret som et distribueret mellemlager, men det forkerte PHP-modul \"memcache\" er installeret. \\OC\\Memcache\\Memcached understøtter kun \"memcached\" og ikke \"memcache\". Se <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached-wikien om begge moduler</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Nogle filer har ikke bestået integritetskontrollen. Yderligere information om hvordan man løser dette problem kan findes i vores <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dodumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste over ugyldige filer...</a> / <a href=\"{rescanEndpoint}\">Scan igen…</a>)",
     "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. Filen .htaccess fungerer ikke. Vi anbefaler på det kraftigste, at du konfigurerer din webserver således at datamappen ikke længere er tilgængelig, eller at du flytter datamappen uden for webserverens dokumentrod.  ",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-hovedet \"{header}\" er ikke konfigureret til at være lig med \"{expected}\". Dette er en potentiel sikkerhedsrisiko, og vi anbefaler at du justerer denne indstilling.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP headeren \"Strict-Transport-Security\" er ikke konfigureret til mindst \"{seconds}\" sekunder. For bedre sikkerhed anbefaler vi at aktivere HSTS som beskrevet i vores <a href=\"{docUrl}\" rel=\"noreferrer\">sikkerhedstips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du tilgår dette sted gennem HTTP. Vi anbefaler kraftigt at du konfigurerer din server, så der kræves brug af HTTPS i stedet for, som foreskrevet i vores <a href=\"{docUrl}\">sikkerhedstips</a>.",
     "Shared" : "Delt",
     "Shared with {recipients}" : "Delt med {recipients}",
@@ -151,6 +161,7 @@ OC.L10N.register(
     "Send" : "Send",
     "Sending ..." : "Sender ...",
     "Email sent" : "E-mail afsendt",
+    "Send link via email" : "Send link via e-mail",
     "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
     "Shared with you by {owner}" : "Delt med dig af {owner}",
     "group" : "gruppe",
@@ -163,12 +174,22 @@ OC.L10N.register(
     "change" : "tilpas",
     "delete" : "slet",
     "access control" : "Adgangskontrol",
+    "Could not unshare" : "Kunne ikke ophæve deling",
     "Share details could not be loaded for this item." : "Detaljer for deling kunne ikke indlæses for dette element.",
+    "No users or groups found for {search}" : "Ingen brugere eller grupper fundet for {search}",
+    "No users found for {search}" : "Ingen brugere fundet for {search}",
+    "An error occurred. Please try again" : "Der opstor den fejl. Prøv igen",
     "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
+    "Share with users…" : "Del med brugere...",
+    "Share with users, groups or remote users…" : "Del med brugere, grupper eller eksterne brugere...",
+    "Share with users or groups…" : "Del med brugere eller grupper...",
+    "Share with users or remote users…" : "Del med brugere eller eksterne brugere...",
     "Error removing share" : "Fejl ved fjernelse af deling",
     "Warning" : "Advarsel",
     "Error while sending notification" : "Fejl ved afsendelse af notifikation",
+    "Non-existing tag #{tag}" : "Ikke-eksisterende mærke #{tag}",
+    "restricted" : "begrænset",
     "invisible" : "usynlig",
     "Delete" : "Slet",
     "Rename" : "Omdøb",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index d098478d529..04fda2aab4b 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -27,6 +27,7 @@
     "Preparing update" : "Forbereder opdatering",
     "Repair warning: " : "Reparationsadvarsel:",
     "Repair error: " : "Reparationsfejl:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Brug kommandolinje-updateren, da automatisk opdatering er slået fra i config.php",
     "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
     "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
     "Maintenance mode is kept active" : "Vedligeholdelsestilstanden holdes kørende",
@@ -91,7 +92,9 @@
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Der var problemer med integritetskontrollen af koden. Mere information...</a>",
     "Settings" : "Indstillinger",
+    "Problem loading page, reloading in 5 seconds" : "Problem med indlæsning af side, genindlæser om 5 sekunder",
     "Saving..." : "Gemmer...",
     "Dismiss" : "Afvis",
     "seconds ago" : "sekunder siden",
@@ -124,9 +127,16 @@
     "Strong password" : "Stærkt kodeord",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat korrekt op til at tillade filsynkronisering, fordi WebDAV-grænsefladen ser ud til at være i stykker.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af applikationer fra tredjepart ikke fungerer. Det vil sandsynligvis heller ikke være muligt at tilgå filer fra eksterne drev eller afsendelse af e-mail med notifikationer virker sandsynligvis heller ikke. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Der er ikke konfigureret noget hukommelsesmellemlager. For at forbedre din ydelse bør du om muligt konfigurere en mamcache. Yderligere information findes i <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentationen</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke læses af PHP, hvilket stærkt frarådes af sikkerhedsgrunde. Yderligere information kan findes i vores <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du kører i øjeblikket med PHP {version}. Vi anbefaler dig at opgradere din PHP version for at få glæde af <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">ydelses- og sikkerhedsopdateringer udgivet af the PHP Group</a> så snart din dintribution understøtter dem.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurationen af reverse proxy-headere er ikke korrekt eller du tilgår ownCloud fra en betroet proxy. Hvis du ikke tilgår ownCloud fra en betroet proxy, så er dette et sikkerhedsproblem og kan tillade en angriber af forfalske deres IP-adresse som synlig for ownCloud. Yderligere information kan findes i vores <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er konfigureret som et distribueret mellemlager, men det forkerte PHP-modul \"memcache\" er installeret. \\OC\\Memcache\\Memcached understøtter kun \"memcached\" og ikke \"memcache\". Se <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached-wikien om begge moduler</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Nogle filer har ikke bestået integritetskontrollen. Yderligere information om hvordan man løser dette problem kan findes i vores <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dodumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste over ugyldige filer...</a> / <a href=\"{rescanEndpoint}\">Scan igen…</a>)",
     "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. Filen .htaccess fungerer ikke. Vi anbefaler på det kraftigste, at du konfigurerer din webserver således at datamappen ikke længere er tilgængelig, eller at du flytter datamappen uden for webserverens dokumentrod.  ",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-hovedet \"{header}\" er ikke konfigureret til at være lig med \"{expected}\". Dette er en potentiel sikkerhedsrisiko, og vi anbefaler at du justerer denne indstilling.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP headeren \"Strict-Transport-Security\" er ikke konfigureret til mindst \"{seconds}\" sekunder. For bedre sikkerhed anbefaler vi at aktivere HSTS som beskrevet i vores <a href=\"{docUrl}\" rel=\"noreferrer\">sikkerhedstips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du tilgår dette sted gennem HTTP. Vi anbefaler kraftigt at du konfigurerer din server, så der kræves brug af HTTPS i stedet for, som foreskrevet i vores <a href=\"{docUrl}\">sikkerhedstips</a>.",
     "Shared" : "Delt",
     "Shared with {recipients}" : "Delt med {recipients}",
@@ -149,6 +159,7 @@
     "Send" : "Send",
     "Sending ..." : "Sender ...",
     "Email sent" : "E-mail afsendt",
+    "Send link via email" : "Send link via e-mail",
     "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
     "Shared with you by {owner}" : "Delt med dig af {owner}",
     "group" : "gruppe",
@@ -161,12 +172,22 @@
     "change" : "tilpas",
     "delete" : "slet",
     "access control" : "Adgangskontrol",
+    "Could not unshare" : "Kunne ikke ophæve deling",
     "Share details could not be loaded for this item." : "Detaljer for deling kunne ikke indlæses for dette element.",
+    "No users or groups found for {search}" : "Ingen brugere eller grupper fundet for {search}",
+    "No users found for {search}" : "Ingen brugere fundet for {search}",
+    "An error occurred. Please try again" : "Der opstor den fejl. Prøv igen",
     "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
+    "Share with users…" : "Del med brugere...",
+    "Share with users, groups or remote users…" : "Del med brugere, grupper eller eksterne brugere...",
+    "Share with users or groups…" : "Del med brugere eller grupper...",
+    "Share with users or remote users…" : "Del med brugere eller eksterne brugere...",
     "Error removing share" : "Fejl ved fjernelse af deling",
     "Warning" : "Advarsel",
     "Error while sending notification" : "Fejl ved afsendelse af notifikation",
+    "Non-existing tag #{tag}" : "Ikke-eksisterende mærke #{tag}",
+    "restricted" : "begrænset",
     "invisible" : "usynlig",
     "Delete" : "Slet",
     "Rename" : "Omdøb",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 0d684bd352f..fc4240e89a0 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -297,7 +297,9 @@ OC.L10N.register(
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Veuillez contacter votre administrateur système si ce message persiste ou apparaît de façon inattendue.",
     "Thank you for your patience." : "Merci de votre patience.",
     "Two-step verification" : "Vérification en deux étapes",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La sécurité renforcée a été activée pour votre compte. Veuillez vous identifier en utilisant un deuxième facteur.",
     "Cancel login" : "Annuler la connexion",
+    "Please authenticate using the selected factor." : "Veuillez vous identifier en utilisant le facteur sélectionné.",
     "An error occured while verifying the token" : "Une erreur est survenue lors de la vérification du jeton",
     "You are accessing the server from an untrusted domain." : "Vous accédez au serveur à partir d'un domaine non approuvé.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Veuillez contacter votre administrateur. Si vous être l'administrateur de cette instance, configurez la variable \"trusted_domains\" dans le fichier config/config.php. Un exemple de configuration est fournit dans le fichier config/config.sample.php.",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 9f1abd91484..b7934e8e6ed 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -295,7 +295,9 @@
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Veuillez contacter votre administrateur système si ce message persiste ou apparaît de façon inattendue.",
     "Thank you for your patience." : "Merci de votre patience.",
     "Two-step verification" : "Vérification en deux étapes",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La sécurité renforcée a été activée pour votre compte. Veuillez vous identifier en utilisant un deuxième facteur.",
     "Cancel login" : "Annuler la connexion",
+    "Please authenticate using the selected factor." : "Veuillez vous identifier en utilisant le facteur sélectionné.",
     "An error occured while verifying the token" : "Une erreur est survenue lors de la vérification du jeton",
     "You are accessing the server from an untrusted domain." : "Vous accédez au serveur à partir d'un domaine non approuvé.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Veuillez contacter votre administrateur. Si vous être l'administrateur de cette instance, configurez la variable \"trusted_domains\" dans le fichier config/config.php. Un exemple de configuration est fournit dans le fichier config/config.sample.php.",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index dfd8e7a0f62..5238ada0b3a 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -1,15 +1,42 @@
 OC.L10N.register(
     "core",
     {
+    "Please select a file." : "Wiel w.e.g. e Fichier aus.",
+    "File is too big" : "De Fichier ass ze grouss",
+    "Invalid file provided" : "Ongültege Fichier uginn",
     "No image or file provided" : "Kee Bild oder Fichier uginn",
     "Unknown filetype" : "Onbekannten Fichier Typ",
-    "Invalid image" : "Ongülteg d'Bild",
+    "Invalid image" : "Ongültegt Bild",
+    "An error occurred. Please contact your admin." : "Et ass e Feeler opgetrueden. W.e.g. kontaktéier däin Administrateur.",
+    "No temporary profile picture available, try again" : "Et ass keen temporäert Profilbild verfügbar, versich et nach emol.",
+    "Couldn't reset password because the token is invalid" : "D'Passwuert konnt net zeréck gesat ginn well den Token ongülteg ass",
+    "Couldn't reset password because the token is expired" : "D'Passwuert konnt net zeréck gesat ginn well den Token ofgelaf ass",
+    "Couldn't send reset email. Please make sure your username is correct." : "D'Email konnt net zeréck gesat ginn. Iwwerpréif w.e.g. op däi Passwuert richteg ass.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "D'Email fir zeréck ze setzen konnt net geschéckt ginn well et keng gülteg Emailadresse fir dëse Benotzernumm gëtt. W.e.g. kontaktéier däin Administrateur.",
     "%s password reset" : "%s Passwuert ass nei gesat",
+    "Couldn't send reset email. Please contact your administrator." : "D'Email fir zeréck ze setzen konnt net geschéckt ginn. W.e.g. kontaktéier däin Administrateur.",
     "Error tagging" : "Fehler beim Taggen",
     "Error untagging" : "Fehler beim Tag läschen",
+    "Error favoriting" : "Feeler beim favoriséieren",
+    "Error unfavoriting" : "Feeler beim defavoriséieren",
+    "Couldn't send mail to following users: %s " : "D'Email fir de folgende Benotzer konnt net geschéckt ginn: %s",
+    "Preparing update" : "D'Aktualiséierung gëtt virbereet",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Reparatur Warnung:",
+    "Repair error: " : "Reparéier de Feeler:",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Tabell gëtt gepréift %s",
     "Turned on maintenance mode" : "Maintenance Modus ass un",
     "Turned off maintenance mode" : "Maintenance Modus ass aus",
+    "Maintenance mode is kept active" : "De Maintenance Modus gëtt aktiv gehalen",
+    "Updating database schema" : "D'Schema vun der Datebank gëtt aktualiséiert",
     "Updated database" : "Datebank ass geupdate ginn",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Et gëtt gepréift ob d'Schema vun der Datebank aktualiséiert ka ginn (dëst kann ofhängeg vun der Gréisst vun der Datebank eng länger Zäit daueren)",
+    "Checked database schema update" : "D'Aktualiséierung vum Schema vun der Datebank gouf gepréift",
+    "Checking updates of apps" : "D'Aktualiséierung vun den Apps gëtt gepréift",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Et gëtt gepréift ob d'Schema vun der Datebank fir %s aktualiséiert ka ginn (dëst kann ofhängeg vun der Datebank eng länger Zäit daueren)",
+    "Checked database schema update for apps" : "D'Aktualiséierung vum Schema vun der Datebank fir Applikatioune gouf gepréift",
+    "Updated \"%s\" to %s" : "\"%s\" gouf op %s aktualiséiert",
+    "Already up to date" : "Schonn um neiste Stand",
     "Sunday" : "Sonndeg",
     "Monday" : "Méindeg",
     "Tuesday" : "Dënschdeg",
@@ -24,6 +51,13 @@ OC.L10N.register(
     "Thu." : "Do.",
     "Fri." : "Fr.",
     "Sat." : "Sa.",
+    "Su" : "SO",
+    "Mo" : "ME",
+    "Tu" : "DE",
+    "We" : "ME",
+    "Th" : "DO",
+    "Fr" : "FR",
+    "Sa" : "SA",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mäerz",
@@ -49,35 +83,63 @@ OC.L10N.register(
     "Nov." : "Nov.",
     "Dec." : "Dez.",
     "Settings" : "Astellungen",
+    "Problem loading page, reloading in 5 seconds" : "Et gouf e Problem beim Luede vun der Säit, a 5 Sekonnen gëtt nei gelueden",
     "Saving..." : "Speicheren...",
+    "Dismiss" : "Verworf",
     "seconds ago" : "Sekonnen hier",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "De Link fir d'Passwuert zeréckzesetzen gouf un deng E-Mail-Adress geschéckt. Falls d'Mail net enger raisonnabeler Zäitspan ukënnt, kuck w.e.g. an dengem Spam-Dossier. Wann do och keng Mail ass, fro w.e.g. däin Administrateur.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert bis zeréckgesat gouf. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.g. däin Administrateur éiers de weiderfiers. Bass de sécher dass de weidermaache wëlls?",
+    "I know what I'm doing" : "Ech weess wat ech maachen",
+    "Password can not be changed. Please contact your administrator." : "D'Passwuert kann net geännert ginn. W.e.g. kontaktéier däin Administrateur.",
     "No" : "Nee",
     "Yes" : "Jo",
     "Choose" : "Auswielen",
     "Ok" : "OK",
+    "Error loading message template: {error}" : "Feeler beim Luede vun der Noorichte Virlag: {Feeler}",
+    "read-only" : "Nëmme liesen",
+    "New Files" : "Nei Fichieren",
+    "Already existing files" : "D'Fichieren existéiere schonn",
     "Which files do you want to keep?" : "Weieng Fichieren wëlls de gär behalen?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wann s de déi zwou Versiounen auswiels kritt de kopéierte Fichier eng Nummer bei den Numm derbäi gesat",
     "Cancel" : "Ofbriechen",
     "Continue" : "Weider",
     "(all selected)" : "(all ausgewielt)",
     "({count} selected)" : "({count} ausgewielt)",
+    "Error loading file exists template" : "Feeler beim Luede vum Fichier existéiert eng Virlag",
+    "Very weak password" : "Ganz schwaacht Passwuert",
+    "Weak password" : "Schwaacht Passwuert",
+    "So-so password" : "La-La Passwuert",
+    "Good password" : "Gutt Passwuert",
+    "Strong password" : "Staarkt Passwuert",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Däi Web Server ass net richteg agestallt fir d'Fichier Selektioun ze erlaben well den WebDAV Interface schéngt futti ze sinn.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Däi Web Server ass net richteg agestallt fir \"{url}\" ze léisen. Méi Informatiounen fënns de op eisem <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentatioun</a>.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "D'Internet Verbindung fir dëse Server funktionéiert net. Dat bedeit dass e puer vun dëse Funktiounen wéi eng extern Späicherplaz ariichten, Notifikatiounen iwwer Aktualiséierungen oder d'Installéieren vu friemen Apps net funktionéiere wäert. Fichieren op Distanz erreechen an d'Schécke vu Notifikatioun Emailen kéinnten och net funktionéieren. Mir roden fir d'Internet Verbindung fir dëse Server hierzestellen wann s de all d'Funktioune wëlls hunn.",
     "Shared" : "Gedeelt",
+    "Shared with {recipients}" : "Gedeelt mat {Empfänger}",
     "Error" : "Feeler",
     "Error while sharing" : "Feeler beim Deelen",
     "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
     "Error setting expiration date" : "Feeler beim Setze vum Verfallsdatum",
+    "The public link will expire no later than {days} days after it is created" : "Den ëffentleche Link wäert net méi spéit wéi {Deeg} Deeg nodeems et erstallt gouf verfalen ",
     "Set expiration date" : "Verfallsdatum setzen",
+    "Expiration" : "Leeft of",
     "Expiration date" : "Verfallsdatum",
+    "Choose a password for the public link" : "Wiel e Passwuert fir den ëffentleche Link aus",
     "Resharing is not allowed" : "Weiderdeelen ass net erlaabt",
     "Share link" : "Link deelen",
+    "Link" : "Link",
     "Password protect" : "Passwuertgeschützt",
     "Password" : "Passwuert",
+    "Allow editing" : "Beaarbechten erlaben",
     "Email link to person" : "Link enger Persoun mailen",
     "Send" : "Schécken",
     "Sending ..." : "Gëtt geschéckt...",
     "Email sent" : "Email geschéckt",
+    "Send link via email" : "De Link iwwer E-Mail schécken",
     "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
     "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
     "group" : "Grupp",
+    "remote" : "Op Distanz",
     "notify by email" : "via e-mail Bescheed ginn",
     "Unshare" : "Net méi deelen",
     "can share" : "kann deelen",
@@ -86,42 +148,127 @@ OC.L10N.register(
     "change" : "änneren",
     "delete" : "läschen",
     "access control" : "Zougrëffskontroll",
+    "Could not unshare" : "Konnt net ongedeelt ginn",
+    "Share details could not be loaded for this item." : "D'Detailer vum Deelen konnten net geluede ginn fir dësen Artikel.",
+    "No users or groups found for {search}" : "Keng Benotzer oder Gruppe fonnt fir {Sich}",
+    "No users found for {search}" : "Keng Benotzer fonnt fir {Sich}",
+    "An error occurred. Please try again" : "Et ass e Fehler opgetrueden. W.e.g. probéier nach emol",
     "Share" : "Deelen",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mat Leit vun aneren ownCloud deelen, déi d'Syntax username@example.com/owncloud benotzen",
+    "Share with users…" : "Mat Benotzer deelen ...",
+    "Share with users, groups or remote users…" : "Mat Benotzer, Gruppen oder Benotzer op Distanz deelen ...",
+    "Share with users or groups…" : "Mat Benotzer oder Gruppen deelen...",
+    "Share with users or remote users…" : "Mat Benotzer oder mat Benotzer op Distanz deelen ...",
+    "Error removing share" : "Fehler beim Läschen vum Bäitrag",
     "Warning" : "Warnung",
+    "Error while sending notification" : "Feeler beim Schécke vun der Notifikatioun",
+    "restricted" : "Ageschränkt",
+    "invisible" : "Onsiichtbar",
     "Delete" : "Läschen",
     "Rename" : "Ëmbenennen",
     "The object type is not specified." : "Den Typ vum Object ass net uginn.",
     "Enter new" : "Gëff nei an",
     "Add" : "Dobäisetzen",
     "Edit tags" : "Tags editéieren",
-    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
-    "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
+    "unknown text" : "Onbekannten Text",
+    "Hello world!" : "Hallo Welt!",
+    "sunny" : "Sonneg",
+    "Hello {name}, the weather is {weather}" : "Hallo {Numm}, d'Wieder ass {Wieder}",
+    "Hello {name}" : "Hallo {Numm}",
+    "new" : "Nei",
+    "_download %n file_::_download %n files_" : ["%n Fichier eroflueden","%n Fichieren eroflueden"],
+    "Updating to {version}" : "Aktualiséieren op {Versioun}",
+    "An error occurred." : "Et ass e Feeler opgetrueden",
+    "Please reload the page." : "Lued w.e.g. d'Säit nei.",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "D'Aktualiséierung war net erfollegräich. Fir méi Informatiounen  <a href=\"{url}\">Kuck eise Forum Bäitrag</a> deen dëst Thema behandelt.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "D'Aktualiséierung war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
+    "The update was successful. There were warnings." : "D'Aktualiséierung war erfollegräich. Et goufe Warnungen.",
+    "The update was successful. Redirecting you to ownCloud now." : "D'Aktualiséierung war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
+    "Searching other places" : "Op anere Plaaze sichen",
+    "No search results in other folders" : "Keng Sich Resultater an aneren Dossieren",
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
     "Apps" : "Applikatiounen",
     "Admin" : "Admin",
     "Help" : "Hëllef",
     "Access forbidden" : "Zougrëff net erlaabt",
+    "File not found" : "Fichier net fonnt",
+    "The specified document has not been found on the server." : "Dat ausgewielt Dokument konnt net op dësem Server fonnt ginn.",
+    "You can click here to return to %s." : "Du kanns hei klicken fir bei %s zeréck ze goen.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nech wëll just Bescheed soen dass den/d' %s,  »%s« mat dir gedeelt huet.\nUkucken: %s\n",
     "Cheers!" : "Prost!",
+    "Internal Server Error" : "Interne Server Feeler",
+    "The server encountered an internal error and was unable to complete your request." : "De Server huet en interne Feeler festgestallt an konnt deng Ufro net ëmsetzen",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "W.e.g. kontaktéier de Server Administrateur wann dëse Feeler e puer Mol optrëtt an sëtz d'technesch Detailer an de Rapport derbäi.",
+    "More details can be found in the server log." : "Méi Detailer kënnen am Server Log fonnt ginn.",
+    "Technical details" : "Technesch Detailer",
+    "Remote Address: %s" : "D'Adress op Distanz: %s",
+    "Request ID: %s" : "ID ufroen: %s",
+    "Type: %s" : "Typ: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Noriicht: %s",
+    "File: %s" : "Fichier: %s",
+    "Line: %s" : "Zeil: %s",
+    "Trace" : "Spuren",
+    "Security warning" : "Sécherheets Warnung",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
     "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
     "Username" : "Benotzernumm",
+    "Storage & database" : "Speicherplaz & Datebank",
     "Data folder" : "Daten-Dossier",
     "Configure the database" : "D'Datebank konfiguréieren",
+    "Only %s is available." : "Nëmmen den %s ass verfügbar.",
+    "Install and activate additional PHP modules to choose other database types." : "Installéier an aktivéier zousätzlech PHP Moduler fir aner Forme vun Datebanken auszewielen.",
+    "For more details check out the documentation." : "Kuck an der Dokumentatioun fir méi Informatiounen.",
     "Database user" : "Datebank-Benotzer",
     "Database password" : "Datebank-Passwuert",
     "Database name" : "Datebank Numm",
     "Database tablespace" : "Tabelle-Plaz vun der Datebank",
     "Database host" : "Datebank-Server",
+    "Performance warning" : "Leeschtungs Warnung",
+    "SQLite will be used as database." : "SQLite wäert als Datebank benotzt ginn.",
+    "For larger installations we recommend to choose a different database backend." : "Fir méi grouss Installatiounen recommandéiere mir fir en aneren Datebanken Backend ze benotzen.",
     "Finish setup" : "Installatioun ofschléissen",
     "Finishing …" : "Schléissen of ...",
+    "Need help?" : "Brauchs de Hëllef?",
+    "See the documentation" : "Kuck an der Dokumentatioun",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>ech wëll just Bescheed soen dass den/d' %s <strong>%s</strong> mat dir gedeelt huet.<br><a href=\"%s\">Ukucken!</a><br><br>",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Dës Applikatioun verlaangt JavaScript fir kënne korrekt auszeféieren. W.e.g {linkstart} schalt JavaScript an {linkend} a luet d'Säit nei.",
     "Log out" : "Ofmellen",
     "Search" : "Sichen",
+    "Server side authentication failed!" : "D'Autentifikatioun vun der Säit vum Server huet net geklappt!",
+    "Please contact your administrator." : "W.e.g. kontaktéier däin Administrateur.",
+    "An internal error occurred." : "Et ass en interne Feeler opgetrueden.",
+    "Please try again or contact your administrator." : "W.e.g. versich et nach emol oder kontaktéier däin Administrateur.",
+    "Username or email" : "Benotzernumm oder Email",
     "Log in" : "Umellen",
+    "Wrong password. Reset it?" : "Falscht Passwuert. Wëlls de et zeréck setzen?",
+    "Wrong password." : "Falscht Passwuert.",
+    "Stay logged in" : "Bleif ageloggt.",
     "Alternative Logins" : "Alternativ Umeldungen",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
     "New password" : "Neit Passwuert",
+    "New Password" : "Neit Passwuert",
     "Reset password" : "Passwuert zréck setzen",
-    "Thank you for your patience." : "Merci fir deng Gedold."
+    "This ownCloud instance is currently in single user mode." : "Dës ownCloud Instanz ass am Moment am eenzel Benotzer Modus.",
+    "This means only administrators can use the instance." : "Dëst bedeit dass just d'Administrateuren d'Instanz benotze kënnen.",
+    "Thank you for your patience." : "Merci fir deng Gedold.",
+    "Two-step verification" : "Verifikatioun mat zwee Schrëtt",
+    "Cancel login" : "Login ofbriechen",
+    "Please authenticate using the selected factor." : "W.e.g. authentifizéier dech andeems de den ausgewielten Facteur benotz.",
+    "An error occured while verifying the token" : "Beim Token iwwerpréiwen ass e Feeler opgetrueden",
+    "You are accessing the server from an untrusted domain." : "Du gräifs vun enger net vertrauensvoller Domän op dëse Server zou.",
+    "Add \"%s\" as trusted domain" : "\"%s\" als zouverlässeg Domän derbäi setzen",
+    "App update required" : "App Aktualiséierung néideg",
+    "%s will be updated to version %s" : "%s wäert aktualiséiert ginn op d'Versioun %s",
+    "These apps will be updated:" : "D!es Apps wäerten aktualiséiert ginn:",
+    "These incompatible apps will be disabled:" : "Dës inkompatibel Apps wäerten ofgeschalt ginn:",
+    "The theme %s has been disabled." : "D'Thema %s gouf ofgeschalt.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "W.e.g. géi sécher dass d'Datebank, de configuréierten Dossier an den Daten Dossier ofgeséchert sinn éiers de weider gees.",
+    "Start update" : "Update starten",
+    "Detailed logs" : "Detailléiert Loggs",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Fir Hëllef, kuck am <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Documentatioun</a>.",
+    "This %s instance is currently in maintenance mode, which may take a while." : "Dës %s Instanz ass am Moment am Maintenance Modus, dat kënnt ee Moment brauche.",
+    "This page will refresh itself when the %s instance is available again." : "Dës Säit luet nees automatesch wann d' %s Instanz nees disponibel ass."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index e1cfc10d33c..534b50f9e96 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -1,13 +1,40 @@
 { "translations": {
+    "Please select a file." : "Wiel w.e.g. e Fichier aus.",
+    "File is too big" : "De Fichier ass ze grouss",
+    "Invalid file provided" : "Ongültege Fichier uginn",
     "No image or file provided" : "Kee Bild oder Fichier uginn",
     "Unknown filetype" : "Onbekannten Fichier Typ",
-    "Invalid image" : "Ongülteg d'Bild",
+    "Invalid image" : "Ongültegt Bild",
+    "An error occurred. Please contact your admin." : "Et ass e Feeler opgetrueden. W.e.g. kontaktéier däin Administrateur.",
+    "No temporary profile picture available, try again" : "Et ass keen temporäert Profilbild verfügbar, versich et nach emol.",
+    "Couldn't reset password because the token is invalid" : "D'Passwuert konnt net zeréck gesat ginn well den Token ongülteg ass",
+    "Couldn't reset password because the token is expired" : "D'Passwuert konnt net zeréck gesat ginn well den Token ofgelaf ass",
+    "Couldn't send reset email. Please make sure your username is correct." : "D'Email konnt net zeréck gesat ginn. Iwwerpréif w.e.g. op däi Passwuert richteg ass.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "D'Email fir zeréck ze setzen konnt net geschéckt ginn well et keng gülteg Emailadresse fir dëse Benotzernumm gëtt. W.e.g. kontaktéier däin Administrateur.",
     "%s password reset" : "%s Passwuert ass nei gesat",
+    "Couldn't send reset email. Please contact your administrator." : "D'Email fir zeréck ze setzen konnt net geschéckt ginn. W.e.g. kontaktéier däin Administrateur.",
     "Error tagging" : "Fehler beim Taggen",
     "Error untagging" : "Fehler beim Tag läschen",
+    "Error favoriting" : "Feeler beim favoriséieren",
+    "Error unfavoriting" : "Feeler beim defavoriséieren",
+    "Couldn't send mail to following users: %s " : "D'Email fir de folgende Benotzer konnt net geschéckt ginn: %s",
+    "Preparing update" : "D'Aktualiséierung gëtt virbereet",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Reparatur Warnung:",
+    "Repair error: " : "Reparéier de Feeler:",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Tabell gëtt gepréift %s",
     "Turned on maintenance mode" : "Maintenance Modus ass un",
     "Turned off maintenance mode" : "Maintenance Modus ass aus",
+    "Maintenance mode is kept active" : "De Maintenance Modus gëtt aktiv gehalen",
+    "Updating database schema" : "D'Schema vun der Datebank gëtt aktualiséiert",
     "Updated database" : "Datebank ass geupdate ginn",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Et gëtt gepréift ob d'Schema vun der Datebank aktualiséiert ka ginn (dëst kann ofhängeg vun der Gréisst vun der Datebank eng länger Zäit daueren)",
+    "Checked database schema update" : "D'Aktualiséierung vum Schema vun der Datebank gouf gepréift",
+    "Checking updates of apps" : "D'Aktualiséierung vun den Apps gëtt gepréift",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Et gëtt gepréift ob d'Schema vun der Datebank fir %s aktualiséiert ka ginn (dëst kann ofhängeg vun der Datebank eng länger Zäit daueren)",
+    "Checked database schema update for apps" : "D'Aktualiséierung vum Schema vun der Datebank fir Applikatioune gouf gepréift",
+    "Updated \"%s\" to %s" : "\"%s\" gouf op %s aktualiséiert",
+    "Already up to date" : "Schonn um neiste Stand",
     "Sunday" : "Sonndeg",
     "Monday" : "Méindeg",
     "Tuesday" : "Dënschdeg",
@@ -22,6 +49,13 @@
     "Thu." : "Do.",
     "Fri." : "Fr.",
     "Sat." : "Sa.",
+    "Su" : "SO",
+    "Mo" : "ME",
+    "Tu" : "DE",
+    "We" : "ME",
+    "Th" : "DO",
+    "Fr" : "FR",
+    "Sa" : "SA",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mäerz",
@@ -47,35 +81,63 @@
     "Nov." : "Nov.",
     "Dec." : "Dez.",
     "Settings" : "Astellungen",
+    "Problem loading page, reloading in 5 seconds" : "Et gouf e Problem beim Luede vun der Säit, a 5 Sekonnen gëtt nei gelueden",
     "Saving..." : "Speicheren...",
+    "Dismiss" : "Verworf",
     "seconds ago" : "Sekonnen hier",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "De Link fir d'Passwuert zeréckzesetzen gouf un deng E-Mail-Adress geschéckt. Falls d'Mail net enger raisonnabeler Zäitspan ukënnt, kuck w.e.g. an dengem Spam-Dossier. Wann do och keng Mail ass, fro w.e.g. däin Administrateur.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert bis zeréckgesat gouf. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.g. däin Administrateur éiers de weiderfiers. Bass de sécher dass de weidermaache wëlls?",
+    "I know what I'm doing" : "Ech weess wat ech maachen",
+    "Password can not be changed. Please contact your administrator." : "D'Passwuert kann net geännert ginn. W.e.g. kontaktéier däin Administrateur.",
     "No" : "Nee",
     "Yes" : "Jo",
     "Choose" : "Auswielen",
     "Ok" : "OK",
+    "Error loading message template: {error}" : "Feeler beim Luede vun der Noorichte Virlag: {Feeler}",
+    "read-only" : "Nëmme liesen",
+    "New Files" : "Nei Fichieren",
+    "Already existing files" : "D'Fichieren existéiere schonn",
     "Which files do you want to keep?" : "Weieng Fichieren wëlls de gär behalen?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wann s de déi zwou Versiounen auswiels kritt de kopéierte Fichier eng Nummer bei den Numm derbäi gesat",
     "Cancel" : "Ofbriechen",
     "Continue" : "Weider",
     "(all selected)" : "(all ausgewielt)",
     "({count} selected)" : "({count} ausgewielt)",
+    "Error loading file exists template" : "Feeler beim Luede vum Fichier existéiert eng Virlag",
+    "Very weak password" : "Ganz schwaacht Passwuert",
+    "Weak password" : "Schwaacht Passwuert",
+    "So-so password" : "La-La Passwuert",
+    "Good password" : "Gutt Passwuert",
+    "Strong password" : "Staarkt Passwuert",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Däi Web Server ass net richteg agestallt fir d'Fichier Selektioun ze erlaben well den WebDAV Interface schéngt futti ze sinn.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Däi Web Server ass net richteg agestallt fir \"{url}\" ze léisen. Méi Informatiounen fënns de op eisem <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentatioun</a>.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "D'Internet Verbindung fir dëse Server funktionéiert net. Dat bedeit dass e puer vun dëse Funktiounen wéi eng extern Späicherplaz ariichten, Notifikatiounen iwwer Aktualiséierungen oder d'Installéieren vu friemen Apps net funktionéiere wäert. Fichieren op Distanz erreechen an d'Schécke vu Notifikatioun Emailen kéinnten och net funktionéieren. Mir roden fir d'Internet Verbindung fir dëse Server hierzestellen wann s de all d'Funktioune wëlls hunn.",
     "Shared" : "Gedeelt",
+    "Shared with {recipients}" : "Gedeelt mat {Empfänger}",
     "Error" : "Feeler",
     "Error while sharing" : "Feeler beim Deelen",
     "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
     "Error setting expiration date" : "Feeler beim Setze vum Verfallsdatum",
+    "The public link will expire no later than {days} days after it is created" : "Den ëffentleche Link wäert net méi spéit wéi {Deeg} Deeg nodeems et erstallt gouf verfalen ",
     "Set expiration date" : "Verfallsdatum setzen",
+    "Expiration" : "Leeft of",
     "Expiration date" : "Verfallsdatum",
+    "Choose a password for the public link" : "Wiel e Passwuert fir den ëffentleche Link aus",
     "Resharing is not allowed" : "Weiderdeelen ass net erlaabt",
     "Share link" : "Link deelen",
+    "Link" : "Link",
     "Password protect" : "Passwuertgeschützt",
     "Password" : "Passwuert",
+    "Allow editing" : "Beaarbechten erlaben",
     "Email link to person" : "Link enger Persoun mailen",
     "Send" : "Schécken",
     "Sending ..." : "Gëtt geschéckt...",
     "Email sent" : "Email geschéckt",
+    "Send link via email" : "De Link iwwer E-Mail schécken",
     "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
     "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
     "group" : "Grupp",
+    "remote" : "Op Distanz",
     "notify by email" : "via e-mail Bescheed ginn",
     "Unshare" : "Net méi deelen",
     "can share" : "kann deelen",
@@ -84,42 +146,127 @@
     "change" : "änneren",
     "delete" : "läschen",
     "access control" : "Zougrëffskontroll",
+    "Could not unshare" : "Konnt net ongedeelt ginn",
+    "Share details could not be loaded for this item." : "D'Detailer vum Deelen konnten net geluede ginn fir dësen Artikel.",
+    "No users or groups found for {search}" : "Keng Benotzer oder Gruppe fonnt fir {Sich}",
+    "No users found for {search}" : "Keng Benotzer fonnt fir {Sich}",
+    "An error occurred. Please try again" : "Et ass e Fehler opgetrueden. W.e.g. probéier nach emol",
     "Share" : "Deelen",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mat Leit vun aneren ownCloud deelen, déi d'Syntax username@example.com/owncloud benotzen",
+    "Share with users…" : "Mat Benotzer deelen ...",
+    "Share with users, groups or remote users…" : "Mat Benotzer, Gruppen oder Benotzer op Distanz deelen ...",
+    "Share with users or groups…" : "Mat Benotzer oder Gruppen deelen...",
+    "Share with users or remote users…" : "Mat Benotzer oder mat Benotzer op Distanz deelen ...",
+    "Error removing share" : "Fehler beim Läschen vum Bäitrag",
     "Warning" : "Warnung",
+    "Error while sending notification" : "Feeler beim Schécke vun der Notifikatioun",
+    "restricted" : "Ageschränkt",
+    "invisible" : "Onsiichtbar",
     "Delete" : "Läschen",
     "Rename" : "Ëmbenennen",
     "The object type is not specified." : "Den Typ vum Object ass net uginn.",
     "Enter new" : "Gëff nei an",
     "Add" : "Dobäisetzen",
     "Edit tags" : "Tags editéieren",
-    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
-    "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
+    "unknown text" : "Onbekannten Text",
+    "Hello world!" : "Hallo Welt!",
+    "sunny" : "Sonneg",
+    "Hello {name}, the weather is {weather}" : "Hallo {Numm}, d'Wieder ass {Wieder}",
+    "Hello {name}" : "Hallo {Numm}",
+    "new" : "Nei",
+    "_download %n file_::_download %n files_" : ["%n Fichier eroflueden","%n Fichieren eroflueden"],
+    "Updating to {version}" : "Aktualiséieren op {Versioun}",
+    "An error occurred." : "Et ass e Feeler opgetrueden",
+    "Please reload the page." : "Lued w.e.g. d'Säit nei.",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "D'Aktualiséierung war net erfollegräich. Fir méi Informatiounen  <a href=\"{url}\">Kuck eise Forum Bäitrag</a> deen dëst Thema behandelt.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "D'Aktualiséierung war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
+    "The update was successful. There were warnings." : "D'Aktualiséierung war erfollegräich. Et goufe Warnungen.",
+    "The update was successful. Redirecting you to ownCloud now." : "D'Aktualiséierung war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
+    "Searching other places" : "Op anere Plaaze sichen",
+    "No search results in other folders" : "Keng Sich Resultater an aneren Dossieren",
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
     "Apps" : "Applikatiounen",
     "Admin" : "Admin",
     "Help" : "Hëllef",
     "Access forbidden" : "Zougrëff net erlaabt",
+    "File not found" : "Fichier net fonnt",
+    "The specified document has not been found on the server." : "Dat ausgewielt Dokument konnt net op dësem Server fonnt ginn.",
+    "You can click here to return to %s." : "Du kanns hei klicken fir bei %s zeréck ze goen.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nech wëll just Bescheed soen dass den/d' %s,  »%s« mat dir gedeelt huet.\nUkucken: %s\n",
     "Cheers!" : "Prost!",
+    "Internal Server Error" : "Interne Server Feeler",
+    "The server encountered an internal error and was unable to complete your request." : "De Server huet en interne Feeler festgestallt an konnt deng Ufro net ëmsetzen",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "W.e.g. kontaktéier de Server Administrateur wann dëse Feeler e puer Mol optrëtt an sëtz d'technesch Detailer an de Rapport derbäi.",
+    "More details can be found in the server log." : "Méi Detailer kënnen am Server Log fonnt ginn.",
+    "Technical details" : "Technesch Detailer",
+    "Remote Address: %s" : "D'Adress op Distanz: %s",
+    "Request ID: %s" : "ID ufroen: %s",
+    "Type: %s" : "Typ: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Noriicht: %s",
+    "File: %s" : "Fichier: %s",
+    "Line: %s" : "Zeil: %s",
+    "Trace" : "Spuren",
+    "Security warning" : "Sécherheets Warnung",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
     "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
     "Username" : "Benotzernumm",
+    "Storage & database" : "Speicherplaz & Datebank",
     "Data folder" : "Daten-Dossier",
     "Configure the database" : "D'Datebank konfiguréieren",
+    "Only %s is available." : "Nëmmen den %s ass verfügbar.",
+    "Install and activate additional PHP modules to choose other database types." : "Installéier an aktivéier zousätzlech PHP Moduler fir aner Forme vun Datebanken auszewielen.",
+    "For more details check out the documentation." : "Kuck an der Dokumentatioun fir méi Informatiounen.",
     "Database user" : "Datebank-Benotzer",
     "Database password" : "Datebank-Passwuert",
     "Database name" : "Datebank Numm",
     "Database tablespace" : "Tabelle-Plaz vun der Datebank",
     "Database host" : "Datebank-Server",
+    "Performance warning" : "Leeschtungs Warnung",
+    "SQLite will be used as database." : "SQLite wäert als Datebank benotzt ginn.",
+    "For larger installations we recommend to choose a different database backend." : "Fir méi grouss Installatiounen recommandéiere mir fir en aneren Datebanken Backend ze benotzen.",
     "Finish setup" : "Installatioun ofschléissen",
     "Finishing …" : "Schléissen of ...",
+    "Need help?" : "Brauchs de Hëllef?",
+    "See the documentation" : "Kuck an der Dokumentatioun",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>ech wëll just Bescheed soen dass den/d' %s <strong>%s</strong> mat dir gedeelt huet.<br><a href=\"%s\">Ukucken!</a><br><br>",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Dës Applikatioun verlaangt JavaScript fir kënne korrekt auszeféieren. W.e.g {linkstart} schalt JavaScript an {linkend} a luet d'Säit nei.",
     "Log out" : "Ofmellen",
     "Search" : "Sichen",
+    "Server side authentication failed!" : "D'Autentifikatioun vun der Säit vum Server huet net geklappt!",
+    "Please contact your administrator." : "W.e.g. kontaktéier däin Administrateur.",
+    "An internal error occurred." : "Et ass en interne Feeler opgetrueden.",
+    "Please try again or contact your administrator." : "W.e.g. versich et nach emol oder kontaktéier däin Administrateur.",
+    "Username or email" : "Benotzernumm oder Email",
     "Log in" : "Umellen",
+    "Wrong password. Reset it?" : "Falscht Passwuert. Wëlls de et zeréck setzen?",
+    "Wrong password." : "Falscht Passwuert.",
+    "Stay logged in" : "Bleif ageloggt.",
     "Alternative Logins" : "Alternativ Umeldungen",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
     "New password" : "Neit Passwuert",
+    "New Password" : "Neit Passwuert",
     "Reset password" : "Passwuert zréck setzen",
-    "Thank you for your patience." : "Merci fir deng Gedold."
+    "This ownCloud instance is currently in single user mode." : "Dës ownCloud Instanz ass am Moment am eenzel Benotzer Modus.",
+    "This means only administrators can use the instance." : "Dëst bedeit dass just d'Administrateuren d'Instanz benotze kënnen.",
+    "Thank you for your patience." : "Merci fir deng Gedold.",
+    "Two-step verification" : "Verifikatioun mat zwee Schrëtt",
+    "Cancel login" : "Login ofbriechen",
+    "Please authenticate using the selected factor." : "W.e.g. authentifizéier dech andeems de den ausgewielten Facteur benotz.",
+    "An error occured while verifying the token" : "Beim Token iwwerpréiwen ass e Feeler opgetrueden",
+    "You are accessing the server from an untrusted domain." : "Du gräifs vun enger net vertrauensvoller Domän op dëse Server zou.",
+    "Add \"%s\" as trusted domain" : "\"%s\" als zouverlässeg Domän derbäi setzen",
+    "App update required" : "App Aktualiséierung néideg",
+    "%s will be updated to version %s" : "%s wäert aktualiséiert ginn op d'Versioun %s",
+    "These apps will be updated:" : "D!es Apps wäerten aktualiséiert ginn:",
+    "These incompatible apps will be disabled:" : "Dës inkompatibel Apps wäerten ofgeschalt ginn:",
+    "The theme %s has been disabled." : "D'Thema %s gouf ofgeschalt.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "W.e.g. géi sécher dass d'Datebank, de configuréierten Dossier an den Daten Dossier ofgeséchert sinn éiers de weider gees.",
+    "Start update" : "Update starten",
+    "Detailed logs" : "Detailléiert Loggs",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Fir Hëllef, kuck am <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Documentatioun</a>.",
+    "This %s instance is currently in maintenance mode, which may take a while." : "Dës %s Instanz ass am Moment am Maintenance Modus, dat kënnt ee Moment brauche.",
+    "This page will refresh itself when the %s instance is available again." : "Dës Säit luet nees automatesch wann d' %s Instanz nees disponibel ass."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index 66510376767..a916422df60 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -197,6 +197,7 @@ OC.L10N.register(
     "({scope})" : "({scope})",
     "Delete" : "Izbriši",
     "Rename" : "Preimenuj",
+    "Collaborative tags" : "Oznake za sodelovanje",
     "The object type is not specified." : "Vrsta predmeta ni podana.",
     "Enter new" : "Vnesite novo",
     "Add" : "Dodaj",
@@ -293,6 +294,8 @@ OC.L10N.register(
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
     "Thank you for your patience." : "Hvala za potrpežljivost!",
     "Two-step verification" : "Dvostopenjsko overjanje",
+    "Cancel login" : "Prekliči prijavo",
+    "An error occured while verifying the token" : "Napaka se je zgodila med preverjanjem ključa",
     "You are accessing the server from an untrusted domain." : "Trenutno je vzpostavljena povezava s strežnikom preko ne-varne domene.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
     "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kot varno domeno",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index 4e1767dacb8..055c0bafbd1 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -195,6 +195,7 @@
     "({scope})" : "({scope})",
     "Delete" : "Izbriši",
     "Rename" : "Preimenuj",
+    "Collaborative tags" : "Oznake za sodelovanje",
     "The object type is not specified." : "Vrsta predmeta ni podana.",
     "Enter new" : "Vnesite novo",
     "Add" : "Dodaj",
@@ -291,6 +292,8 @@
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
     "Thank you for your patience." : "Hvala za potrpežljivost!",
     "Two-step verification" : "Dvostopenjsko overjanje",
+    "Cancel login" : "Prekliči prijavo",
+    "An error occured while verifying the token" : "Napaka se je zgodila med preverjanjem ključa",
     "You are accessing the server from an untrusted domain." : "Trenutno je vzpostavljena povezava s strežnikom preko ne-varne domene.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
     "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kot varno domeno",
diff --git a/lib/l10n/hu_HU.js b/lib/l10n/hu_HU.js
index 4c17b946ca4..77cf7a401b0 100644
--- a/lib/l10n/hu_HU.js
+++ b/lib/l10n/hu_HU.js
@@ -9,8 +9,12 @@ OC.L10N.register(
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Úgy tűnik a példakonfigurációt próbálja ténylegesen használni. Ez nem támogatott, és működésképtelenné teheti a telepítést. Kérjük olvassa el a dokumentációt és azt követően változtasson a config.php-n!",
     "PHP %s or higher is required." : "PHP %s vagy ennél újabb szükséges.",
     "PHP with a version lower than %s is required." : "Ennél régebbi PHP szükséges: %s.",
+    "%sbit or higher PHP required." : "%sbit vagy ennél magasabb szükséges.",
     "Following databases are supported: %s" : "A következő adatbázisok támogatottak: %s",
+    "The command line tool %s could not be found" : "A parancssori eszköz %s nem található",
     "The library %s is not available." : "A könyvtár %s nem áll rendelkezésre.",
+    "Library %s with a version higher than %s is required - available version %s." : "A könyvtár a %s verzióval nagyobb mint a szükséges %s - elérhető verzió %s",
+    "Library %s with a version lower than %s is required - available version %s." : "A könyvtár a %s verzióval alacsonyabb mint a szükséges %s - elérhető verzió %s",
     "Following platforms are supported: %s" : "Ezek a platformok támogatottak: %s",
     "ownCloud %s or higher is required." : "ownCoud %s vagy ennél újabb szükséges.",
     "ownCloud %s or lower is required." : "ownCoud %s vagy ennél régebbi szükséges.",
@@ -26,6 +30,7 @@ OC.L10N.register(
     "_%n hour ago_::_%n hours ago_" : ["%n órája","%n órája"],
     "_%n minute ago_::_%n minutes ago_" : ["%n perce","%n perce"],
     "seconds ago" : "pár másodperce",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "A modul ezzel az azonosítóval:%s nem létezik. Engedélyezd az alkalmazás beállításainál vagy vedd fel a kapcsolatot az adminisztártododdal.",
     "Empty filename is not allowed" : "Üres fájlnév nem engedétlyezett",
     "Dot files are not allowed" : "Pontozott fájlok nem engedétlyezettek",
     "4-byte characters are not supported in file names" : "4-byte karakterek nem támogatottak a fájl nevekben.",
@@ -34,15 +39,20 @@ OC.L10N.register(
     "File name is too long" : "A fájlnév túl hosszú!",
     "App directory already exists" : "Az alkalmazás mappája már létezik",
     "Can't create app folder. Please fix permissions. %s" : "Nem lehetett létrehozni az alkalmazás mappáját. Kérem ellenőrizze a jogosultságokat. %s",
+    "Archive does not contain a directory named %s" : "Az arhívum nem tartalmaz könyvátrat ezzel a névvel %s",
     "No source specified when installing app" : "Az alkalmazás telepítéséhez nincs forrás megadva",
     "No href specified when installing app from http" : "Az alkalmazás http-n keresztül történő telepítéséhez nincs href hivetkozás megadva",
     "No path specified when installing app from local file" : "Az alkalmazás helyi telepítéséhez nincs útvonal (mappa) megadva",
     "Archives of type %s are not supported" : "A(z) %s típusú tömörített állomány nem támogatott",
     "Failed to open archive when installing app" : "Nem sikerült megnyitni a tömörített állományt a telepítés során",
     "App does not provide an info.xml file" : "Az alkalmazás nem szolgáltatott info.xml file-t",
+    "App cannot be installed because appinfo file cannot be read." : "Az alkalmazást nem telepíthető mert az alkalmazás-infó file nem olvasható.",
+    "Signature could not get checked. Please contact the app developer and check your admin screen." : "Az aláírás nem ellenőrizhető. Lépj kapcsolatba az alkalmazás fejlesztővel és ellenörízd az admin képernyődet.",
     "App can't be installed because of not allowed code in the App" : "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel",
     "App can't be installed because it is not compatible with this version of ownCloud" : "Az alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen verziójával.",
     "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett",
+    "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Az alkalmazást nem telepíthető mert a verzió az info.xml-ben nem azonos azzal amit az alkalmazás boltban van feltüntetve.",
+    "%s enter the database username and name." : "%s adja meg az adatbázis felhasználó nevét és az adatbázi nevét.",
     "%s enter the database username." : "%s adja meg az adatbázist elérő felhasználó login nevét.",
     "%s enter the database name." : "%s adja meg az adatbázis nevét.",
     "%s you may not use dots in the database name" : "%s az adatbázis neve nem tartalmazhat pontot",
@@ -55,6 +65,7 @@ OC.L10N.register(
     "PostgreSQL username and/or password not valid" : "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
     "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
+    "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Úgy tűnik, hogy ez a %s példány 32-bites PHP környezetben fut és az open_basedir a php.ini-ben van konfigurálva. A 4GB-nál nagyobb fájlok és problémákhoz vezetnek és nagy akadályt jelentenek.",
     "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Kérlek távolítsd el az open_basedir beállítást a php.ini-ből, vagy válts 64bit-es PHP-ra.",
     "Set an admin username." : "Állítson be egy felhasználói nevet az adminisztrációhoz.",
     "Set an admin password." : "Állítson be egy jelszót az adminisztrációhoz.",
@@ -90,8 +101,10 @@ OC.L10N.register(
     "Sharing %s failed, because resharing is not allowed" : "%s megosztása nem sikerült, mert a megosztás továbbadása nincs engedélyezve",
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s megosztása nem sikerült, mert %s megosztási alrendszere nem találja",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s megosztása nem sikerült, mert a fájl nem található a gyorsítótárban",
+    "Expiration date is in the past" : "Múltbéli lejárati idő.",
     "Could not find category \"%s\"" : "Ez a kategória nem található: \"%s\"",
     "Apps" : "Alkalmazások",
+    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "A felhasználónévben csak a következő karakterek fordulhatnak elő: \"a-z\", \"A-Z\", \"0-9\", és \"_.@-\"",
     "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
     "The username is already being used" : "Ez a bejelentkezési név már foglalt",
diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu_HU.json
index e5556782f81..fbebb566649 100644
--- a/lib/l10n/hu_HU.json
+++ b/lib/l10n/hu_HU.json
@@ -7,8 +7,12 @@
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Úgy tűnik a példakonfigurációt próbálja ténylegesen használni. Ez nem támogatott, és működésképtelenné teheti a telepítést. Kérjük olvassa el a dokumentációt és azt követően változtasson a config.php-n!",
     "PHP %s or higher is required." : "PHP %s vagy ennél újabb szükséges.",
     "PHP with a version lower than %s is required." : "Ennél régebbi PHP szükséges: %s.",
+    "%sbit or higher PHP required." : "%sbit vagy ennél magasabb szükséges.",
     "Following databases are supported: %s" : "A következő adatbázisok támogatottak: %s",
+    "The command line tool %s could not be found" : "A parancssori eszköz %s nem található",
     "The library %s is not available." : "A könyvtár %s nem áll rendelkezésre.",
+    "Library %s with a version higher than %s is required - available version %s." : "A könyvtár a %s verzióval nagyobb mint a szükséges %s - elérhető verzió %s",
+    "Library %s with a version lower than %s is required - available version %s." : "A könyvtár a %s verzióval alacsonyabb mint a szükséges %s - elérhető verzió %s",
     "Following platforms are supported: %s" : "Ezek a platformok támogatottak: %s",
     "ownCloud %s or higher is required." : "ownCoud %s vagy ennél újabb szükséges.",
     "ownCloud %s or lower is required." : "ownCoud %s vagy ennél régebbi szükséges.",
@@ -24,6 +28,7 @@
     "_%n hour ago_::_%n hours ago_" : ["%n órája","%n órája"],
     "_%n minute ago_::_%n minutes ago_" : ["%n perce","%n perce"],
     "seconds ago" : "pár másodperce",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "A modul ezzel az azonosítóval:%s nem létezik. Engedélyezd az alkalmazás beállításainál vagy vedd fel a kapcsolatot az adminisztártododdal.",
     "Empty filename is not allowed" : "Üres fájlnév nem engedétlyezett",
     "Dot files are not allowed" : "Pontozott fájlok nem engedétlyezettek",
     "4-byte characters are not supported in file names" : "4-byte karakterek nem támogatottak a fájl nevekben.",
@@ -32,15 +37,20 @@
     "File name is too long" : "A fájlnév túl hosszú!",
     "App directory already exists" : "Az alkalmazás mappája már létezik",
     "Can't create app folder. Please fix permissions. %s" : "Nem lehetett létrehozni az alkalmazás mappáját. Kérem ellenőrizze a jogosultságokat. %s",
+    "Archive does not contain a directory named %s" : "Az arhívum nem tartalmaz könyvátrat ezzel a névvel %s",
     "No source specified when installing app" : "Az alkalmazás telepítéséhez nincs forrás megadva",
     "No href specified when installing app from http" : "Az alkalmazás http-n keresztül történő telepítéséhez nincs href hivetkozás megadva",
     "No path specified when installing app from local file" : "Az alkalmazás helyi telepítéséhez nincs útvonal (mappa) megadva",
     "Archives of type %s are not supported" : "A(z) %s típusú tömörített állomány nem támogatott",
     "Failed to open archive when installing app" : "Nem sikerült megnyitni a tömörített állományt a telepítés során",
     "App does not provide an info.xml file" : "Az alkalmazás nem szolgáltatott info.xml file-t",
+    "App cannot be installed because appinfo file cannot be read." : "Az alkalmazást nem telepíthető mert az alkalmazás-infó file nem olvasható.",
+    "Signature could not get checked. Please contact the app developer and check your admin screen." : "Az aláírás nem ellenőrizhető. Lépj kapcsolatba az alkalmazás fejlesztővel és ellenörízd az admin képernyődet.",
     "App can't be installed because of not allowed code in the App" : "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel",
     "App can't be installed because it is not compatible with this version of ownCloud" : "Az alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen verziójával.",
     "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett",
+    "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Az alkalmazást nem telepíthető mert a verzió az info.xml-ben nem azonos azzal amit az alkalmazás boltban van feltüntetve.",
+    "%s enter the database username and name." : "%s adja meg az adatbázis felhasználó nevét és az adatbázi nevét.",
     "%s enter the database username." : "%s adja meg az adatbázist elérő felhasználó login nevét.",
     "%s enter the database name." : "%s adja meg az adatbázis nevét.",
     "%s you may not use dots in the database name" : "%s az adatbázis neve nem tartalmazhat pontot",
@@ -53,6 +63,7 @@
     "PostgreSQL username and/or password not valid" : "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
     "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
+    "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Úgy tűnik, hogy ez a %s példány 32-bites PHP környezetben fut és az open_basedir a php.ini-ben van konfigurálva. A 4GB-nál nagyobb fájlok és problémákhoz vezetnek és nagy akadályt jelentenek.",
     "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Kérlek távolítsd el az open_basedir beállítást a php.ini-ből, vagy válts 64bit-es PHP-ra.",
     "Set an admin username." : "Állítson be egy felhasználói nevet az adminisztrációhoz.",
     "Set an admin password." : "Állítson be egy jelszót az adminisztrációhoz.",
@@ -88,8 +99,10 @@
     "Sharing %s failed, because resharing is not allowed" : "%s megosztása nem sikerült, mert a megosztás továbbadása nincs engedélyezve",
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s megosztása nem sikerült, mert %s megosztási alrendszere nem találja",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s megosztása nem sikerült, mert a fájl nem található a gyorsítótárban",
+    "Expiration date is in the past" : "Múltbéli lejárati idő.",
     "Could not find category \"%s\"" : "Ez a kategória nem található: \"%s\"",
     "Apps" : "Alkalmazások",
+    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "A felhasználónévben csak a következő karakterek fordulhatnak elő: \"a-z\", \"A-Z\", \"0-9\", és \"_.@-\"",
     "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
     "The username is already being used" : "Ez a bejelentkezési név már foglalt",
diff --git a/lib/l10n/lb.js b/lib/l10n/lb.js
index d74b2a40c1b..0b87fdc1ef0 100644
--- a/lib/l10n/lb.js
+++ b/lib/l10n/lb.js
@@ -19,6 +19,8 @@ OC.L10N.register(
     "seconds ago" : "Sekonnen hir",
     "%s shared »%s« with you" : "Den/D' %s huet »%s« mat dir gedeelt",
     "Apps" : "Applikatiounen",
+    "A valid username must be provided" : "Et muss e gültegen Benotzernumm ugi ginn",
+    "A valid password must be provided" : "Et muss e gültegt Passwuert ugi ginn",
     "Help" : "Hëllef",
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
diff --git a/lib/l10n/lb.json b/lib/l10n/lb.json
index f1cfbd88580..7015a7cacee 100644
--- a/lib/l10n/lb.json
+++ b/lib/l10n/lb.json
@@ -17,6 +17,8 @@
     "seconds ago" : "Sekonnen hir",
     "%s shared »%s« with you" : "Den/D' %s huet »%s« mat dir gedeelt",
     "Apps" : "Applikatiounen",
+    "A valid username must be provided" : "Et muss e gültegen Benotzernumm ugi ginn",
+    "A valid password must be provided" : "Et muss e gültegt Passwuert ugi ginn",
     "Help" : "Hëllef",
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index 5e0e1fbcdbd..4a2cc77056c 100644
--- a/lib/l10n/sl.js
+++ b/lib/l10n/sl.js
@@ -143,7 +143,9 @@ OC.L10N.register(
     "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
     "PHP module %s not installed." : "Modul PHP %s ni nameščen.",
     "PHP setting \"%s\" is not set to \"%s\"." : "Nastavitev PHP \"%s\" ni nastavljena na \"%s\".",
+    "libxml2 2.7.0 is at least required. Currently %s is installed." : "libxml2 mora biti vsaj verzija 2.7.0. Trenutno je nameščena %s.",
     "To fix this issue update your libxml2 version and restart your web server." : "Za rešitev te težave je treba posodobiti knjižnico libxml2 in nato ponovno zagnati spletni strežnik.",
+    "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Izgleda, da je PHP nastavljen, da odreže znake v 'inline doc' blokih. To bo povzročilo, da nekateri osnovni moduli ne bodo dosegljivi.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Napako je najverjetneje povzročil predpomnilnik ali pospeševalnik, kot sta Zend OPcache ali eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
     "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index 48c9f69a86d..bcb933fa5a3 100644
--- a/lib/l10n/sl.json
+++ b/lib/l10n/sl.json
@@ -141,7 +141,9 @@
     "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
     "PHP module %s not installed." : "Modul PHP %s ni nameščen.",
     "PHP setting \"%s\" is not set to \"%s\"." : "Nastavitev PHP \"%s\" ni nastavljena na \"%s\".",
+    "libxml2 2.7.0 is at least required. Currently %s is installed." : "libxml2 mora biti vsaj verzija 2.7.0. Trenutno je nameščena %s.",
     "To fix this issue update your libxml2 version and restart your web server." : "Za rešitev te težave je treba posodobiti knjižnico libxml2 in nato ponovno zagnati spletni strežnik.",
+    "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Izgleda, da je PHP nastavljen, da odreže znake v 'inline doc' blokih. To bo povzročilo, da nekateri osnovni moduli ne bodo dosegljivi.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Napako je najverjetneje povzročil predpomnilnik ali pospeševalnik, kot sta Zend OPcache ali eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
     "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
diff --git a/lib/private/DB/MDB2SchemaManager.php b/lib/private/DB/MDB2SchemaManager.php
index 1d25ae9f18c..79811d8c6cd 100644
--- a/lib/private/DB/MDB2SchemaManager.php
+++ b/lib/private/DB/MDB2SchemaManager.php
@@ -84,7 +84,7 @@ class MDB2SchemaManager {
 		} else if ($platform instanceof MySqlPlatform) {
 			return new MySQLMigrator($this->conn, $random, $config, $dispatcher);
 		} else if ($platform instanceof PostgreSqlPlatform) {
-			return new Migrator($this->conn, $random, $config, $dispatcher);
+			return new PostgreSqlMigrator($this->conn, $random, $config, $dispatcher);
 		} else {
 			return new NoCheckMigrator($this->conn, $random, $config, $dispatcher);
 		}
diff --git a/lib/private/DB/Migrator.php b/lib/private/DB/Migrator.php
index 8b8a34d9865..f2efd6916d7 100644
--- a/lib/private/DB/Migrator.php
+++ b/lib/private/DB/Migrator.php
@@ -33,6 +33,8 @@ use \Doctrine\DBAL\Schema\Table;
 use \Doctrine\DBAL\Schema\Schema;
 use \Doctrine\DBAL\Schema\SchemaConfig;
 use \Doctrine\DBAL\Schema\Comparator;
+use Doctrine\DBAL\Types\StringType;
+use Doctrine\DBAL\Types\Type;
 use OCP\IConfig;
 use OCP\Security\ISecureRandom;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -194,7 +196,25 @@ class Migrator {
 		return new Table($newName, $table->getColumns(), $newIndexes, array(), 0, $table->getOptions());
 	}
 
+	/**
+	 * @param Schema $targetSchema
+	 * @param \Doctrine\DBAL\Connection $connection
+	 * @return \Doctrine\DBAL\Schema\SchemaDiff
+	 * @throws DBALException
+	 */
 	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+		// adjust varchar columns with a length higher then getVarcharMaxLength to clob
+		foreach ($targetSchema->getTables() as $table) {
+			foreach ($table->getColumns() as $column) {
+				if ($column->getType() instanceof StringType) {
+					if ($column->getLength() > $connection->getDatabasePlatform()->getVarcharMaxLength()) {
+						$column->setType(Type::getType('text'));
+						$column->setLength(null);
+					}
+				}
+			}
+		}
+
 		$filterExpression = $this->getFilterExpression();
 		$this->connection->getConfiguration()->
 		setFilterSchemaAssetsExpression($filterExpression);
diff --git a/lib/private/DB/OracleMigrator.php b/lib/private/DB/OracleMigrator.php
index ceb89cf64d4..010f9213a1d 100644
--- a/lib/private/DB/OracleMigrator.php
+++ b/lib/private/DB/OracleMigrator.php
@@ -23,6 +23,7 @@
 
 namespace OC\DB;
 
+use Doctrine\DBAL\Schema\ColumnDiff;
 use Doctrine\DBAL\Schema\Schema;
 
 class OracleMigrator extends NoCheckMigrator {
@@ -39,7 +40,12 @@ class OracleMigrator extends NoCheckMigrator {
 			$tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
 			foreach ($tableDiff->changedColumns as $column) {
 				$column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
+				// auto increment is not relevant for oracle and can anyhow not be applied on change
+				$column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
 			}
+			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
+				return count($column->changedProperties) > 0;
+			});
 		}
 
 		return $schemaDiff;
diff --git a/lib/private/DB/PostgreSqlMigrator.php b/lib/private/DB/PostgreSqlMigrator.php
new file mode 100644
index 00000000000..75e6e0a16c9
--- /dev/null
+++ b/lib/private/DB/PostgreSqlMigrator.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\DB;
+
+use Doctrine\DBAL\Schema\Schema;
+
+class PostgreSqlMigrator extends Migrator {
+	/**
+	 * @param Schema $targetSchema
+	 * @param \Doctrine\DBAL\Connection $connection
+	 * @return \Doctrine\DBAL\Schema\SchemaDiff
+	 */
+	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+		$schemaDiff = parent::getDiff($targetSchema, $connection);
+
+		foreach ($schemaDiff->changedTables as $tableDiff) {
+			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
+			// see https://github.com/doctrine/dbal/issues/2427
+			foreach ($tableDiff->changedColumns as $column) {
+				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
+					if ($changedProperties !== 'default') {
+						return true;
+					}
+					$fromDefault = $column->fromColumn->getDefault();
+					$toDefault = $column->column->getDefault();
+					$fromDefault = trim($fromDefault, "()");
+
+					// by intention usage of !=
+					return $fromDefault != $toDefault;
+				});
+			}
+		}
+
+		return $schemaDiff;
+	}
+}
diff --git a/lib/private/DB/SQLiteMigrator.php b/lib/private/DB/SQLiteMigrator.php
index 8ea32581011..837a3a2987f 100644
--- a/lib/private/DB/SQLiteMigrator.php
+++ b/lib/private/DB/SQLiteMigrator.php
@@ -26,6 +26,8 @@ namespace OC\DB;
 
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\BigIntType;
+use Doctrine\DBAL\Types\Type;
 
 class SQLiteMigrator extends Migrator {
 
@@ -76,6 +78,15 @@ class SQLiteMigrator extends Migrator {
 		$platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
 		$platform->registerDoctrineTypeMapping('varchar ', 'string');
 
+		// with sqlite autoincrement columns is of type integer
+		foreach ($targetSchema->getTables() as $table) {
+			foreach ($table->getColumns() as $column) {
+				if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
+					$column->setType(Type::getType('integer'));
+				}
+			}
+		}
+
 		return parent::getDiff($targetSchema, $connection);
 	}
 }
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
index 0d41b3bab02..7eb6aa199b1 100644
--- a/lib/private/Files/Storage/DAV.php
+++ b/lib/private/Files/Storage/DAV.php
@@ -107,7 +107,11 @@ class DAV extends Common {
 			}
 			if ($this->secure === true) {
 				// inject mock for testing
-				$certPath = \OC_User::getHome(\OC_User::getUser()) . '/files_external/rootcerts.crt';
+				$certManager = \OC::$server->getCertificateManager();
+				if (is_null($certManager)) { //no user
+					$certManager = \OC::$server->getCertificateManager(null);
+				}
+				$certPath = $certManager->getAbsoluteBundlePath();
 				if (file_exists($certPath)) {
 					$this->certPath = $certPath;
 				}
@@ -812,15 +816,16 @@ class DAV extends Common {
 	 * which might be temporary
 	 */
 	private function convertException(Exception $e, $path = '') {
+		\OC::$server->getLogger()->logException($e);
 		Util::writeLog('files_external', $e->getMessage(), Util::ERROR);
 		if ($e instanceof ClientHttpException) {
-			if ($e->getHttpStatus() === 423) {
+			if ($e->getHttpStatus() === Http::STATUS_LOCKED) {
 				throw new \OCP\Lock\LockedException($path);
 			}
-			if ($e->getHttpStatus() === 401) {
+			if ($e->getHttpStatus() === Http::STATUS_UNAUTHORIZED) {
 				// either password was changed or was invalid all along
 				throw new StorageInvalidException(get_class($e) . ': ' . $e->getMessage());
-			} else if ($e->getHttpStatus() === 405) {
+			} else if ($e->getHttpStatus() === Http::STATUS_METHOD_NOT_ALLOWED) {
 				// ignore exception for MethodNotAllowed, false will be returned
 				return;
 			}
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 6219a89e5b3..dcc2e66c6c3 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -280,46 +280,11 @@ class Session implements IUserSession, Emitter {
 	 */
 	public function login($uid, $password) {
 		$this->session->regenerateId();
-		if ($this->validateToken($password, $uid)) {
-			// When logging in with token, the password must be decrypted first before passing to login hook
-			try {
-				$token = $this->tokenProvider->getToken($password);
-				try {
-					$loginPassword = $this->tokenProvider->getPassword($token, $password);
-					$this->manager->emit('\OC\User', 'preLogin', array($uid, $loginPassword));
-				} catch (PasswordlessTokenException $ex) {
-					$this->manager->emit('\OC\User', 'preLogin', array($uid, ''));
-				}
-			} catch (InvalidTokenException $ex) {
-				// Invalid token, nothing to do
-			}
 
-			$this->loginWithToken($password);
-			$user = $this->getUser();
+		if ($this->validateToken($password, $uid)) {
+			return $this->loginWithToken($password);
 		} else {
-			$this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
-			$user = $this->manager->checkPassword($uid, $password);
-		}
-		if ($user !== false) {
-			if (!is_null($user)) {
-				if ($user->isEnabled()) {
-					$this->setUser($user);
-					$this->setLoginName($uid);
-					$this->manager->emit('\OC\User', 'postLogin', array($user, $password));
-					if ($this->isLoggedIn()) {
-						$this->prepareUserLogin();
-						return true;
-					} else {
-						// injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory
-						$message = \OC::$server->getL10N('lib')->t('Login canceled by app');
-						throw new LoginException($message);
-					}
-				} else {
-					// injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory
-					$message = \OC::$server->getL10N('lib')->t('User disabled');
-					throw new LoginException($message);
-				}
-			}
+			return $this->loginWithPassword($uid, $password);
 		}
 		return false;
 	}
@@ -449,6 +414,49 @@ class Session implements IUserSession, Emitter {
 		return false;
 	}
 
+	/**
+	 * Log an user in via login name and password
+	 *
+	 * @param string $uid
+	 * @param string $password
+	 * @return boolean
+	 * @throws LoginException if an app canceld the login process or the user is not enabled
+	 */
+	private function loginWithPassword($uid, $password) {
+		$this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
+		$user = $this->manager->checkPassword($uid, $password);
+		if ($user === false) {
+			// Password check failed
+			return false;
+		}
+
+		if ($user->isEnabled()) {
+			$this->setUser($user);
+			$this->setLoginName($uid);
+			$this->manager->emit('\OC\User', 'postLogin', array($user, $password));
+			if ($this->isLoggedIn()) {
+				$this->prepareUserLogin();
+				return true;
+			} else {
+				// injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory
+				$message = \OC::$server->getL10N('lib')->t('Login canceled by app');
+				throw new LoginException($message);
+			}
+		} else {
+			// injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory
+			$message = \OC::$server->getL10N('lib')->t('User disabled');
+			throw new LoginException($message);
+		}
+		return false;
+	}
+
+	/**
+	 * Log an user in with a given token (id)
+	 *
+	 * @param string $token
+	 * @return boolean
+	 * @throws LoginException if an app canceld the login process or the user is not enabled
+	 */
 	private function loginWithToken($token) {
 		try {
 			$dbToken = $this->tokenProvider->getToken($token);
@@ -457,12 +465,14 @@ class Session implements IUserSession, Emitter {
 		}
 		$uid = $dbToken->getUID();
 
+		// When logging in with token, the password must be decrypted first before passing to login hook
 		$password = '';
 		try {
 			$password = $this->tokenProvider->getPassword($dbToken, $token);
 		} catch (PasswordlessTokenException $ex) {
 			// Ignore and use empty string instead
 		}
+
 		$this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
 
 		$user = $this->manager->get($uid);
@@ -472,13 +482,24 @@ class Session implements IUserSession, Emitter {
 		}
 		if (!$user->isEnabled()) {
 			// disabled users can not log in
-			return false;
+			// injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory
+			$message = \OC::$server->getL10N('lib')->t('User disabled');
+			throw new LoginException($message);
 		}
 
 		//login
 		$this->setUser($user);
-
+		$this->setLoginName($dbToken->getLoginName());
 		$this->manager->emit('\OC\User', 'postLogin', array($user, $password));
+
+		if ($this->isLoggedIn()) {
+			$this->prepareUserLogin();
+		} else {
+			// injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory
+			$message = \OC::$server->getL10N('lib')->t('Login canceled by app');
+			throw new LoginException($message);
+		}
+
 		return true;
 	}
 
diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js
index 96eeb9004e6..50de7c87952 100644
--- a/settings/l10n/ar.js
+++ b/settings/l10n/ar.js
@@ -94,9 +94,9 @@ OC.L10N.register(
     "Language" : "اللغة",
     "Help translate" : "ساعد في الترجمه",
     "Name" : "الاسم",
+    "Username" : "إسم المستخدم",
     "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك",
     "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد",
-    "Username" : "إسم المستخدم",
     "E-Mail" : "بريد إلكتروني",
     "Create" : "انشئ",
     "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول",
diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json
index d7033ff2566..e91d8dcc05c 100644
--- a/settings/l10n/ar.json
+++ b/settings/l10n/ar.json
@@ -92,9 +92,9 @@
     "Language" : "اللغة",
     "Help translate" : "ساعد في الترجمه",
     "Name" : "الاسم",
+    "Username" : "إسم المستخدم",
     "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك",
     "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد",
-    "Username" : "إسم المستخدم",
     "E-Mail" : "بريد إلكتروني",
     "Create" : "انشئ",
     "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول",
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
index 88f5a9c0a1f..9a5033e6bbf 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -133,12 +133,12 @@ OC.L10N.register(
     "Language" : "Llingua",
     "Help translate" : "Ayúdanos nes traducciones",
     "Name" : "Nome",
+    "Username" : "Nome d'usuariu",
     "Get the apps to sync your files" : "Obtener les aplicaciones pa sincronizar ficheros",
     "Desktop client" : "Cliente d'escritoriu",
     "Android app" : "Aplicación d'Android",
     "iOS app" : "Aplicación d'iOS",
     "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial",
-    "Username" : "Nome d'usuariu",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index 70c61c9da53..5578a0efffe 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -131,12 +131,12 @@
     "Language" : "Llingua",
     "Help translate" : "Ayúdanos nes traducciones",
     "Name" : "Nome",
+    "Username" : "Nome d'usuariu",
     "Get the apps to sync your files" : "Obtener les aplicaciones pa sincronizar ficheros",
     "Desktop client" : "Cliente d'escritoriu",
     "Android app" : "Aplicación d'Android",
     "iOS app" : "Aplicación d'iOS",
     "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial",
-    "Username" : "Nome d'usuariu",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
diff --git a/settings/l10n/az.js b/settings/l10n/az.js
index c9de6fb0c3b..f8f811d516e 100644
--- a/settings/l10n/az.js
+++ b/settings/l10n/az.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Language" : "Dil",
     "Help translate" : "Tərcüməyə kömək",
     "Name" : "Ad",
+    "Username" : "İstifadəçi adı",
     "Done" : "Edildi",
     "Get the apps to sync your files" : "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
     "Desktop client" : "Desktop client",
@@ -199,7 +200,6 @@ OC.L10N.register(
     "Show user backend" : "Daxili istifadəçini göstər",
     "Send email to new user" : "Yeni istifadəçiyə məktub yolla",
     "Show email address" : "Email ünvanını göstər",
-    "Username" : "İstifadəçi adı",
     "E-Mail" : "E-Mail",
     "Create" : "Yarat",
     "Admin Recovery Password" : "İnzibatçı bərpa şifrəsi",
diff --git a/settings/l10n/az.json b/settings/l10n/az.json
index 37413d0e37d..50bb9278d0a 100644
--- a/settings/l10n/az.json
+++ b/settings/l10n/az.json
@@ -184,6 +184,7 @@
     "Language" : "Dil",
     "Help translate" : "Tərcüməyə kömək",
     "Name" : "Ad",
+    "Username" : "İstifadəçi adı",
     "Done" : "Edildi",
     "Get the apps to sync your files" : "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
     "Desktop client" : "Desktop client",
@@ -197,7 +198,6 @@
     "Show user backend" : "Daxili istifadəçini göstər",
     "Send email to new user" : "Yeni istifadəçiyə məktub yolla",
     "Show email address" : "Email ünvanını göstər",
-    "Username" : "İstifadəçi adı",
     "E-Mail" : "E-Mail",
     "Create" : "Yarat",
     "Admin Recovery Password" : "İnzibatçı bərpa şifrəsi",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 8a41c42474c..2a71d1bea04 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -187,6 +187,7 @@ OC.L10N.register(
     "Language" : "Език",
     "Help translate" : "Помогни с превода",
     "Name" : "Име",
+    "Username" : "Потребителско Име",
     "Done" : "Завършен",
     "Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
     "Desktop client" : "Клиент за настолен компютър",
@@ -199,7 +200,6 @@ OC.L10N.register(
     "Show last log in" : "Покажи последно вписване",
     "Send email to new user" : "Изпращай писмо към нов потребител",
     "Show email address" : "Покажи адреса на електронната поща",
-    "Username" : "Потребителско Име",
     "E-Mail" : "Електронна поща",
     "Create" : "Създаване",
     "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index da25c47d906..eadbbd09172 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -185,6 +185,7 @@
     "Language" : "Език",
     "Help translate" : "Помогни с превода",
     "Name" : "Име",
+    "Username" : "Потребителско Име",
     "Done" : "Завършен",
     "Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
     "Desktop client" : "Клиент за настолен компютър",
@@ -197,7 +198,6 @@
     "Show last log in" : "Покажи последно вписване",
     "Send email to new user" : "Изпращай писмо към нов потребител",
     "Show email address" : "Покажи адреса на електронната поща",
-    "Username" : "Потребителско Име",
     "E-Mail" : "Електронна поща",
     "Create" : "Създаване",
     "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js
index d1d0ea94cb9..1dff9f04ab5 100644
--- a/settings/l10n/bn_BD.js
+++ b/settings/l10n/bn_BD.js
@@ -63,10 +63,10 @@ OC.L10N.register(
     "Language" : "ভাষা",
     "Help translate" : "অনুবাদ করতে সহায়তা করুন",
     "Name" : "নাম",
+    "Username" : "ব্যবহারকারী",
     "Done" : "শেষ হলো",
     "Get the apps to sync your files" : "আপনার ফাইলসমূহ সিংক করতে অ্যাপস নিন",
     "Show First Run Wizard again" : "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর",
-    "Username" : "ব্যবহারকারী",
     "Create" : "তৈরী কর",
     "Admin Recovery Password" : "প্রশাসক পূণরূদ্ধার কুটশব্দ",
     "Add Group" : "গ্রুপ যোগ কর",
diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json
index 7c1df558601..7fadc00d8f8 100644
--- a/settings/l10n/bn_BD.json
+++ b/settings/l10n/bn_BD.json
@@ -61,10 +61,10 @@
     "Language" : "ভাষা",
     "Help translate" : "অনুবাদ করতে সহায়তা করুন",
     "Name" : "নাম",
+    "Username" : "ব্যবহারকারী",
     "Done" : "শেষ হলো",
     "Get the apps to sync your files" : "আপনার ফাইলসমূহ সিংক করতে অ্যাপস নিন",
     "Show First Run Wizard again" : "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর",
-    "Username" : "ব্যবহারকারী",
     "Create" : "তৈরী কর",
     "Admin Recovery Password" : "প্রশাসক পূণরূদ্ধার কুটশব্দ",
     "Add Group" : "গ্রুপ যোগ কর",
diff --git a/settings/l10n/bn_IN.js b/settings/l10n/bn_IN.js
index 641711457c8..6f5e0ea6d8f 100644
--- a/settings/l10n/bn_IN.js
+++ b/settings/l10n/bn_IN.js
@@ -5,7 +5,7 @@ OC.L10N.register(
     "Delete" : "মুছে ফেলা",
     "Cancel" : "বাতিল করা",
     "Name" : "নাম",
-    "Get the apps to sync your files" : "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
-    "Username" : "ইউজারনেম"
+    "Username" : "ইউজারনেম",
+    "Get the apps to sync your files" : "আপনার ফাইল সিঙ্ক করার অ্যাপ পান"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/bn_IN.json b/settings/l10n/bn_IN.json
index 8693dbb8beb..323858068ee 100644
--- a/settings/l10n/bn_IN.json
+++ b/settings/l10n/bn_IN.json
@@ -3,7 +3,7 @@
     "Delete" : "মুছে ফেলা",
     "Cancel" : "বাতিল করা",
     "Name" : "নাম",
-    "Get the apps to sync your files" : "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
-    "Username" : "ইউজারনেম"
+    "Username" : "ইউজারনেম",
+    "Get the apps to sync your files" : "আপনার ফাইল সিঙ্ক করার অ্যাপ পান"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js
index fefc3ef7559..f11c7b43baa 100644
--- a/settings/l10n/bs.js
+++ b/settings/l10n/bs.js
@@ -154,6 +154,7 @@ OC.L10N.register(
     "Language" : "Jezik",
     "Help translate" : "Pomozi prevesti",
     "Name" : "Ime",
+    "Username" : "Korisničko ime",
     "Get the apps to sync your files" : "Koristite aplikacije za sinhronizaciju svojih datoteka",
     "Desktop client" : "Desktop klijent",
     "Android app" : "Android aplikacija",
@@ -164,7 +165,6 @@ OC.L10N.register(
     "Show user backend" : "Prikaži korisničku pozadinu (backend)",
     "Send email to new user" : "Pošalji e-poštu novom korisniku",
     "Show email address" : "Prikaži adresu e-pošte",
-    "Username" : "Korisničko ime",
     "E-Mail" : "E-pošta",
     "Create" : "Kreiraj",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json
index 3fc14020f6f..09158a27daa 100644
--- a/settings/l10n/bs.json
+++ b/settings/l10n/bs.json
@@ -152,6 +152,7 @@
     "Language" : "Jezik",
     "Help translate" : "Pomozi prevesti",
     "Name" : "Ime",
+    "Username" : "Korisničko ime",
     "Get the apps to sync your files" : "Koristite aplikacije za sinhronizaciju svojih datoteka",
     "Desktop client" : "Desktop klijent",
     "Android app" : "Android aplikacija",
@@ -162,7 +163,6 @@
     "Show user backend" : "Prikaži korisničku pozadinu (backend)",
     "Send email to new user" : "Pošalji e-poštu novom korisniku",
     "Show email address" : "Prikaži adresu e-pošte",
-    "Username" : "Korisničko ime",
     "E-Mail" : "E-pošta",
     "Create" : "Kreiraj",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 127d268cef6..407100a2017 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -211,6 +211,7 @@ OC.L10N.register(
     "Language" : "Idioma",
     "Help translate" : "Ajudeu-nos amb la traducció",
     "Name" : "Nom",
+    "Username" : "Nom d'usuari",
     "Get the apps to sync your files" : "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
     "Desktop client" : "Client d'escriptori",
     "Android app" : "aplicació para Android",
@@ -223,7 +224,6 @@ OC.L10N.register(
     "Show user backend" : "Mostrar backend d'usuari",
     "Send email to new user" : "Enviar correu electrònic al nou usuari",
     "Show email address" : "Mostrar l'adreça de correu electrònic",
-    "Username" : "Nom d'usuari",
     "E-Mail" : "E-mail",
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 0d43ef445d4..f0e4db16aba 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -209,6 +209,7 @@
     "Language" : "Idioma",
     "Help translate" : "Ajudeu-nos amb la traducció",
     "Name" : "Nom",
+    "Username" : "Nom d'usuari",
     "Get the apps to sync your files" : "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
     "Desktop client" : "Client d'escriptori",
     "Android app" : "aplicació para Android",
@@ -221,7 +222,6 @@
     "Show user backend" : "Mostrar backend d'usuari",
     "Send email to new user" : "Enviar correu electrònic al nou usuari",
     "Show email address" : "Mostrar l'adreça de correu electrònic",
-    "Username" : "Nom d'usuari",
     "E-Mail" : "E-mail",
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 46055a95cbd..31cbd0e8878 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -279,6 +279,8 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Heslo aplikace je přihlašovací údaj umožňující aplikaci nebo přístroji přístup k %s účtu.",
     "App name" : "Jméno aplikace",
     "Create new app password" : "Vytvořit nové heslo aplikace",
+    "Use the credentials below to configure your app or device." : "Použijte níže vypsané přihlašovací údaje k nastavení aplikace nebo přístroje.",
+    "Username" : "Uživatelské jméno",
     "Done" : "Dokončeno",
     "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
     "Desktop client" : "Aplikace pro počítač",
@@ -292,7 +294,6 @@ OC.L10N.register(
     "Show user backend" : "Zobrazit uživatelskou podpůrnou vrstvu",
     "Send email to new user" : "Poslat email novému uživateli",
     "Show email address" : "Emailová adresa",
-    "Username" : "Uživatelské jméno",
     "E-Mail" : "Email",
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 1fabc5a46ad..4aba018fd52 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -277,6 +277,8 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Heslo aplikace je přihlašovací údaj umožňující aplikaci nebo přístroji přístup k %s účtu.",
     "App name" : "Jméno aplikace",
     "Create new app password" : "Vytvořit nové heslo aplikace",
+    "Use the credentials below to configure your app or device." : "Použijte níže vypsané přihlašovací údaje k nastavení aplikace nebo přístroje.",
+    "Username" : "Uživatelské jméno",
     "Done" : "Dokončeno",
     "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
     "Desktop client" : "Aplikace pro počítač",
@@ -290,7 +292,6 @@
     "Show user backend" : "Zobrazit uživatelskou podpůrnou vrstvu",
     "Send email to new user" : "Poslat email novému uživateli",
     "Show email address" : "Emailová adresa",
-    "Username" : "Uživatelské jméno",
     "E-Mail" : "Email",
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 62f43d5908a..0d675aeed04 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -234,6 +234,7 @@ OC.L10N.register(
     "Language" : "Sprog",
     "Help translate" : "Hjælp med oversættelsen",
     "Name" : "Navn",
+    "Username" : "Brugernavn",
     "Done" : "Færdig",
     "Get the apps to sync your files" : "Hent applikationerne for at synkronisere dine filer",
     "Desktop client" : "Skrivebordsklient",
@@ -247,7 +248,6 @@ OC.L10N.register(
     "Show user backend" : "Vis bruger-backend",
     "Send email to new user" : "Send e-mail til ny bruger",
     "Show email address" : "Vis e-mailadresse",
-    "Username" : "Brugernavn",
     "E-Mail" : "E-mail",
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index fc9209dad9a..264bcd25868 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -232,6 +232,7 @@
     "Language" : "Sprog",
     "Help translate" : "Hjælp med oversættelsen",
     "Name" : "Navn",
+    "Username" : "Brugernavn",
     "Done" : "Færdig",
     "Get the apps to sync your files" : "Hent applikationerne for at synkronisere dine filer",
     "Desktop client" : "Skrivebordsklient",
@@ -245,7 +246,6 @@
     "Show user backend" : "Vis bruger-backend",
     "Send email to new user" : "Send e-mail til ny bruger",
     "Show email address" : "Vis e-mailadresse",
-    "Username" : "Brugernavn",
     "E-Mail" : "E-mail",
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index fcbe62b4316..457e1b4e6cf 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -279,6 +279,8 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Ein App-Passwort ist ein Passwort, dass einer App oder einem Gerät erlaubt auf Ihren %s-Konto zuzugreifen.",
     "App name" : "App-Name",
     "Create new app password" : "Neues App-Passwort erstellen",
+    "Use the credentials below to configure your app or device." : "Verwende die folgenden Zugangsdaten um deine App oder dein Gerät zu konfigurieren.",
+    "Username" : "Benutzername",
     "Done" : "Erledigt",
     "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
     "Desktop client" : "Desktop-Client",
@@ -292,7 +294,6 @@ OC.L10N.register(
     "Show user backend" : "Benutzer-Backend anzeigen",
     "Send email to new user" : "E-Mail an neuen Benutzer senden",
     "Show email address" : "E-Mail-Adresse anzeigen",
-    "Username" : "Benutzername",
     "E-Mail" : "E-Mail",
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 0ca5e040957..8a519bf5fe3 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -277,6 +277,8 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Ein App-Passwort ist ein Passwort, dass einer App oder einem Gerät erlaubt auf Ihren %s-Konto zuzugreifen.",
     "App name" : "App-Name",
     "Create new app password" : "Neues App-Passwort erstellen",
+    "Use the credentials below to configure your app or device." : "Verwende die folgenden Zugangsdaten um deine App oder dein Gerät zu konfigurieren.",
+    "Username" : "Benutzername",
     "Done" : "Erledigt",
     "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
     "Desktop client" : "Desktop-Client",
@@ -290,7 +292,6 @@
     "Show user backend" : "Benutzer-Backend anzeigen",
     "Send email to new user" : "E-Mail an neuen Benutzer senden",
     "Show email address" : "E-Mail-Adresse anzeigen",
-    "Username" : "Benutzername",
     "E-Mail" : "E-Mail",
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 8d9e821a067..b5b2e6f81da 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -279,6 +279,7 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Ein App-Passwort ist ein Passwort, dass einer App oder einem Gerät erlaubt auf Ihren %s-Konto zuzugreifen.",
     "App name" : "App-Name",
     "Create new app password" : "Neues App-Passwort erstellen",
+    "Username" : "Benutzername",
     "Done" : "Erledigt",
     "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
     "Desktop client" : "Desktop-Client",
@@ -292,7 +293,6 @@ OC.L10N.register(
     "Show user backend" : "Benutzer-Backend anzeigen",
     "Send email to new user" : "E-Mail an neuen Benutzer senden",
     "Show email address" : "E-Mail Adresse anzeigen",
-    "Username" : "Benutzername",
     "E-Mail" : "E-Mail",
     "Create" : "Erstellen",
     "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 436bc01b6c4..fbe9a78df25 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -277,6 +277,7 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Ein App-Passwort ist ein Passwort, dass einer App oder einem Gerät erlaubt auf Ihren %s-Konto zuzugreifen.",
     "App name" : "App-Name",
     "Create new app password" : "Neues App-Passwort erstellen",
+    "Username" : "Benutzername",
     "Done" : "Erledigt",
     "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
     "Desktop client" : "Desktop-Client",
@@ -290,7 +291,6 @@
     "Show user backend" : "Benutzer-Backend anzeigen",
     "Send email to new user" : "E-Mail an neuen Benutzer senden",
     "Show email address" : "E-Mail Adresse anzeigen",
-    "Username" : "Benutzername",
     "E-Mail" : "E-Mail",
     "Create" : "Erstellen",
     "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 0440c528d24..2cc122bb4ca 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -236,6 +236,7 @@ OC.L10N.register(
     "Language" : "Γλώσσα",
     "Help translate" : "Βοηθήστε στη μετάφραση",
     "Name" : "Όνομα",
+    "Username" : "Όνομα χρήστη",
     "Done" : "Ολοκληρώθηκε",
     "Get the apps to sync your files" : "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
     "Desktop client" : "Πελάτης σταθερού υπολογιστή",
@@ -249,7 +250,6 @@ OC.L10N.register(
     "Show user backend" : "Εμφάνιση χρήστη συστήματος υποστήριξης",
     "Send email to new user" : "Αποστολή μηνύματος στο νέο χρήστη",
     "Show email address" : "Εμφάνιση διεύθυνσης ηλ. αλληλογραφίας",
-    "Username" : "Όνομα χρήστη",
     "E-Mail" : "Ηλεκτρονική αλληλογραφία",
     "Create" : "Δημιουργία",
     "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 8170fc813b0..575701092e7 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -234,6 +234,7 @@
     "Language" : "Γλώσσα",
     "Help translate" : "Βοηθήστε στη μετάφραση",
     "Name" : "Όνομα",
+    "Username" : "Όνομα χρήστη",
     "Done" : "Ολοκληρώθηκε",
     "Get the apps to sync your files" : "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
     "Desktop client" : "Πελάτης σταθερού υπολογιστή",
@@ -247,7 +248,6 @@
     "Show user backend" : "Εμφάνιση χρήστη συστήματος υποστήριξης",
     "Send email to new user" : "Αποστολή μηνύματος στο νέο χρήστη",
     "Show email address" : "Εμφάνιση διεύθυνσης ηλ. αλληλογραφίας",
-    "Username" : "Όνομα χρήστη",
     "E-Mail" : "Ηλεκτρονική αλληλογραφία",
     "Create" : "Δημιουργία",
     "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 4b4194002b0..80c4aa33531 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -279,6 +279,7 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "An app password is a passcode that gives an app or device permissions to access your %s account.",
     "App name" : "App name",
     "Create new app password" : "Create new app password",
+    "Username" : "Username",
     "Done" : "Done",
     "Get the apps to sync your files" : "Get the apps to sync your files",
     "Desktop client" : "Desktop client",
@@ -292,7 +293,6 @@ OC.L10N.register(
     "Show user backend" : "Show user backend",
     "Send email to new user" : "Send email to new user",
     "Show email address" : "Show email address",
-    "Username" : "Username",
     "E-Mail" : "E-Mail",
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index ef3a53fcf5b..ead39f0dd18 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -277,6 +277,7 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "An app password is a passcode that gives an app or device permissions to access your %s account.",
     "App name" : "App name",
     "Create new app password" : "Create new app password",
+    "Username" : "Username",
     "Done" : "Done",
     "Get the apps to sync your files" : "Get the apps to sync your files",
     "Desktop client" : "Desktop client",
@@ -290,7 +291,6 @@
     "Show user backend" : "Show user backend",
     "Send email to new user" : "Send email to new user",
     "Show email address" : "Show email address",
-    "Username" : "Username",
     "E-Mail" : "E-Mail",
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js
index 55bad706b82..4c77ddf264d 100644
--- a/settings/l10n/eo.js
+++ b/settings/l10n/eo.js
@@ -125,6 +125,7 @@ OC.L10N.register(
     "Language" : "Lingvo",
     "Help translate" : "Helpu traduki",
     "Name" : "Nomo",
+    "Username" : "Uzantonomo",
     "Done" : "Farita",
     "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
     "Desktop client" : "Labortabla kliento",
@@ -132,7 +133,6 @@ OC.L10N.register(
     "iOS app" : "iOS-aplikaĵo",
     "Show last log in" : "Montri lastan ensaluton",
     "Show user backend" : "Montri uzantomotoron",
-    "Username" : "Uzantonomo",
     "E-Mail" : "Retpoŝtadreso",
     "Create" : "Krei",
     "Add Group" : "Aldoni grupon",
diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json
index dc0d29c1de7..e404bae79af 100644
--- a/settings/l10n/eo.json
+++ b/settings/l10n/eo.json
@@ -123,6 +123,7 @@
     "Language" : "Lingvo",
     "Help translate" : "Helpu traduki",
     "Name" : "Nomo",
+    "Username" : "Uzantonomo",
     "Done" : "Farita",
     "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
     "Desktop client" : "Labortabla kliento",
@@ -130,7 +131,6 @@
     "iOS app" : "iOS-aplikaĵo",
     "Show last log in" : "Montri lastan ensaluton",
     "Show user backend" : "Montri uzantomotoron",
-    "Username" : "Uzantonomo",
     "E-Mail" : "Retpoŝtadreso",
     "Create" : "Krei",
     "Add Group" : "Aldoni grupon",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 7360a987cd0..a4ca5574d33 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -274,6 +274,7 @@ OC.L10N.register(
     "Browser" : "Navegador",
     "Most recent activity" : "Actividad más reciente",
     "Name" : "Nombre",
+    "Username" : "Nombre de usuario",
     "Done" : "Hecho",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Desktop client" : "Cliente de escritorio",
@@ -287,7 +288,6 @@ OC.L10N.register(
     "Show user backend" : "Mostrar motor de usuario",
     "Send email to new user" : "Enviar correo al usuario nuevo",
     "Show email address" : "Mostrar dirección de correo electrónico",
-    "Username" : "Nombre de usuario",
     "E-Mail" : "Correo electrónico",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 06154e70e05..ddb3f67ed69 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -272,6 +272,7 @@
     "Browser" : "Navegador",
     "Most recent activity" : "Actividad más reciente",
     "Name" : "Nombre",
+    "Username" : "Nombre de usuario",
     "Done" : "Hecho",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Desktop client" : "Cliente de escritorio",
@@ -285,7 +286,6 @@
     "Show user backend" : "Mostrar motor de usuario",
     "Send email to new user" : "Enviar correo al usuario nuevo",
     "Show email address" : "Mostrar dirección de correo electrónico",
-    "Username" : "Nombre de usuario",
     "E-Mail" : "Correo electrónico",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
index 7c99d3e5d7a..555714a2bfe 100644
--- a/settings/l10n/es_AR.js
+++ b/settings/l10n/es_AR.js
@@ -105,12 +105,12 @@ OC.L10N.register(
     "Language" : "Idioma",
     "Help translate" : "Ayudanos a traducir",
     "Name" : "Nombre",
+    "Username" : "Nombre de usuario",
     "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "App para Android",
     "iOS app" : "App para iOS",
     "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución",
-    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de contraseña de administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
index 46cf5526f69..e737a875f61 100644
--- a/settings/l10n/es_AR.json
+++ b/settings/l10n/es_AR.json
@@ -103,12 +103,12 @@
     "Language" : "Idioma",
     "Help translate" : "Ayudanos a traducir",
     "Name" : "Nombre",
+    "Username" : "Nombre de usuario",
     "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "App para Android",
     "iOS app" : "App para iOS",
     "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución",
-    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de contraseña de administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js
index 3472c25389f..eaf58bd0387 100644
--- a/settings/l10n/es_MX.js
+++ b/settings/l10n/es_MX.js
@@ -80,9 +80,9 @@ OC.L10N.register(
     "Language" : "Idioma",
     "Help translate" : "Ayúdanos a traducir",
     "Name" : "Nombre",
+    "Username" : "Nombre de usuario",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
-    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json
index cefc0f8c6e3..daba89fa289 100644
--- a/settings/l10n/es_MX.json
+++ b/settings/l10n/es_MX.json
@@ -78,9 +78,9 @@
     "Language" : "Idioma",
     "Help translate" : "Ayúdanos a traducir",
     "Name" : "Nombre",
+    "Username" : "Nombre de usuario",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
-    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index 8448dd500fd..0695e032451 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -200,6 +200,7 @@ OC.L10N.register(
     "Language" : "Keel",
     "Help translate" : "Aita tõlkida",
     "Name" : "Nimi",
+    "Username" : "Kasutajanimi",
     "Done" : "Valmis",
     "Get the apps to sync your files" : "Hangi rakendusi failide sünkroniseerimiseks",
     "Desktop client" : "Töölaua klient",
@@ -210,7 +211,6 @@ OC.L10N.register(
     "Show last log in" : "Viimane sisselogimine",
     "Send email to new user" : "Saada uuele kasutajale e-kiri",
     "Show email address" : "Näita e-posti aadressi",
-    "Username" : "Kasutajanimi",
     "E-Mail" : "E-post",
     "Create" : "Lisa",
     "Admin Recovery Password" : "Admini parooli taastamine",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 8d74443002d..ff27e1d36ae 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -198,6 +198,7 @@
     "Language" : "Keel",
     "Help translate" : "Aita tõlkida",
     "Name" : "Nimi",
+    "Username" : "Kasutajanimi",
     "Done" : "Valmis",
     "Get the apps to sync your files" : "Hangi rakendusi failide sünkroniseerimiseks",
     "Desktop client" : "Töölaua klient",
@@ -208,7 +209,6 @@
     "Show last log in" : "Viimane sisselogimine",
     "Send email to new user" : "Saada uuele kasutajale e-kiri",
     "Show email address" : "Näita e-posti aadressi",
-    "Username" : "Kasutajanimi",
     "E-Mail" : "E-post",
     "Create" : "Lisa",
     "Admin Recovery Password" : "Admini parooli taastamine",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index a8703668ac2..636db8ccebf 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -164,6 +164,7 @@ OC.L10N.register(
     "Language" : "Hizkuntza",
     "Help translate" : "Lagundu itzultzen",
     "Name" : "Izena",
+    "Username" : "Erabiltzaile izena",
     "Done" : "Egina",
     "Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
     "Desktop client" : "Mahaigaineko bezeroa",
@@ -175,7 +176,6 @@ OC.L10N.register(
     "Show user backend" : "Bistaratu erabiltzaile motorra",
     "Send email to new user" : "Bidali eposta erabiltzaile berriari",
     "Show email address" : "Bistaratu eposta helbidea",
-    "Username" : "Erabiltzaile izena",
     "E-Mail" : "E-posta",
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index efb94b66a8a..992e2bf9119 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -162,6 +162,7 @@
     "Language" : "Hizkuntza",
     "Help translate" : "Lagundu itzultzen",
     "Name" : "Izena",
+    "Username" : "Erabiltzaile izena",
     "Done" : "Egina",
     "Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
     "Desktop client" : "Mahaigaineko bezeroa",
@@ -173,7 +174,6 @@
     "Show user backend" : "Bistaratu erabiltzaile motorra",
     "Send email to new user" : "Bidali eposta erabiltzaile berriari",
     "Show email address" : "Bistaratu eposta helbidea",
-    "Username" : "Erabiltzaile izena",
     "E-Mail" : "E-posta",
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index 591e7c429cf..09c3512832a 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -189,6 +189,7 @@ OC.L10N.register(
     "Language" : "زبان",
     "Help translate" : "به ترجمه آن کمک کنید",
     "Name" : "نام",
+    "Username" : "نام کاربری",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
     "Desktop client" : "نرم افزار دسکتاپ",
     "Android app" : "اپ اندروید",
@@ -198,7 +199,6 @@ OC.L10N.register(
     "Show last log in" : "نمایش اخرین ورود",
     "Send email to new user" : "ارسال ایمیل به کاربر جدید",
     "Show email address" : "نمایش پست الکترونیکی",
-    "Username" : "نام کاربری",
     "E-Mail" : "ایمیل",
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index b1c27a0c265..bfe47d62c6f 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -187,6 +187,7 @@
     "Language" : "زبان",
     "Help translate" : "به ترجمه آن کمک کنید",
     "Name" : "نام",
+    "Username" : "نام کاربری",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
     "Desktop client" : "نرم افزار دسکتاپ",
     "Android app" : "اپ اندروید",
@@ -196,7 +197,6 @@
     "Show last log in" : "نمایش اخرین ورود",
     "Send email to new user" : "ارسال ایمیل به کاربر جدید",
     "Show email address" : "نمایش پست الکترونیکی",
-    "Username" : "نام کاربری",
     "E-Mail" : "ایمیل",
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 9dce4b9a089..e6d8f986228 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -264,6 +264,8 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Sovellussalasana on suojakoodi, joka antaa sovellukselle tai laitteelle käyttöoikeuden %s-tiliisi.",
     "App name" : "Sovelluksen nimi",
     "Create new app password" : "Luo uusi sovellussalasana",
+    "Use the credentials below to configure your app or device." : "Käytä alla olevia kirjautumistietoja määrittääksesi sovelluksesi tai laitteen.",
+    "Username" : "Käyttäjätunnus",
     "Done" : "Valmis",
     "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
     "Desktop client" : "Työpöytäsovellus",
@@ -277,7 +279,6 @@ OC.L10N.register(
     "Show user backend" : "Näytä käyttäjätaustaosa",
     "Send email to new user" : "Lähetä sähköpostia uudelle käyttäjälle",
     "Show email address" : "Näytä sähköpostiosoite",
-    "Username" : "Käyttäjätunnus",
     "E-Mail" : "Sähköposti",
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index efa330bc210..393256e29be 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -262,6 +262,8 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Sovellussalasana on suojakoodi, joka antaa sovellukselle tai laitteelle käyttöoikeuden %s-tiliisi.",
     "App name" : "Sovelluksen nimi",
     "Create new app password" : "Luo uusi sovellussalasana",
+    "Use the credentials below to configure your app or device." : "Käytä alla olevia kirjautumistietoja määrittääksesi sovelluksesi tai laitteen.",
+    "Username" : "Käyttäjätunnus",
     "Done" : "Valmis",
     "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
     "Desktop client" : "Työpöytäsovellus",
@@ -275,7 +277,6 @@
     "Show user backend" : "Näytä käyttäjätaustaosa",
     "Send email to new user" : "Lähetä sähköpostia uudelle käyttäjälle",
     "Show email address" : "Näytä sähköpostiosoite",
-    "Username" : "Käyttäjätunnus",
     "E-Mail" : "Sähköposti",
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 8e7d471da92..d82e24e63f5 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -118,6 +118,8 @@ OC.L10N.register(
     "__language_name__" : "Français",
     "Unlimited" : "Illimité",
     "Personal info" : "Informations personnelles",
+    "Sessions" : "Sessions",
+    "App passwords" : "Mots de passe d'applications",
     "Sync clients" : "Clients de synchronisation",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
     "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
@@ -135,6 +137,7 @@ OC.L10N.register(
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Votre base de données n'est pas lancée avec le niveau d'isolation de transaction \"READ COMMITED\". Cela peut causer des problèmes lorsque plusieurs actions sont lancées parallèlement.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
@@ -271,7 +274,13 @@ OC.L10N.register(
     "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Voici les clients web, de bureau et mobiles actuellement connectés à votre ownCloud.",
     "Browser" : "Navigateur",
     "Most recent activity" : "Activité la plus récente",
+    "You've linked these apps." : "Vous avez lié ces applications.",
     "Name" : "Nom",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Un mot de passe d'une application est un code d'accès qui donne à une application ou à un appareil les droits d'accès à votre compte %s.",
+    "App name" : "Nom de l'application",
+    "Create new app password" : "Créer un nouveau mot de passe d'application",
+    "Use the credentials below to configure your app or device." : "Utilisez les identifiants ci-dessous pour configurer votre application ou votre périphérique.",
+    "Username" : "Nom d'utilisateur",
     "Done" : "Terminé",
     "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
     "Desktop client" : "Client de bureau",
@@ -285,7 +294,6 @@ OC.L10N.register(
     "Show user backend" : "Montrer la source de l'identifiant",
     "Send email to new user" : "Envoyer un e-mail aux utilisateurs créés",
     "Show email address" : "Afficher l'adresse e-mail",
-    "Username" : "Nom d'utilisateur",
     "E-Mail" : "E-Mail",
     "Create" : "Créer",
     "Admin Recovery Password" : "Mot de passe Administrateur de récupération",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 3f2d630a254..d67207cfceb 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -116,6 +116,8 @@
     "__language_name__" : "Français",
     "Unlimited" : "Illimité",
     "Personal info" : "Informations personnelles",
+    "Sessions" : "Sessions",
+    "App passwords" : "Mots de passe d'applications",
     "Sync clients" : "Clients de synchronisation",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
     "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
@@ -133,6 +135,7 @@
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Votre base de données n'est pas lancée avec le niveau d'isolation de transaction \"READ COMMITED\". Cela peut causer des problèmes lorsque plusieurs actions sont lancées parallèlement.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
@@ -269,7 +272,13 @@
     "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Voici les clients web, de bureau et mobiles actuellement connectés à votre ownCloud.",
     "Browser" : "Navigateur",
     "Most recent activity" : "Activité la plus récente",
+    "You've linked these apps." : "Vous avez lié ces applications.",
     "Name" : "Nom",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Un mot de passe d'une application est un code d'accès qui donne à une application ou à un appareil les droits d'accès à votre compte %s.",
+    "App name" : "Nom de l'application",
+    "Create new app password" : "Créer un nouveau mot de passe d'application",
+    "Use the credentials below to configure your app or device." : "Utilisez les identifiants ci-dessous pour configurer votre application ou votre périphérique.",
+    "Username" : "Nom d'utilisateur",
     "Done" : "Terminé",
     "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
     "Desktop client" : "Client de bureau",
@@ -283,7 +292,6 @@
     "Show user backend" : "Montrer la source de l'identifiant",
     "Send email to new user" : "Envoyer un e-mail aux utilisateurs créés",
     "Show email address" : "Afficher l'adresse e-mail",
-    "Username" : "Nom d'utilisateur",
     "E-Mail" : "E-Mail",
     "Create" : "Créer",
     "Admin Recovery Password" : "Mot de passe Administrateur de récupération",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 2d8d5de8fe4..3700858e89c 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -226,6 +226,7 @@ OC.L10N.register(
     "Language" : "Idioma",
     "Help translate" : "Axude na tradución",
     "Name" : "Nome",
+    "Username" : "Nome de usuario",
     "Done" : "Feito",
     "Get the apps to sync your files" : "Obteña as aplicacións para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente de escritorio",
@@ -239,7 +240,6 @@ OC.L10N.register(
     "Show user backend" : "Amosar a infraestrutura do usuario",
     "Send email to new user" : "Enviar correo ao novo usuario",
     "Show email address" : "Amosar o enderezo de correo",
-    "Username" : "Nome de usuario",
     "E-Mail" : "Correo-e",
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index bad67ea9dc0..15bdd201966 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -224,6 +224,7 @@
     "Language" : "Idioma",
     "Help translate" : "Axude na tradución",
     "Name" : "Nome",
+    "Username" : "Nome de usuario",
     "Done" : "Feito",
     "Get the apps to sync your files" : "Obteña as aplicacións para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente de escritorio",
@@ -237,7 +238,6 @@
     "Show user backend" : "Amosar a infraestrutura do usuario",
     "Send email to new user" : "Enviar correo ao novo usuario",
     "Show email address" : "Amosar o enderezo de correo",
-    "Username" : "Nome de usuario",
     "E-Mail" : "Correo-e",
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
index 5f817228785..a826740fcc6 100644
--- a/settings/l10n/he.js
+++ b/settings/l10n/he.js
@@ -279,6 +279,8 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "סיסמת יישום הנה קוד סיסמא שמאפשרת ליישום או התקן הרשאות גישה לחשבון %s שלך.",
     "App name" : "שם יישום",
     "Create new app password" : "יצירת סיסמת יישום חדשה",
+    "Use the credentials below to configure your app or device." : "יש להשתמש באישורים מטה להגדרת היישום או ההתקן שלך.",
+    "Username" : "שם משתמש",
     "Done" : "הסתיים",
     "Get the apps to sync your files" : "קבלת היישומים לסנכרון הקבצים שלך",
     "Desktop client" : "מחשב אישי",
@@ -292,7 +294,6 @@ OC.L10N.register(
     "Show user backend" : "הצגת צד אחורי למשתמש",
     "Send email to new user" : "שליחת דואר אלקטרוני למשתמש חדש",
     "Show email address" : "הצגת כתובת דואר אלקטרוני",
-    "Username" : "שם משתמש",
     "E-Mail" : "דואר אלקטרוני",
     "Create" : "יצירה",
     "Admin Recovery Password" : "סיסמת השחזור של המנהל",
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
index ebf865f7447..815af3de0c9 100644
--- a/settings/l10n/he.json
+++ b/settings/l10n/he.json
@@ -277,6 +277,8 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "סיסמת יישום הנה קוד סיסמא שמאפשרת ליישום או התקן הרשאות גישה לחשבון %s שלך.",
     "App name" : "שם יישום",
     "Create new app password" : "יצירת סיסמת יישום חדשה",
+    "Use the credentials below to configure your app or device." : "יש להשתמש באישורים מטה להגדרת היישום או ההתקן שלך.",
+    "Username" : "שם משתמש",
     "Done" : "הסתיים",
     "Get the apps to sync your files" : "קבלת היישומים לסנכרון הקבצים שלך",
     "Desktop client" : "מחשב אישי",
@@ -290,7 +292,6 @@
     "Show user backend" : "הצגת צד אחורי למשתמש",
     "Send email to new user" : "שליחת דואר אלקטרוני למשתמש חדש",
     "Show email address" : "הצגת כתובת דואר אלקטרוני",
-    "Username" : "שם משתמש",
     "E-Mail" : "דואר אלקטרוני",
     "Create" : "יצירה",
     "Admin Recovery Password" : "סיסמת השחזור של המנהל",
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
index 04562940a61..338d94e631c 100644
--- a/settings/l10n/hr.js
+++ b/settings/l10n/hr.js
@@ -135,11 +135,11 @@ OC.L10N.register(
     "Language" : "Jezik",
     "Help translate" : "Pomozite prevesti",
     "Name" : "Naziv",
+    "Username" : "Korisničko ime",
     "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka",
     "Show First Run Wizard again" : "Opet pokažite First Run Wizard",
     "Show storage location" : "Prikaži mjesto pohrane",
     "Show last log in" : "Prikaži zadnje spajanje",
-    "Username" : "Korisničko ime",
     "Create" : "Kreirajte",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
     "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
index 0d06db8f80a..569e26f180e 100644
--- a/settings/l10n/hr.json
+++ b/settings/l10n/hr.json
@@ -133,11 +133,11 @@
     "Language" : "Jezik",
     "Help translate" : "Pomozite prevesti",
     "Name" : "Naziv",
+    "Username" : "Korisničko ime",
     "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka",
     "Show First Run Wizard again" : "Opet pokažite First Run Wizard",
     "Show storage location" : "Prikaži mjesto pohrane",
     "Show last log in" : "Prikaži zadnje spajanje",
-    "Username" : "Korisničko ime",
     "Create" : "Kreirajte",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
     "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index a4b072beb00..f4007918d98 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -261,6 +261,7 @@ OC.L10N.register(
     "Language" : "Nyelv",
     "Help translate" : "Segítsen a fordításban!",
     "Name" : "Név",
+    "Username" : "Felhasználónév",
     "Done" : "Kész",
     "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
     "Desktop client" : "Asztali kliens",
@@ -274,7 +275,6 @@ OC.L10N.register(
     "Show user backend" : "Felhasználói háttér mutatása",
     "Send email to new user" : "E-mail küldése az új felhasználónak",
     "Show email address" : "E-mail cím megjelenítése",
-    "Username" : "Felhasználónév",
     "E-Mail" : "E-mail",
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index f46eb68a9e0..a288f5bcdae 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -259,6 +259,7 @@
     "Language" : "Nyelv",
     "Help translate" : "Segítsen a fordításban!",
     "Name" : "Név",
+    "Username" : "Felhasználónév",
     "Done" : "Kész",
     "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
     "Desktop client" : "Asztali kliens",
@@ -272,7 +273,6 @@
     "Show user backend" : "Felhasználói háttér mutatása",
     "Send email to new user" : "E-mail küldése az új felhasználónak",
     "Show email address" : "E-mail cím megjelenítése",
-    "Username" : "Felhasználónév",
     "E-Mail" : "E-mail",
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
diff --git a/settings/l10n/ia.js b/settings/l10n/ia.js
index e772ddb4e68..0a2d257bc72 100644
--- a/settings/l10n/ia.js
+++ b/settings/l10n/ia.js
@@ -32,8 +32,8 @@ OC.L10N.register(
     "Language" : "Linguage",
     "Help translate" : "Adjuta a traducer",
     "Name" : "Nomine",
-    "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
     "Username" : "Nomine de usator",
+    "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
     "Create" : "Crear",
     "Group" : "Gruppo",
     "Default Quota" : "Quota predeterminate",
diff --git a/settings/l10n/ia.json b/settings/l10n/ia.json
index d8b66b08779..aa4fe78d1cb 100644
--- a/settings/l10n/ia.json
+++ b/settings/l10n/ia.json
@@ -30,8 +30,8 @@
     "Language" : "Linguage",
     "Help translate" : "Adjuta a traducer",
     "Name" : "Nomine",
-    "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
     "Username" : "Nomine de usator",
+    "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
     "Create" : "Crear",
     "Group" : "Gruppo",
     "Default Quota" : "Quota predeterminate",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index df28898b884..d0190ad1fec 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -236,6 +236,7 @@ OC.L10N.register(
     "Language" : "Bahasa",
     "Help translate" : "Bantu menerjemahkan",
     "Name" : "Nama",
+    "Username" : "Nama pengguna",
     "Done" : "Selesai",
     "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
     "Desktop client" : "Klien desktop",
@@ -249,7 +250,6 @@ OC.L10N.register(
     "Show user backend" : "Tampilkan pengguna backend",
     "Send email to new user" : "Kirim email kepada pengguna baru",
     "Show email address" : "Tampilkan alamat email",
-    "Username" : "Nama pengguna",
     "E-Mail" : "E-Mail",
     "Create" : "Buat",
     "Admin Recovery Password" : "Sandi pemulihan Admin",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 401e2f83c3c..0f8483cfe16 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -234,6 +234,7 @@
     "Language" : "Bahasa",
     "Help translate" : "Bantu menerjemahkan",
     "Name" : "Nama",
+    "Username" : "Nama pengguna",
     "Done" : "Selesai",
     "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
     "Desktop client" : "Klien desktop",
@@ -247,7 +248,6 @@
     "Show user backend" : "Tampilkan pengguna backend",
     "Send email to new user" : "Kirim email kepada pengguna baru",
     "Show email address" : "Tampilkan alamat email",
-    "Username" : "Nama pengguna",
     "E-Mail" : "E-Mail",
     "Create" : "Buat",
     "Admin Recovery Password" : "Sandi pemulihan Admin",
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
index 5a8239024cd..d5726eab758 100644
--- a/settings/l10n/is.js
+++ b/settings/l10n/is.js
@@ -246,6 +246,7 @@ OC.L10N.register(
     "Language" : "Tungumál",
     "Help translate" : "Hjálpa við þýðingu",
     "Name" : "Heiti",
+    "Username" : "Notandanafn",
     "Get the apps to sync your files" : "Náðu í forrit til að samstilla skrárnar þínar",
     "Desktop client" : "Skjáborðsforrit",
     "Android app" : "Android-forrit",
@@ -258,7 +259,6 @@ OC.L10N.register(
     "Show user backend" : "Birta bakenda notanda",
     "Send email to new user" : "Senda tölvupóst til nýs notanda",
     "Show email address" : "Birta tölvupóstfang",
-    "Username" : "Notandanafn",
     "E-Mail" : "Tölvupóstfang",
     "Create" : "Búa til",
     "Admin Recovery Password" : "Endurheimtulykilorð kerfisstjóra",
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
index 1978017663b..82940519382 100644
--- a/settings/l10n/is.json
+++ b/settings/l10n/is.json
@@ -244,6 +244,7 @@
     "Language" : "Tungumál",
     "Help translate" : "Hjálpa við þýðingu",
     "Name" : "Heiti",
+    "Username" : "Notandanafn",
     "Get the apps to sync your files" : "Náðu í forrit til að samstilla skrárnar þínar",
     "Desktop client" : "Skjáborðsforrit",
     "Android app" : "Android-forrit",
@@ -256,7 +257,6 @@
     "Show user backend" : "Birta bakenda notanda",
     "Send email to new user" : "Senda tölvupóst til nýs notanda",
     "Show email address" : "Birta tölvupóstfang",
-    "Username" : "Notandanafn",
     "E-Mail" : "Tölvupóstfang",
     "Create" : "Búa til",
     "Admin Recovery Password" : "Endurheimtulykilorð kerfisstjóra",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 4eebb5a5223..2165464a6e6 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -279,6 +279,8 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Una password di applicazione è un codice di sicurezza che fornisce a un'applicazione o a un dispositivo i permessi per accedere al tuo account %s.",
     "App name" : "Nome applicazione",
     "Create new app password" : "Crea nuova password di applicazione",
+    "Use the credentials below to configure your app or device." : "Usa le credenziali seguenti per configurare l'applicazione o il dispositivo.",
+    "Username" : "Nome utente",
     "Done" : "Completato",
     "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
     "Desktop client" : "Client desktop",
@@ -292,7 +294,6 @@ OC.L10N.register(
     "Show user backend" : "Mostra il motore utente",
     "Send email to new user" : "Invia email al nuovo utente",
     "Show email address" : "Mostra l'indirizzo email",
-    "Username" : "Nome utente",
     "E-Mail" : "Posta elettronica",
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index d41cd92359f..86469acd7ff 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -277,6 +277,8 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Una password di applicazione è un codice di sicurezza che fornisce a un'applicazione o a un dispositivo i permessi per accedere al tuo account %s.",
     "App name" : "Nome applicazione",
     "Create new app password" : "Crea nuova password di applicazione",
+    "Use the credentials below to configure your app or device." : "Usa le credenziali seguenti per configurare l'applicazione o il dispositivo.",
+    "Username" : "Nome utente",
     "Done" : "Completato",
     "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
     "Desktop client" : "Client desktop",
@@ -290,7 +292,6 @@
     "Show user backend" : "Mostra il motore utente",
     "Send email to new user" : "Invia email al nuovo utente",
     "Show email address" : "Mostra l'indirizzo email",
-    "Username" : "Nome utente",
     "E-Mail" : "Posta elettronica",
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index a466d7cf225..e4fd8597f13 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -271,6 +271,7 @@ OC.L10N.register(
     "Browser" : "ブラウザ",
     "Most recent activity" : "最新のアクティビティ",
     "Name" : "名前",
+    "Username" : "ユーザーID",
     "Done" : "完了",
     "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
     "Desktop client" : "デスクトップクライアント",
@@ -284,7 +285,6 @@ OC.L10N.register(
     "Show user backend" : "ユーザーバックエンドを表示",
     "Send email to new user" : "新規ユーザーにメールを送信",
     "Show email address" : "メールアドレスを表示",
-    "Username" : "ユーザーID",
     "E-Mail" : "メール",
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 94cab8e2ed5..a6ba1cd66f1 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -269,6 +269,7 @@
     "Browser" : "ブラウザ",
     "Most recent activity" : "最新のアクティビティ",
     "Name" : "名前",
+    "Username" : "ユーザーID",
     "Done" : "完了",
     "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
     "Desktop client" : "デスクトップクライアント",
@@ -282,7 +283,6 @@
     "Show user backend" : "ユーザーバックエンドを表示",
     "Send email to new user" : "新規ユーザーにメールを送信",
     "Show email address" : "メールアドレスを表示",
-    "Username" : "ユーザーID",
     "E-Mail" : "メール",
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
diff --git a/settings/l10n/ka_GE.js b/settings/l10n/ka_GE.js
index 2d125ba7995..0db979f42c2 100644
--- a/settings/l10n/ka_GE.js
+++ b/settings/l10n/ka_GE.js
@@ -55,9 +55,9 @@ OC.L10N.register(
     "Language" : "ენა",
     "Help translate" : "თარგმნის დახმარება",
     "Name" : "სახელი",
+    "Username" : "მომხმარებლის სახელი",
     "Get the apps to sync your files" : "აპლიკაცია ფაილების სინქრონიზაციისთვის",
     "Show First Run Wizard again" : "მაჩვენე თავიდან გაშვებული ვიზარდი",
-    "Username" : "მომხმარებლის სახელი",
     "Create" : "შექმნა",
     "Default Quota" : "საწყისი ქვოტა",
     "Other" : "სხვა",
diff --git a/settings/l10n/ka_GE.json b/settings/l10n/ka_GE.json
index 11fb2e4e2d4..0f53e61b906 100644
--- a/settings/l10n/ka_GE.json
+++ b/settings/l10n/ka_GE.json
@@ -53,9 +53,9 @@
     "Language" : "ენა",
     "Help translate" : "თარგმნის დახმარება",
     "Name" : "სახელი",
+    "Username" : "მომხმარებლის სახელი",
     "Get the apps to sync your files" : "აპლიკაცია ფაილების სინქრონიზაციისთვის",
     "Show First Run Wizard again" : "მაჩვენე თავიდან გაშვებული ვიზარდი",
-    "Username" : "მომხმარებლის სახელი",
     "Create" : "შექმნა",
     "Default Quota" : "საწყისი ქვოტა",
     "Other" : "სხვა",
diff --git a/settings/l10n/km.js b/settings/l10n/km.js
index a5de441b361..1b7f59ef236 100644
--- a/settings/l10n/km.js
+++ b/settings/l10n/km.js
@@ -74,9 +74,9 @@ OC.L10N.register(
     "Language" : "ភាសា",
     "Help translate" : "ជួយ​បក​ប្រែ",
     "Name" : "ឈ្មោះ",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Get the apps to sync your files" : "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
     "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តង​ទៀត",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Create" : "បង្កើត",
     "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
     "Other" : "ផ្សេងៗ",
diff --git a/settings/l10n/km.json b/settings/l10n/km.json
index 91f83037b42..6b99c49cb8f 100644
--- a/settings/l10n/km.json
+++ b/settings/l10n/km.json
@@ -72,9 +72,9 @@
     "Language" : "ភាសា",
     "Help translate" : "ជួយ​បក​ប្រែ",
     "Name" : "ឈ្មោះ",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Get the apps to sync your files" : "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
     "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តង​ទៀត",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Create" : "បង្កើត",
     "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
     "Other" : "ផ្សេងៗ",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 6a0d74e43a0..89fc7d0b283 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -253,6 +253,7 @@ OC.L10N.register(
     "Language" : "언어",
     "Help translate" : "번역 돕기",
     "Name" : "이름",
+    "Username" : "사용자 이름",
     "Done" : "완료",
     "Get the apps to sync your files" : "파일 동기화 앱 가져오기",
     "Desktop client" : "데스크톱 클라이언트",
@@ -266,7 +267,6 @@ OC.L10N.register(
     "Show user backend" : "사용자 백엔드 보이기",
     "Send email to new user" : "새 사용자에게 이메일 보내기",
     "Show email address" : "이메일 주소 보이기",
-    "Username" : "사용자 이름",
     "E-Mail" : "이메일",
     "Create" : "만들기",
     "Admin Recovery Password" : "관리자 복구 암호",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 81efe3a01ee..00801d048eb 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -251,6 +251,7 @@
     "Language" : "언어",
     "Help translate" : "번역 돕기",
     "Name" : "이름",
+    "Username" : "사용자 이름",
     "Done" : "완료",
     "Get the apps to sync your files" : "파일 동기화 앱 가져오기",
     "Desktop client" : "데스크톱 클라이언트",
@@ -264,7 +265,6 @@
     "Show user backend" : "사용자 백엔드 보이기",
     "Send email to new user" : "새 사용자에게 이메일 보내기",
     "Show email address" : "이메일 주소 보이기",
-    "Username" : "사용자 이름",
     "E-Mail" : "이메일",
     "Create" : "만들기",
     "Admin Recovery Password" : "관리자 복구 암호",
diff --git a/settings/l10n/lb.js b/settings/l10n/lb.js
index 42376d82028..80bd1b1fe89 100644
--- a/settings/l10n/lb.js
+++ b/settings/l10n/lb.js
@@ -2,44 +2,219 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Falscht Passwuert",
+    "No user supplied" : "Kee Benotzer ugebueden",
     "Authentication error" : "Authentifikatioun's Fehler",
+    "Unable to change password" : "Konnt Passwuert net änneren",
     "Enabled" : "Aktivéiert",
+    "Not enabled" : "Net aktivéiert",
+    "A problem occurred, please check your log files (Error: %s)" : "Et ass e Problem opgetrueden, w.e.g kuckt är Log Fichieren (Feeler: %s)",
+    "Migration Completed" : "D'Migratioun ass erfëllt",
+    "Group already exists." : "D'Grupp existéiert schonn",
+    "Unable to add group." : "Onmeiglech fir d'Grupp beizefügen.",
+    "Unable to delete group." : "Onmeiglech d'Grupp ze läschen.",
+    "log-level out of allowed range" : "Log-Level ass ausserhalb vum erlaabte Beräich",
     "Saved" : "Gespäichert",
+    "test email settings" : "Test Email Astellungen",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Während dem Schécke vun der Email ass e Problem opgetrueden. W.e.g kuckt är Astellungen no. (Feeler: %s)",
     "Email sent" : "Email geschéckt",
+    "You need to set your user email before being able to send test emails." : "Du muss deng Email-Adress konfiguréieren éiers de Test-Maile schécke kanns.",
+    "Invalid mail address" : "Ongëlteg Email Adress",
+    "A user with that name already exists." : "E Benotzer mat dësem Numm existéiert schonn.",
+    "Unable to create user." : "Onméiglech de Benotzer ze erschafen.",
+    "Your %s account was created" : "Däin %s Kont gouf erschaf",
+    "Unable to delete user." : "Onmeiglech fir de User zu läschen.",
+    "Forbidden" : "Net erlaabt",
+    "Invalid user" : "Ongëltege Benotzer",
+    "Unable to change mail address" : "Onméiglech d'Email Adress ze änneren.",
     "Email saved" : "E-mail gespäichert",
+    "Your full name has been changed." : "Äre ganzen Numm ass geännert ginn.",
+    "Unable to change full name" : "Onméiglech de ganzen Numm ze änneren.",
     "APCu" : "APCu",
     "Redis" : "Redis",
+    "Security & setup warnings" : "Sécherheets & Konfiguratiouns Warnung",
     "Sharing" : "Gedeelt",
+    "Server-side encryption" : "Verschlësselung vun der Säit vum Server",
+    "External Storage" : "Externt Lager",
     "Cron" : "Cron",
+    "Email server" : "Email Server",
     "Log" : "Log",
+    "Tips & tricks" : "Tipps & Tricken",
     "Updates" : "Updates",
+    "Couldn't remove app." : "D'App konnt net ewechgeholl ginn.",
     "Language changed" : "Sprooch huet geännert",
     "Invalid request" : "Ongülteg Requête",
     "Admins can't remove themself from the admin group" : "Admins kennen sech selwer net aus enger Admin Group läschen.",
     "Unable to add user to group %s" : "Onmeiglech User an Grupp ze sätzen %s",
+    "Unable to remove user from group %s" : "Onméiglech fir de Benotzer vum Grupp %s ewech ze huelen",
+    "Couldn't update app." : "D'App konnt net erweidert ginn.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bas du wierklech sécher dass de \"{Domän}\" als zouverlässeg Domän derbäi setzen wëlls?",
+    "Add trusted domain" : "Zouverlässeg Domän derbäi setzen",
+    "Migration in progress. Please wait until the migration is finished" : "D'Migratioun ass am gaangen. W.e.g waart bis d'Migratioun fäerdeg ass",
+    "Migration started …" : "D'Migratioun fänkt un ...",
+    "Sending..." : "Gëtt geschéckt...",
+    "Official" : "Offiziell",
+    "Approved" : "Accordéiert",
+    "Experimental" : "Experimentell",
     "All" : "All",
+    "No apps found for your version" : "Et gouf keng App fir deng Versioun fonnt",
+    "The app will be downloaded from the app store" : "D'App gëtt aus dem App Buttek erofgelueden",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dës App ass net op Sécherheets Problemer getest ginn an ass nei oder bekannt fir onstabil ze sinn. Installéieren op eegene Risiko.",
+    "Update to %s" : "Update op %s",
+    "_You have %n app update pending_::_You have %n app updates pending_" : ["Du hues %n App Aktualiséierung opstoen","Du hues %n App Aktualiséierungen opstoen"],
+    "Please wait...." : "W.e.g. waarden...",
+    "Error while disabling app" : "Feeler beim App ofschalten",
     "Disable" : "Ofschalten",
     "Enable" : "Aschalten",
+    "Error while enabling app" : "Feeler beim App aschalten",
+    "Error: this app cannot be enabled because it makes the server unstable" : "Feeler: Dës App kann net ageschalt ginn well et de Server onstabil mécht",
+    "Error: could not disable broken app" : "Feeler: déi futti's App kann net ofgeschalt ginn",
+    "Error while disabling broken app" : "Feller beim Ofschalte vun der futtisser App",
+    "Updating...." : "Aktualiséieren...",
+    "Error while updating app" : "Feeler beim Aktualiséiere vun der App",
+    "Updated" : "Aktualiséiert",
+    "Uninstalling ...." : "Gëtt desinstalléiert ...",
+    "Error while uninstalling app" : "Feeler beim App desinstalléieren",
+    "Uninstall" : "Desinstalléieren",
+    "App update" : "App Aktualiséierung",
+    "No apps found for {query}" : "Keng Apps fonnt fir {Ufro}",
+    "Disconnect" : "Trennen",
+    "Error while loading browser sessions and device tokens" : "Feeler während d'Browser Sëtzunge an d'Token Geräter gelueden hunn",
+    "Error while creating device token" : "Feeler beim Erstelle vum Token Gerät",
+    "Error while deleting the token" : "Feeler beim Läsche vum Token",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Et ass e Feeler opgetrueden. W.e.g. luet een ASCII-encodéierte PEM Zertifikat erop.",
+    "Valid until {date}" : "Gülteg bis {Datum}",
     "Delete" : "Läschen",
+    "An error occurred: {message}" : "Et ass e Fehler opgetrueden: {Noriicht}",
+    "Select a profile picture" : "Wiel e Profil Bild aus",
+    "Very weak password" : "Ganz schwaacht Passwuert",
+    "Weak password" : "Schwaacht Passwuert",
+    "So-so password" : "La-La Passwuert",
+    "Good password" : "Gutt Passwuert",
+    "Strong password" : "Staarkt Passwuert",
     "Groups" : "Gruppen",
-    "undo" : "réckgängeg man",
-    "never" : "ni",
+    "Unable to delete {objName}" : "Onmeiglech fir {objName} ze läschen",
+    "Error creating group: {message}" : "Feeler beim Erstelle vun der Grupp: {Noriicht}",
+    "A valid group name must be provided" : "Et muss e gültege Gruppen Numm ugi ginn",
+    "deleted {groupName}" : "Geläscht {GruppenNumm}",
+    "undo" : "Réckgängeg man",
+    "no group" : "Keng Grupp",
+    "never" : "Ni",
+    "deleted {userName}" : "Geläscht  {Benotzernumm}",
+    "add group" : "Grupp bäisetzen",
+    "Changing the password will result in data loss, because data recovery is not available for this user" : "D'Passwuert ännere wäert e Verloscht vun den Daten provozéiere, well Daten zeréck gewannen ass net disponibel fir dëse Benotzer",
+    "A valid username must be provided" : "Et muss e gültegen Benotzernumm ugi ginn",
+    "Error creating user: {message}" : "Feeler beim Erstelle vum Benotzer: {Noriicht}",
+    "A valid password must be provided" : "Et muss e gültegt Passwuert ugi ginn",
+    "A valid email must be provided" : "Et muss eng gülteg Emails Adresse ugi ginn",
     "__language_name__" : "__language_name__",
+    "Unlimited" : "Onlimitéiert",
+    "Personal info" : "Perséinlech Informatioun",
+    "Sessions" : "Sëtzung",
+    "App passwords" : "App Passwierder",
+    "Sync clients" : "Sync vun de Clienten",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatal Aspekter, Feeler, Warnungen, Informatiounen, Debug)",
+    "Info, warnings, errors and fatal issues" : " Informatiounen, Warnungen, Feeler a fatal Aspekter",
+    "Warnings, errors and fatal issues" : "Warnungen, Feeler a fatal Aspekter",
+    "Errors and fatal issues" : "Feeler a fatal Aspekter",
+    "Fatal issues only" : "Nëmmen fatal Aspekter",
     "None" : "Keng",
     "Login" : "Login",
+    "Plain" : "Kloer",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "This means that there might be problems with certain characters in file names." : "Dëst heescht dass Problemer mat bestëmmte Charaktere bei de Fichier Nimm optauche kéinten.",
+    "All checks passed." : "All d'Tester bestanen.",
     "Open documentation" : "Dokumentatioun opmaachen",
     "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen",
+    "Allow users to share via link" : "De Benotzer d'Deele via Link erlaben",
+    "Allow public uploads" : "Ëffentlechen Upload erlaaben",
+    "Enforce password protection" : "Passwuert Schutz forcéieren",
+    "Set default expiration date" : "E Standard Verfallsdatum setzen",
+    "Allow users to send mail notification for shared files" : "De Benotzer erlaben Email Notifikatiounen fir gedeelten Fichieren ze schécken",
+    "Expire after " : "Oflafen nom",
     "days" : "Deeg",
+    "Enforce expiration date" : "Verfallsdatum forcéieren",
     "Allow resharing" : "Resharing erlaben",
+    "Allow sharing with groups" : "Deele mat Gruppen erlaben",
+    "Restrict users to only share with users in their groups" : "Benotzer aschränken fir nëmmen mat Benotzer aus hirerem Grupp ze deelen",
+    "Exclude groups from sharing" : "Gruppe vum Deelen ausschléissen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Dës Gruppe kënnen weiderhin Undeeler kréien, mee kënnen se net ufänken.",
+    "Last cron job execution: %s." : "Leschte Cron Job Ausféierung: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Leschte Cron Job Ausféierung: %s. Eppes schéngt net ze klappen.",
+    "Cron was not executed yet!" : "Cron ass nach net ausgefouert ginn!",
+    "Execute one task with each page loaded" : "Mat all geluedener Säit eng Aufgab ausféieren",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ass als webcron Service registréiert fir cron.php all15 Minutten iwwer http opzeruffen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Dem System säi Cron Service benotze fir d'Cron.php Fichieren all 15 Minutten opzeruffen.",
+    "Enable server-side encryption" : "Verschlësselung vun der Säit vum Server erlaaben",
+    "Please read carefully before activating server-side encryption: " : "W.e.g. lies opmierksam éier d'Verschlësselung vun der Säit vum Server aktivéiert gëtt:",
+    "Be aware that encryption always increases the file size." : "Sief der bewosst dass Verschlësselung ëmmer d'Gréisst vum Fichier erhéicht.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dëst ass déi lescht Warnung: Wëlls de wierklech d'Verschlësselung aschalten?",
+    "Enable encryption" : "Verschlësselung aschalten",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Kee Verschlësselungs Modul gelueden, w.e.g. schalt en Verschlësselungs Modul am App Menü an.",
+    "Select default encryption module:" : "Standard Verschlësselung Modul auswielen:",
+    "Start migration" : "Migratioun ufänke",
+    "This is used for sending out notifications." : "Dëst gëtt benotzt fir Notifikatiounen eraus ze schécken.",
+    "Send mode" : "Verschécke-Modus",
+    "Encryption" : "Verschlësselung",
+    "From address" : "Vun der Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Authentifizéierungs Method",
     "Authentication required" : "Authentifizéierung néideg",
     "Server address" : "Server Adress",
     "Port" : "Port",
+    "SMTP Username" : "SMTP Benotzernumm",
+    "SMTP Password" : "SMTP Passwuert",
+    "Test email settings" : "Email Astellungen testen",
+    "Send email" : "Email schécken",
+    "Download logfile" : "Log Fichier eroflueden",
     "More" : "Méi",
     "Less" : "Manner",
+    "What to log" : "Wat loggen",
+    "How to do backups" : "Wéi ee Backup'e mécht",
+    "Advanced monitoring" : "Erweidert Beobachtung",
+    "Performance tuning" : "Leeschtungs Optimiséierung",
+    "Improving the config.php" : "D'Verbesseren vum config.php",
+    "Version" : "Versioun",
+    "Developer documentation" : "Entwéckler Dokumentatioun",
+    "by %s" : "vum %s",
+    "%s-licensed" : "%s-lizenséiert",
+    "Documentation:" : "Dokumentatioun:",
+    "User documentation" : "Benotzer Dokumentatioun",
+    "Admin documentation" : "Admin Dokumentatioun",
+    "Visit website" : "D'Websäit besichen",
+    "Report a bug" : "E Feeler melden",
+    "Show description …" : "D'Beschreiwung weisen",
+    "Hide description …" : "D'Beschreiwung verstoppe",
+    "This app has an update available." : "Et gëtt eng Aktualiséierung fir dës App.",
+    "Enable only for specific groups" : "Nëmme fir spezifesch Gruppen aschalten",
+    "Uninstall App" : "D'App desinstalléieren",
+    "Enable experimental apps" : "Experimentell Apps aschalten",
+    "SSL Root Certificates" : "SSL Wuerzel Zertifikat",
+    "Common Name" : "Allgemengen Numm",
+    "Valid until" : "Gülteg bis",
+    "Issued By" : "Ausgestallt vum",
+    "Valid until %s" : "Gülteg bis %s",
+    "Import root certificate" : "Wuerzel Zertifikat importéieren",
     "Cheers!" : "Prost!",
+    "Administrator documentation" : "Administrator Dokumentatioun",
+    "Online documentation" : "Online Dokumentatioun",
+    "Forum" : "Forum",
+    "Issue tracker" : "Aspekter Tracker",
+    "Commercial support" : "Kommerziell Ennerstëtzung",
+    "You are using <strong>%s</strong> of <strong>%s</strong>" : "Du benotz <strong>%s</strong> vun <strong>%s</strong>",
+    "Profile picture" : "Profil Foto",
+    "Upload new" : "Nei eroplueden",
+    "Select from Files" : "Aus de Fichieren wielen",
+    "Remove image" : "D'Bild läschen",
+    "png or jpg, max. 20 MB" : "png oder jpg, max. 20 MB",
+    "Picture provided by original account" : "Bild vum Original Kont bereet gestallt",
     "Cancel" : "Ofbriechen",
+    "Choose as profile picture" : "Als Profil Foto auswielen",
+    "Full name" : "Ganzen Numm",
+    "No display name set" : "Keen Nickname festgesat",
     "Email" : "Email",
     "Your email address" : "Deng Email Adress",
+    "For password recovery and notifications" : "Fir d'Passwuert zeréck ze setzen an Notifikatiounen",
     "Password" : "Passwuert",
     "Unable to change your password" : "Konnt däin Passwuert net änneren",
     "Current password" : "Momentan 't Passwuert",
@@ -47,16 +222,42 @@ OC.L10N.register(
     "Change password" : "Passwuert änneren",
     "Language" : "Sprooch",
     "Help translate" : "Hëllef iwwersetzen",
+    "Browser" : "Browser",
+    "Most recent activity" : "Rezentsten Aktivitéit",
+    "You've linked these apps." : "Du hues dës Apps verbonnen",
     "Name" : "Numm",
-    "Desktop client" : "Desktop-Programm",
+    "App name" : "App Numm",
+    "Create new app password" : "En neit App Passwuert erstellen",
+    "Username" : "Benotzernumm",
+    "Done" : "Gemaacht",
+    "Get the apps to sync your files" : "D'Apps op Fichieren syncen",
+    "Desktop client" : "Desktop Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "Username" : "Benotzernumm",
+    "Show storage location" : "Weis de Lagerungs Uert un",
+    "Show last log in" : "Leschte Login uweisen",
+    "Show user backend" : "Backend  Benotzer uweisen",
+    "Send email to new user" : "Eng Email un d'nei Benotzer schécken",
+    "Show email address" : "Emails Adress uweisen",
     "E-Mail" : "E-Mail",
     "Create" : "Erstellen",
+    "Admin Recovery Password" : "Admin Passwuert zeréck stellen",
+    "Add Group" : "Grupp bäisetzen",
     "Group" : "Grupp",
+    "Everyone" : "Jiddereen",
+    "Admins" : "Admin",
     "Default Quota" : "Standard Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "W.e.g. gëff Quota vum Lagerungs Uert un (wx. \"512 MB\" oder \"12 GB\")",
     "Other" : "Aner",
-    "Quota" : "Quota"
+    "Full Name" : "Ganzen Numm",
+    "Group Admin for" : "Gruppen Admin fir",
+    "Quota" : "Quota",
+    "Storage Location" : "Lagerungs Uert",
+    "User Backend" : "Backend Benotzer",
+    "Last Login" : "Lëschte Login",
+    "change full name" : "Ganzen Numm änneren",
+    "set new password" : "Neit Passwuert setzen",
+    "change email address" : "Emails Adress wiesselen",
+    "Default" : "Standard"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/lb.json b/settings/l10n/lb.json
index d59f06cf834..ae09e23764c 100644
--- a/settings/l10n/lb.json
+++ b/settings/l10n/lb.json
@@ -1,43 +1,218 @@
 { "translations": {
     "Wrong password" : "Falscht Passwuert",
+    "No user supplied" : "Kee Benotzer ugebueden",
     "Authentication error" : "Authentifikatioun's Fehler",
+    "Unable to change password" : "Konnt Passwuert net änneren",
     "Enabled" : "Aktivéiert",
+    "Not enabled" : "Net aktivéiert",
+    "A problem occurred, please check your log files (Error: %s)" : "Et ass e Problem opgetrueden, w.e.g kuckt är Log Fichieren (Feeler: %s)",
+    "Migration Completed" : "D'Migratioun ass erfëllt",
+    "Group already exists." : "D'Grupp existéiert schonn",
+    "Unable to add group." : "Onmeiglech fir d'Grupp beizefügen.",
+    "Unable to delete group." : "Onmeiglech d'Grupp ze läschen.",
+    "log-level out of allowed range" : "Log-Level ass ausserhalb vum erlaabte Beräich",
     "Saved" : "Gespäichert",
+    "test email settings" : "Test Email Astellungen",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Während dem Schécke vun der Email ass e Problem opgetrueden. W.e.g kuckt är Astellungen no. (Feeler: %s)",
     "Email sent" : "Email geschéckt",
+    "You need to set your user email before being able to send test emails." : "Du muss deng Email-Adress konfiguréieren éiers de Test-Maile schécke kanns.",
+    "Invalid mail address" : "Ongëlteg Email Adress",
+    "A user with that name already exists." : "E Benotzer mat dësem Numm existéiert schonn.",
+    "Unable to create user." : "Onméiglech de Benotzer ze erschafen.",
+    "Your %s account was created" : "Däin %s Kont gouf erschaf",
+    "Unable to delete user." : "Onmeiglech fir de User zu läschen.",
+    "Forbidden" : "Net erlaabt",
+    "Invalid user" : "Ongëltege Benotzer",
+    "Unable to change mail address" : "Onméiglech d'Email Adress ze änneren.",
     "Email saved" : "E-mail gespäichert",
+    "Your full name has been changed." : "Äre ganzen Numm ass geännert ginn.",
+    "Unable to change full name" : "Onméiglech de ganzen Numm ze änneren.",
     "APCu" : "APCu",
     "Redis" : "Redis",
+    "Security & setup warnings" : "Sécherheets & Konfiguratiouns Warnung",
     "Sharing" : "Gedeelt",
+    "Server-side encryption" : "Verschlësselung vun der Säit vum Server",
+    "External Storage" : "Externt Lager",
     "Cron" : "Cron",
+    "Email server" : "Email Server",
     "Log" : "Log",
+    "Tips & tricks" : "Tipps & Tricken",
     "Updates" : "Updates",
+    "Couldn't remove app." : "D'App konnt net ewechgeholl ginn.",
     "Language changed" : "Sprooch huet geännert",
     "Invalid request" : "Ongülteg Requête",
     "Admins can't remove themself from the admin group" : "Admins kennen sech selwer net aus enger Admin Group läschen.",
     "Unable to add user to group %s" : "Onmeiglech User an Grupp ze sätzen %s",
+    "Unable to remove user from group %s" : "Onméiglech fir de Benotzer vum Grupp %s ewech ze huelen",
+    "Couldn't update app." : "D'App konnt net erweidert ginn.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bas du wierklech sécher dass de \"{Domän}\" als zouverlässeg Domän derbäi setzen wëlls?",
+    "Add trusted domain" : "Zouverlässeg Domän derbäi setzen",
+    "Migration in progress. Please wait until the migration is finished" : "D'Migratioun ass am gaangen. W.e.g waart bis d'Migratioun fäerdeg ass",
+    "Migration started …" : "D'Migratioun fänkt un ...",
+    "Sending..." : "Gëtt geschéckt...",
+    "Official" : "Offiziell",
+    "Approved" : "Accordéiert",
+    "Experimental" : "Experimentell",
     "All" : "All",
+    "No apps found for your version" : "Et gouf keng App fir deng Versioun fonnt",
+    "The app will be downloaded from the app store" : "D'App gëtt aus dem App Buttek erofgelueden",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dës App ass net op Sécherheets Problemer getest ginn an ass nei oder bekannt fir onstabil ze sinn. Installéieren op eegene Risiko.",
+    "Update to %s" : "Update op %s",
+    "_You have %n app update pending_::_You have %n app updates pending_" : ["Du hues %n App Aktualiséierung opstoen","Du hues %n App Aktualiséierungen opstoen"],
+    "Please wait...." : "W.e.g. waarden...",
+    "Error while disabling app" : "Feeler beim App ofschalten",
     "Disable" : "Ofschalten",
     "Enable" : "Aschalten",
+    "Error while enabling app" : "Feeler beim App aschalten",
+    "Error: this app cannot be enabled because it makes the server unstable" : "Feeler: Dës App kann net ageschalt ginn well et de Server onstabil mécht",
+    "Error: could not disable broken app" : "Feeler: déi futti's App kann net ofgeschalt ginn",
+    "Error while disabling broken app" : "Feller beim Ofschalte vun der futtisser App",
+    "Updating...." : "Aktualiséieren...",
+    "Error while updating app" : "Feeler beim Aktualiséiere vun der App",
+    "Updated" : "Aktualiséiert",
+    "Uninstalling ...." : "Gëtt desinstalléiert ...",
+    "Error while uninstalling app" : "Feeler beim App desinstalléieren",
+    "Uninstall" : "Desinstalléieren",
+    "App update" : "App Aktualiséierung",
+    "No apps found for {query}" : "Keng Apps fonnt fir {Ufro}",
+    "Disconnect" : "Trennen",
+    "Error while loading browser sessions and device tokens" : "Feeler während d'Browser Sëtzunge an d'Token Geräter gelueden hunn",
+    "Error while creating device token" : "Feeler beim Erstelle vum Token Gerät",
+    "Error while deleting the token" : "Feeler beim Läsche vum Token",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Et ass e Feeler opgetrueden. W.e.g. luet een ASCII-encodéierte PEM Zertifikat erop.",
+    "Valid until {date}" : "Gülteg bis {Datum}",
     "Delete" : "Läschen",
+    "An error occurred: {message}" : "Et ass e Fehler opgetrueden: {Noriicht}",
+    "Select a profile picture" : "Wiel e Profil Bild aus",
+    "Very weak password" : "Ganz schwaacht Passwuert",
+    "Weak password" : "Schwaacht Passwuert",
+    "So-so password" : "La-La Passwuert",
+    "Good password" : "Gutt Passwuert",
+    "Strong password" : "Staarkt Passwuert",
     "Groups" : "Gruppen",
-    "undo" : "réckgängeg man",
-    "never" : "ni",
+    "Unable to delete {objName}" : "Onmeiglech fir {objName} ze läschen",
+    "Error creating group: {message}" : "Feeler beim Erstelle vun der Grupp: {Noriicht}",
+    "A valid group name must be provided" : "Et muss e gültege Gruppen Numm ugi ginn",
+    "deleted {groupName}" : "Geläscht {GruppenNumm}",
+    "undo" : "Réckgängeg man",
+    "no group" : "Keng Grupp",
+    "never" : "Ni",
+    "deleted {userName}" : "Geläscht  {Benotzernumm}",
+    "add group" : "Grupp bäisetzen",
+    "Changing the password will result in data loss, because data recovery is not available for this user" : "D'Passwuert ännere wäert e Verloscht vun den Daten provozéiere, well Daten zeréck gewannen ass net disponibel fir dëse Benotzer",
+    "A valid username must be provided" : "Et muss e gültegen Benotzernumm ugi ginn",
+    "Error creating user: {message}" : "Feeler beim Erstelle vum Benotzer: {Noriicht}",
+    "A valid password must be provided" : "Et muss e gültegt Passwuert ugi ginn",
+    "A valid email must be provided" : "Et muss eng gülteg Emails Adresse ugi ginn",
     "__language_name__" : "__language_name__",
+    "Unlimited" : "Onlimitéiert",
+    "Personal info" : "Perséinlech Informatioun",
+    "Sessions" : "Sëtzung",
+    "App passwords" : "App Passwierder",
+    "Sync clients" : "Sync vun de Clienten",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatal Aspekter, Feeler, Warnungen, Informatiounen, Debug)",
+    "Info, warnings, errors and fatal issues" : " Informatiounen, Warnungen, Feeler a fatal Aspekter",
+    "Warnings, errors and fatal issues" : "Warnungen, Feeler a fatal Aspekter",
+    "Errors and fatal issues" : "Feeler a fatal Aspekter",
+    "Fatal issues only" : "Nëmmen fatal Aspekter",
     "None" : "Keng",
     "Login" : "Login",
+    "Plain" : "Kloer",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "This means that there might be problems with certain characters in file names." : "Dëst heescht dass Problemer mat bestëmmte Charaktere bei de Fichier Nimm optauche kéinten.",
+    "All checks passed." : "All d'Tester bestanen.",
     "Open documentation" : "Dokumentatioun opmaachen",
     "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen",
+    "Allow users to share via link" : "De Benotzer d'Deele via Link erlaben",
+    "Allow public uploads" : "Ëffentlechen Upload erlaaben",
+    "Enforce password protection" : "Passwuert Schutz forcéieren",
+    "Set default expiration date" : "E Standard Verfallsdatum setzen",
+    "Allow users to send mail notification for shared files" : "De Benotzer erlaben Email Notifikatiounen fir gedeelten Fichieren ze schécken",
+    "Expire after " : "Oflafen nom",
     "days" : "Deeg",
+    "Enforce expiration date" : "Verfallsdatum forcéieren",
     "Allow resharing" : "Resharing erlaben",
+    "Allow sharing with groups" : "Deele mat Gruppen erlaben",
+    "Restrict users to only share with users in their groups" : "Benotzer aschränken fir nëmmen mat Benotzer aus hirerem Grupp ze deelen",
+    "Exclude groups from sharing" : "Gruppe vum Deelen ausschléissen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Dës Gruppe kënnen weiderhin Undeeler kréien, mee kënnen se net ufänken.",
+    "Last cron job execution: %s." : "Leschte Cron Job Ausféierung: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Leschte Cron Job Ausféierung: %s. Eppes schéngt net ze klappen.",
+    "Cron was not executed yet!" : "Cron ass nach net ausgefouert ginn!",
+    "Execute one task with each page loaded" : "Mat all geluedener Säit eng Aufgab ausféieren",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ass als webcron Service registréiert fir cron.php all15 Minutten iwwer http opzeruffen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Dem System säi Cron Service benotze fir d'Cron.php Fichieren all 15 Minutten opzeruffen.",
+    "Enable server-side encryption" : "Verschlësselung vun der Säit vum Server erlaaben",
+    "Please read carefully before activating server-side encryption: " : "W.e.g. lies opmierksam éier d'Verschlësselung vun der Säit vum Server aktivéiert gëtt:",
+    "Be aware that encryption always increases the file size." : "Sief der bewosst dass Verschlësselung ëmmer d'Gréisst vum Fichier erhéicht.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dëst ass déi lescht Warnung: Wëlls de wierklech d'Verschlësselung aschalten?",
+    "Enable encryption" : "Verschlësselung aschalten",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Kee Verschlësselungs Modul gelueden, w.e.g. schalt en Verschlësselungs Modul am App Menü an.",
+    "Select default encryption module:" : "Standard Verschlësselung Modul auswielen:",
+    "Start migration" : "Migratioun ufänke",
+    "This is used for sending out notifications." : "Dëst gëtt benotzt fir Notifikatiounen eraus ze schécken.",
+    "Send mode" : "Verschécke-Modus",
+    "Encryption" : "Verschlësselung",
+    "From address" : "Vun der Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Authentifizéierungs Method",
     "Authentication required" : "Authentifizéierung néideg",
     "Server address" : "Server Adress",
     "Port" : "Port",
+    "SMTP Username" : "SMTP Benotzernumm",
+    "SMTP Password" : "SMTP Passwuert",
+    "Test email settings" : "Email Astellungen testen",
+    "Send email" : "Email schécken",
+    "Download logfile" : "Log Fichier eroflueden",
     "More" : "Méi",
     "Less" : "Manner",
+    "What to log" : "Wat loggen",
+    "How to do backups" : "Wéi ee Backup'e mécht",
+    "Advanced monitoring" : "Erweidert Beobachtung",
+    "Performance tuning" : "Leeschtungs Optimiséierung",
+    "Improving the config.php" : "D'Verbesseren vum config.php",
+    "Version" : "Versioun",
+    "Developer documentation" : "Entwéckler Dokumentatioun",
+    "by %s" : "vum %s",
+    "%s-licensed" : "%s-lizenséiert",
+    "Documentation:" : "Dokumentatioun:",
+    "User documentation" : "Benotzer Dokumentatioun",
+    "Admin documentation" : "Admin Dokumentatioun",
+    "Visit website" : "D'Websäit besichen",
+    "Report a bug" : "E Feeler melden",
+    "Show description …" : "D'Beschreiwung weisen",
+    "Hide description …" : "D'Beschreiwung verstoppe",
+    "This app has an update available." : "Et gëtt eng Aktualiséierung fir dës App.",
+    "Enable only for specific groups" : "Nëmme fir spezifesch Gruppen aschalten",
+    "Uninstall App" : "D'App desinstalléieren",
+    "Enable experimental apps" : "Experimentell Apps aschalten",
+    "SSL Root Certificates" : "SSL Wuerzel Zertifikat",
+    "Common Name" : "Allgemengen Numm",
+    "Valid until" : "Gülteg bis",
+    "Issued By" : "Ausgestallt vum",
+    "Valid until %s" : "Gülteg bis %s",
+    "Import root certificate" : "Wuerzel Zertifikat importéieren",
     "Cheers!" : "Prost!",
+    "Administrator documentation" : "Administrator Dokumentatioun",
+    "Online documentation" : "Online Dokumentatioun",
+    "Forum" : "Forum",
+    "Issue tracker" : "Aspekter Tracker",
+    "Commercial support" : "Kommerziell Ennerstëtzung",
+    "You are using <strong>%s</strong> of <strong>%s</strong>" : "Du benotz <strong>%s</strong> vun <strong>%s</strong>",
+    "Profile picture" : "Profil Foto",
+    "Upload new" : "Nei eroplueden",
+    "Select from Files" : "Aus de Fichieren wielen",
+    "Remove image" : "D'Bild läschen",
+    "png or jpg, max. 20 MB" : "png oder jpg, max. 20 MB",
+    "Picture provided by original account" : "Bild vum Original Kont bereet gestallt",
     "Cancel" : "Ofbriechen",
+    "Choose as profile picture" : "Als Profil Foto auswielen",
+    "Full name" : "Ganzen Numm",
+    "No display name set" : "Keen Nickname festgesat",
     "Email" : "Email",
     "Your email address" : "Deng Email Adress",
+    "For password recovery and notifications" : "Fir d'Passwuert zeréck ze setzen an Notifikatiounen",
     "Password" : "Passwuert",
     "Unable to change your password" : "Konnt däin Passwuert net änneren",
     "Current password" : "Momentan 't Passwuert",
@@ -45,16 +220,42 @@
     "Change password" : "Passwuert änneren",
     "Language" : "Sprooch",
     "Help translate" : "Hëllef iwwersetzen",
+    "Browser" : "Browser",
+    "Most recent activity" : "Rezentsten Aktivitéit",
+    "You've linked these apps." : "Du hues dës Apps verbonnen",
     "Name" : "Numm",
-    "Desktop client" : "Desktop-Programm",
+    "App name" : "App Numm",
+    "Create new app password" : "En neit App Passwuert erstellen",
+    "Username" : "Benotzernumm",
+    "Done" : "Gemaacht",
+    "Get the apps to sync your files" : "D'Apps op Fichieren syncen",
+    "Desktop client" : "Desktop Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "Username" : "Benotzernumm",
+    "Show storage location" : "Weis de Lagerungs Uert un",
+    "Show last log in" : "Leschte Login uweisen",
+    "Show user backend" : "Backend  Benotzer uweisen",
+    "Send email to new user" : "Eng Email un d'nei Benotzer schécken",
+    "Show email address" : "Emails Adress uweisen",
     "E-Mail" : "E-Mail",
     "Create" : "Erstellen",
+    "Admin Recovery Password" : "Admin Passwuert zeréck stellen",
+    "Add Group" : "Grupp bäisetzen",
     "Group" : "Grupp",
+    "Everyone" : "Jiddereen",
+    "Admins" : "Admin",
     "Default Quota" : "Standard Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "W.e.g. gëff Quota vum Lagerungs Uert un (wx. \"512 MB\" oder \"12 GB\")",
     "Other" : "Aner",
-    "Quota" : "Quota"
+    "Full Name" : "Ganzen Numm",
+    "Group Admin for" : "Gruppen Admin fir",
+    "Quota" : "Quota",
+    "Storage Location" : "Lagerungs Uert",
+    "User Backend" : "Backend Benotzer",
+    "Last Login" : "Lëschte Login",
+    "change full name" : "Ganzen Numm änneren",
+    "set new password" : "Neit Passwuert setzen",
+    "change email address" : "Emails Adress wiesselen",
+    "Default" : "Standard"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js
index 18b71c4553c..139a6f29ef6 100644
--- a/settings/l10n/lt_LT.js
+++ b/settings/l10n/lt_LT.js
@@ -95,12 +95,12 @@ OC.L10N.register(
     "Language" : "Kalba",
     "Help translate" : "Padėkite išversti",
     "Name" : "Pavadinimas",
+    "Username" : "Prisijungimo vardas",
     "Get the apps to sync your files" : "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
     "Desktop client" : "Darbastalio klientas",
     "Android app" : "Android programa",
     "iOS app" : "iOS programa",
     "Show First Run Wizard again" : "Rodyti pirmo karto vedlį dar kartą",
-    "Username" : "Prisijungimo vardas",
     "Create" : "Sukurti",
     "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
     "Enter the recovery password in order to recover the users files during password change" : "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json
index 4a26ae8bf75..fb94e1f1872 100644
--- a/settings/l10n/lt_LT.json
+++ b/settings/l10n/lt_LT.json
@@ -93,12 +93,12 @@
     "Language" : "Kalba",
     "Help translate" : "Padėkite išversti",
     "Name" : "Pavadinimas",
+    "Username" : "Prisijungimo vardas",
     "Get the apps to sync your files" : "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
     "Desktop client" : "Darbastalio klientas",
     "Android app" : "Android programa",
     "iOS app" : "iOS programa",
     "Show First Run Wizard again" : "Rodyti pirmo karto vedlį dar kartą",
-    "Username" : "Prisijungimo vardas",
     "Create" : "Sukurti",
     "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
     "Enter the recovery password in order to recover the users files during password change" : "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js
index a24704e6360..c27a5c06ace 100644
--- a/settings/l10n/lv.js
+++ b/settings/l10n/lv.js
@@ -137,6 +137,7 @@ OC.L10N.register(
     "Language" : "Valoda",
     "Help translate" : "Palīdzi tulkot",
     "Name" : "Nosaukums",
+    "Username" : "Lietotājvārds",
     "Done" : "Pabeigts",
     "Get the apps to sync your files" : "Saņem lietotnes, lai sinhronizētu savas datnes",
     "Desktop client" : "Darbvirsmas klients",
@@ -145,7 +146,6 @@ OC.L10N.register(
     "Show First Run Wizard again" : "Vēlreiz rādīt pirmās palaišanas vedni",
     "Send email to new user" : "Sūtīt e-pastu jaunajam lietotājam",
     "Show email address" : "Rādīt e-pasta adreses",
-    "Username" : "Lietotājvārds",
     "E-Mail" : "E-pasts",
     "Create" : "Izveidot",
     "Admin Recovery Password" : "Administratora atgūšanas parole",
diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json
index 990d454f2a0..d9745171d6a 100644
--- a/settings/l10n/lv.json
+++ b/settings/l10n/lv.json
@@ -135,6 +135,7 @@
     "Language" : "Valoda",
     "Help translate" : "Palīdzi tulkot",
     "Name" : "Nosaukums",
+    "Username" : "Lietotājvārds",
     "Done" : "Pabeigts",
     "Get the apps to sync your files" : "Saņem lietotnes, lai sinhronizētu savas datnes",
     "Desktop client" : "Darbvirsmas klients",
@@ -143,7 +144,6 @@
     "Show First Run Wizard again" : "Vēlreiz rādīt pirmās palaišanas vedni",
     "Send email to new user" : "Sūtīt e-pastu jaunajam lietotājam",
     "Show email address" : "Rādīt e-pasta adreses",
-    "Username" : "Lietotājvārds",
     "E-Mail" : "E-pasts",
     "Create" : "Izveidot",
     "Admin Recovery Password" : "Administratora atgūšanas parole",
diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js
index 088ea3c14db..8eedc55b6e0 100644
--- a/settings/l10n/mk.js
+++ b/settings/l10n/mk.js
@@ -168,9 +168,9 @@ OC.L10N.register(
     "Language" : "Јазик",
     "Help translate" : "Помогни во преводот",
     "Name" : "Име",
+    "Username" : "Корисничко име",
     "Get the apps to sync your files" : "Преземете апликации за синхронизирање на вашите датотеки",
     "Show First Run Wizard again" : "Прикажи го повторно волшебникот при првото стартување",
-    "Username" : "Корисничко име",
     "Create" : "Создај",
     "Admin Recovery Password" : "Обновување на Admin лозинката",
     "Add Group" : "Додади група",
diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json
index 169f2328fbe..017cf4b081a 100644
--- a/settings/l10n/mk.json
+++ b/settings/l10n/mk.json
@@ -166,9 +166,9 @@
     "Language" : "Јазик",
     "Help translate" : "Помогни во преводот",
     "Name" : "Име",
+    "Username" : "Корисничко име",
     "Get the apps to sync your files" : "Преземете апликации за синхронизирање на вашите датотеки",
     "Show First Run Wizard again" : "Прикажи го повторно волшебникот при првото стартување",
-    "Username" : "Корисничко име",
     "Create" : "Создај",
     "Admin Recovery Password" : "Обновување на Admin лозинката",
     "Add Group" : "Додади група",
diff --git a/settings/l10n/mn.js b/settings/l10n/mn.js
index 0bc562b05f7..6a035bdfb56 100644
--- a/settings/l10n/mn.js
+++ b/settings/l10n/mn.js
@@ -15,7 +15,7 @@ OC.L10N.register(
     "All" : "Бүгд",
     "Email" : "И-мэйл",
     "Password" : "Нууц үг",
-    "Done" : "Болсон",
-    "Username" : "Хэрэглэгчийн нэр"
+    "Username" : "Хэрэглэгчийн нэр",
+    "Done" : "Болсон"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/mn.json b/settings/l10n/mn.json
index 1f888f6ef2d..f6634fd2587 100644
--- a/settings/l10n/mn.json
+++ b/settings/l10n/mn.json
@@ -13,7 +13,7 @@
     "All" : "Бүгд",
     "Email" : "И-мэйл",
     "Password" : "Нууц үг",
-    "Done" : "Болсон",
-    "Username" : "Хэрэглэгчийн нэр"
+    "Username" : "Хэрэглэгчийн нэр",
+    "Done" : "Болсон"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 8c4814d954d..7dd71c9ecef 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -262,6 +262,7 @@ OC.L10N.register(
     "Language" : "Språk",
     "Help translate" : "Bidra til oversettelsen",
     "Name" : "Navn",
+    "Username" : "Brukernavn",
     "Done" : "Ferdig",
     "Get the apps to sync your files" : "Hent apper som synkroniserer filene dine",
     "Desktop client" : "Skrivebordsklient",
@@ -275,7 +276,6 @@ OC.L10N.register(
     "Show user backend" : "Vis bruker-server",
     "Send email to new user" : "Send e-post til ny bruker",
     "Show email address" : "Vis e-postadresse",
-    "Username" : "Brukernavn",
     "E-Mail" : "E-post",
     "Create" : "Opprett",
     "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index f5897d902e4..95f62d13822 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -260,6 +260,7 @@
     "Language" : "Språk",
     "Help translate" : "Bidra til oversettelsen",
     "Name" : "Navn",
+    "Username" : "Brukernavn",
     "Done" : "Ferdig",
     "Get the apps to sync your files" : "Hent apper som synkroniserer filene dine",
     "Desktop client" : "Skrivebordsklient",
@@ -273,7 +274,6 @@
     "Show user backend" : "Vis bruker-server",
     "Send email to new user" : "Send e-post til ny bruker",
     "Show email address" : "Vis e-postadresse",
-    "Username" : "Brukernavn",
     "E-Mail" : "E-post",
     "Create" : "Opprett",
     "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 8a46f240067..842e418054b 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -119,6 +119,7 @@ OC.L10N.register(
     "Unlimited" : "Ongelimiteerd",
     "Personal info" : "Persoonlijke info",
     "Sessions" : "Sessies",
+    "App passwords" : "App wachtwoorden",
     "Sync clients" : "Sync clients",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen",
@@ -273,7 +274,12 @@ OC.L10N.register(
     "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dit zijn de web, desktop en mobiele clients die momenteel zijn verbonden met uw ownCloud.",
     "Browser" : "Browser",
     "Most recent activity" : "Meest recente activiteit",
+    "You've linked these apps." : "U hebt deze apps gelinkt.",
     "Name" : "Naam",
+    "App name" : "App naam",
+    "Create new app password" : "Creëer nieuw app wachtwoord",
+    "Use the credentials below to configure your app or device." : "Gebruik onderstaande inloggegevens om uw app of apparaat te configureren.",
+    "Username" : "Gebruikersnaam",
     "Done" : "Gedaan",
     "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
     "Desktop client" : "Desktop client",
@@ -287,7 +293,6 @@ OC.L10N.register(
     "Show user backend" : "Toon backend gebruiker",
     "Send email to new user" : "Verstuur e-mail aan nieuwe gebruiker",
     "Show email address" : "Toon e-mailadres",
-    "Username" : "Gebruikersnaam",
     "E-Mail" : "E-mail",
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 658b4c16690..b743c19245a 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -117,6 +117,7 @@
     "Unlimited" : "Ongelimiteerd",
     "Personal info" : "Persoonlijke info",
     "Sessions" : "Sessies",
+    "App passwords" : "App wachtwoorden",
     "Sync clients" : "Sync clients",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen",
@@ -271,7 +272,12 @@
     "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dit zijn de web, desktop en mobiele clients die momenteel zijn verbonden met uw ownCloud.",
     "Browser" : "Browser",
     "Most recent activity" : "Meest recente activiteit",
+    "You've linked these apps." : "U hebt deze apps gelinkt.",
     "Name" : "Naam",
+    "App name" : "App naam",
+    "Create new app password" : "Creëer nieuw app wachtwoord",
+    "Use the credentials below to configure your app or device." : "Gebruik onderstaande inloggegevens om uw app of apparaat te configureren.",
+    "Username" : "Gebruikersnaam",
     "Done" : "Gedaan",
     "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
     "Desktop client" : "Desktop client",
@@ -285,7 +291,6 @@
     "Show user backend" : "Toon backend gebruiker",
     "Send email to new user" : "Verstuur e-mail aan nieuwe gebruiker",
     "Show email address" : "Toon e-mailadres",
-    "Username" : "Gebruikersnaam",
     "E-Mail" : "E-mail",
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js
index 33421d700bd..e72e4357951 100644
--- a/settings/l10n/nn_NO.js
+++ b/settings/l10n/nn_NO.js
@@ -68,9 +68,9 @@ OC.L10N.register(
     "Language" : "Språk",
     "Help translate" : "Hjelp oss å omsetja",
     "Name" : "Namn",
+    "Username" : "Brukarnamn",
     "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine",
     "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen",
-    "Username" : "Brukarnamn",
     "Create" : "Lag",
     "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
     "Enter the recovery password in order to recover the users files during password change" : "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json
index 14b0aea0bcb..58da1cecf04 100644
--- a/settings/l10n/nn_NO.json
+++ b/settings/l10n/nn_NO.json
@@ -66,9 +66,9 @@
     "Language" : "Språk",
     "Help translate" : "Hjelp oss å omsetja",
     "Name" : "Namn",
+    "Username" : "Brukarnamn",
     "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine",
     "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen",
-    "Username" : "Brukarnamn",
     "Create" : "Lag",
     "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
     "Enter the recovery password in order to recover the users files during password change" : "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index 25ebdb6ab17..751c2eed92f 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -237,6 +237,7 @@ OC.L10N.register(
     "Language" : "Lenga",
     "Help translate" : "Ajudatz a tradusir",
     "Name" : "Nom",
+    "Username" : "Nom d'utilizaire",
     "Get the apps to sync your files" : "Obtenètz las aplicacions de sincronizacion de vòstres fichièrs",
     "Desktop client" : "Client de burèu",
     "Android app" : "Aplicacion Android",
@@ -249,7 +250,6 @@ OC.L10N.register(
     "Show user backend" : "Far veire la font de l'identificant",
     "Send email to new user" : "Mandar un corrièl als utilizaires creats",
     "Show email address" : "Afichar l'adreça email",
-    "Username" : "Nom d'utilizaire",
     "E-Mail" : "Corrièl",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperacion del senhal administrator",
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index 2e51aff97eb..51abd9afa5d 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -235,6 +235,7 @@
     "Language" : "Lenga",
     "Help translate" : "Ajudatz a tradusir",
     "Name" : "Nom",
+    "Username" : "Nom d'utilizaire",
     "Get the apps to sync your files" : "Obtenètz las aplicacions de sincronizacion de vòstres fichièrs",
     "Desktop client" : "Client de burèu",
     "Android app" : "Aplicacion Android",
@@ -247,7 +248,6 @@
     "Show user backend" : "Far veire la font de l'identificant",
     "Send email to new user" : "Mandar un corrièl als utilizaires creats",
     "Show email address" : "Afichar l'adreça email",
-    "Username" : "Nom d'utilizaire",
     "E-Mail" : "Corrièl",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperacion del senhal administrator",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index 903b374e0af..733b4a98442 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -196,6 +196,7 @@ OC.L10N.register(
     "Language" : "Język",
     "Help translate" : "Pomóż w tłumaczeniu",
     "Name" : "Nazwa",
+    "Username" : "Nazwa użytkownika",
     "Done" : "Ukończono",
     "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
     "Desktop client" : "Klient na komputer",
@@ -207,7 +208,6 @@ OC.L10N.register(
     "Show user backend" : "Pokaż moduł użytkownika",
     "Send email to new user" : "Wyślij email do nowego użytkownika",
     "Show email address" : "Pokaż adres email",
-    "Username" : "Nazwa użytkownika",
     "E-Mail" : "E-mail",
     "Create" : "Utwórz",
     "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index f1c1994dd1d..7540d5a6daa 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -194,6 +194,7 @@
     "Language" : "Język",
     "Help translate" : "Pomóż w tłumaczeniu",
     "Name" : "Nazwa",
+    "Username" : "Nazwa użytkownika",
     "Done" : "Ukończono",
     "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
     "Desktop client" : "Klient na komputer",
@@ -205,7 +206,6 @@
     "Show user backend" : "Pokaż moduł użytkownika",
     "Send email to new user" : "Wyślij email do nowego użytkownika",
     "Show email address" : "Pokaż adres email",
-    "Username" : "Nazwa użytkownika",
     "E-Mail" : "E-mail",
     "Create" : "Utwórz",
     "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index baf510b46d0..415724f3e70 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -279,6 +279,8 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "A senha do aplicativo é um código de acesso que dá ao aplicativo ou dispositivo permissões para acessar sua conta %s.",
     "App name" : "Nome do aplicativo",
     "Create new app password" : "Criar uma nova senha do aplicativo",
+    "Use the credentials below to configure your app or device." : "Use as credenciais abaixo para configurar seu aplicativo ou dispositivo.",
+    "Username" : "Nome de Usuário",
     "Done" : "Concluída",
     "Get the apps to sync your files" : "Obtenha apps para sincronizar seus arquivos",
     "Desktop client" : "Cliente Desktop",
@@ -292,7 +294,6 @@ OC.L10N.register(
     "Show user backend" : "Mostrar administrador do usuário",
     "Send email to new user" : "Enviar um email para o novo usuário",
     "Show email address" : "Mostrar o endereço de email",
-    "Username" : "Nome de Usuário",
     "E-Mail" : "E-Mail",
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index f271429535b..0df8fe8b1df 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -277,6 +277,8 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "A senha do aplicativo é um código de acesso que dá ao aplicativo ou dispositivo permissões para acessar sua conta %s.",
     "App name" : "Nome do aplicativo",
     "Create new app password" : "Criar uma nova senha do aplicativo",
+    "Use the credentials below to configure your app or device." : "Use as credenciais abaixo para configurar seu aplicativo ou dispositivo.",
+    "Username" : "Nome de Usuário",
     "Done" : "Concluída",
     "Get the apps to sync your files" : "Obtenha apps para sincronizar seus arquivos",
     "Desktop client" : "Cliente Desktop",
@@ -290,7 +292,6 @@
     "Show user backend" : "Mostrar administrador do usuário",
     "Send email to new user" : "Enviar um email para o novo usuário",
     "Show email address" : "Mostrar o endereço de email",
-    "Username" : "Nome de Usuário",
     "E-Mail" : "E-Mail",
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index fcee766ed1d..f322e32b97f 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -273,6 +273,7 @@ OC.L10N.register(
     "Browser" : "Navegador",
     "Most recent activity" : "Atividade mais recente",
     "Name" : "Nome",
+    "Username" : "Nome de utilizador",
     "Done" : "Concluído",
     "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente Desktop",
@@ -286,7 +287,6 @@ OC.L10N.register(
     "Show user backend" : "Mostrar interface do utilizador",
     "Send email to new user" : "Enviar email ao novo utilizador",
     "Show email address" : "Mostrar endereço de email",
-    "Username" : "Nome de utilizador",
     "E-Mail" : "Correio Eletrónico",
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Palavra-passe de Administrador",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 0eab5a66356..d291ebec900 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -271,6 +271,7 @@
     "Browser" : "Navegador",
     "Most recent activity" : "Atividade mais recente",
     "Name" : "Nome",
+    "Username" : "Nome de utilizador",
     "Done" : "Concluído",
     "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente Desktop",
@@ -284,7 +285,6 @@
     "Show user backend" : "Mostrar interface do utilizador",
     "Send email to new user" : "Enviar email ao novo utilizador",
     "Show email address" : "Mostrar endereço de email",
-    "Username" : "Nome de utilizador",
     "E-Mail" : "Correio Eletrónico",
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Palavra-passe de Administrador",
diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js
index d0a0b107d0a..72846229056 100644
--- a/settings/l10n/ro.js
+++ b/settings/l10n/ro.js
@@ -199,11 +199,11 @@ OC.L10N.register(
     "Help translate" : "Ajută la traducere",
     "Most recent activity" : "Cea mai recentă activitate",
     "Name" : "Nume",
+    "Username" : "Nume utilizator",
     "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
     "Desktop client" : "Client Desktop",
     "Android app" : "Aplicatie Android",
     "iOS app" : "Aplicație iOS",
-    "Username" : "Nume utilizator",
     "E-Mail" : "Email",
     "Create" : "Crează",
     "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json
index 4f3a30ab5c3..2ed3793dce0 100644
--- a/settings/l10n/ro.json
+++ b/settings/l10n/ro.json
@@ -197,11 +197,11 @@
     "Help translate" : "Ajută la traducere",
     "Most recent activity" : "Cea mai recentă activitate",
     "Name" : "Nume",
+    "Username" : "Nume utilizator",
     "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
     "Desktop client" : "Client Desktop",
     "Android app" : "Aplicatie Android",
     "iOS app" : "Aplicație iOS",
-    "Username" : "Nume utilizator",
     "E-Mail" : "Email",
     "Create" : "Crează",
     "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 3c0cbcda098..b1adc99096a 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -279,6 +279,8 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Пароль приложения представляет собой код доступа, который дает приложению или устройству разрешения на доступ к вашему аккаунту %s.",
     "App name" : "Название приложения",
     "Create new app password" : "Создать новый пароль для приложения",
+    "Use the credentials below to configure your app or device." : "Используйте учётные данные ниже, чтобы настроить ваше приложение или устройство.",
+    "Username" : "Имя пользователя",
     "Done" : "Выполнено",
     "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
     "Desktop client" : "Клиент для ПК",
@@ -292,7 +294,6 @@ OC.L10N.register(
     "Show user backend" : "Показать механизм учёта пользователей",
     "Send email to new user" : "Отправлять письмо новому пользователю",
     "Show email address" : "Показывать адрес электронной почты",
-    "Username" : "Имя пользователя",
     "E-Mail" : "Почта",
     "Create" : "Создать",
     "Admin Recovery Password" : "Пароль административного восстановления",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index e589da4ac0e..a5c04f0188d 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -277,6 +277,8 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Пароль приложения представляет собой код доступа, который дает приложению или устройству разрешения на доступ к вашему аккаунту %s.",
     "App name" : "Название приложения",
     "Create new app password" : "Создать новый пароль для приложения",
+    "Use the credentials below to configure your app or device." : "Используйте учётные данные ниже, чтобы настроить ваше приложение или устройство.",
+    "Username" : "Имя пользователя",
     "Done" : "Выполнено",
     "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
     "Desktop client" : "Клиент для ПК",
@@ -290,7 +292,6 @@
     "Show user backend" : "Показать механизм учёта пользователей",
     "Send email to new user" : "Отправлять письмо новому пользователю",
     "Show email address" : "Показывать адрес электронной почты",
-    "Username" : "Имя пользователя",
     "E-Mail" : "Почта",
     "Create" : "Создать",
     "Admin Recovery Password" : "Пароль административного восстановления",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index 4ca631bb8b6..c249801c02c 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -214,6 +214,7 @@ OC.L10N.register(
     "Language" : "Jazyk",
     "Help translate" : "Pomôcť s prekladom",
     "Name" : "Názov",
+    "Username" : "Používateľské meno",
     "Done" : "Hotovo",
     "Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
     "Desktop client" : "Desktopový klient",
@@ -227,7 +228,6 @@ OC.L10N.register(
     "Show user backend" : "Zobraziť backend používateľa",
     "Send email to new user" : "Odoslať email novému používateľovi",
     "Show email address" : "Zobraziť emailovú adresu",
-    "Username" : "Používateľské meno",
     "E-Mail" : "email",
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index fbb0a5fe24f..383795d6f3b 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -212,6 +212,7 @@
     "Language" : "Jazyk",
     "Help translate" : "Pomôcť s prekladom",
     "Name" : "Názov",
+    "Username" : "Používateľské meno",
     "Done" : "Hotovo",
     "Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
     "Desktop client" : "Desktopový klient",
@@ -225,7 +226,6 @@
     "Show user backend" : "Zobraziť backend používateľa",
     "Send email to new user" : "Odoslať email novému používateľovi",
     "Show email address" : "Zobraziť emailovú adresu",
-    "Username" : "Používateľské meno",
     "E-Mail" : "email",
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index f75df25d7fe..57ae1eaac4c 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -70,6 +70,7 @@ OC.L10N.register(
     "Disable" : "Onemogoči",
     "Enable" : "Omogoči",
     "Error while enabling app" : "Napaka omogočanja programa",
+    "Error: this app cannot be enabled because it makes the server unstable" : "Napaka: ta aplikacija ne more biti aktivna, ker povzroča nestabilnost strežnika",
     "Error: could not disable broken app" : "Napaka: ni mogoče onemogočiti okvarjenega programa",
     "Error while disabling broken app" : "Napaka onemogočanja okvarjenega programa",
     "Updating...." : "Poteka posodabljanje ...",
@@ -82,6 +83,9 @@ OC.L10N.register(
     "App update" : "Posodabljanje vstavkov",
     "No apps found for {query}" : "Ni programov, skladnih z nizom \"{query}\".",
     "Disconnect" : "Prekinjeni povezavo",
+    "Error while loading browser sessions and device tokens" : "Napaka med nalaganjem brskalnika in ključev naprave",
+    "Error while creating device token" : "Napaka med izdelavo ključa naprave",
+    "Error while deleting the token" : "Napaka med brisanjem ključa",
     "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Prišlo je do napake. Uvoziti je treba ustrezno ASCII kodirano potrdilo PEM.",
     "Valid until {date}" : "Veljavno do {date}",
     "Delete" : "Izbriši",
@@ -111,6 +115,7 @@ OC.L10N.register(
     "Unlimited" : "Neomejeno",
     "Personal info" : "Osebni podatki",
     "Sessions" : "Seje",
+    "App passwords" : "Gesla aplikacije",
     "Sync clients" : "Uskladi odjemalce",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
     "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
@@ -145,12 +150,16 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Dovoli uporabnikom pošiljanje obvestil o souporabi datotek z drugimi uporabniki.",
     "Exclude groups from sharing" : "Izloči skupine iz souporabe",
     "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
+    "Last cron job execution: %s." : "Zadnje periodično opravilo: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Zadnje periodično opravilo: %s. Nekaj izgleda narobe.",
     "Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
     "Enable server-side encryption" : "Omogoči šifriranje na strežniku",
     "Please read carefully before activating server-side encryption: " : "Pozorno preberite opombe, preden omogočite strežniško šifriranje:",
+    "Be aware that encryption always increases the file size." : "Upoštevajte, da šifriranje vedno poveča velikost datoteke.",
+    "This is the final warning: Do you really want to enable encryption?" : "To je zadnje opozorilo. Ali resnično želite vključiti šifriranje?",
     "Enable encryption" : "Omogoči šifriranje",
     "Select default encryption module:" : "Izbor privzetega modula za šifriranje:",
     "Start migration" : "Začni selitev",
@@ -189,6 +198,7 @@ OC.L10N.register(
     "Documentation:" : "Dokumentacija:",
     "User documentation" : "Uporabniška dokumentacija",
     "Admin documentation" : "Skrbniška dokumentacija",
+    "Visit website" : "Obiščite spletno stran",
     "Report a bug" : "Pošlji poročilo o hrošču",
     "Show description …" : "Pokaži opis ...",
     "Hide description …" : "Skrij opis ...",
@@ -217,6 +227,7 @@ OC.L10N.register(
     "Select from Files" : "Izbor iz datotek",
     "Remove image" : "Odstrani sliko",
     "png or jpg, max. 20 MB" : "png ali jpg, največ. 20 MB",
+    "Picture provided by original account" : "Slika iz izvornega računa",
     "Cancel" : "Prekliči",
     "Choose as profile picture" : "Izberi kot sliko profila",
     "Full name" : "Polno ime",
@@ -235,7 +246,11 @@ OC.L10N.register(
     "Help translate" : "Sodelujte pri prevajanju",
     "Browser" : "Brskalnik",
     "Most recent activity" : "Zadnja dejavnost",
+    "You've linked these apps." : "Vi ste povezali te aplikacije.",
     "Name" : "Ime",
+    "App name" : "Naziv aplikacije",
+    "Create new app password" : "Ustvari novo geslo aplikacije",
+    "Username" : "Uporabniško ime",
     "Done" : "Končano",
     "Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
     "Desktop client" : "Namizni odjemalec",
@@ -249,7 +264,6 @@ OC.L10N.register(
     "Show user backend" : "Pokaži ozadnji program",
     "Send email to new user" : "Pošlji sporočilo novemu uporabniku",
     "Show email address" : "Pokaži naslov elektronske pošte",
-    "Username" : "Uporabniško ime",
     "E-Mail" : "Elektronska pošta",
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index b7eb34f46f3..9d8dfa0652d 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -68,6 +68,7 @@
     "Disable" : "Onemogoči",
     "Enable" : "Omogoči",
     "Error while enabling app" : "Napaka omogočanja programa",
+    "Error: this app cannot be enabled because it makes the server unstable" : "Napaka: ta aplikacija ne more biti aktivna, ker povzroča nestabilnost strežnika",
     "Error: could not disable broken app" : "Napaka: ni mogoče onemogočiti okvarjenega programa",
     "Error while disabling broken app" : "Napaka onemogočanja okvarjenega programa",
     "Updating...." : "Poteka posodabljanje ...",
@@ -80,6 +81,9 @@
     "App update" : "Posodabljanje vstavkov",
     "No apps found for {query}" : "Ni programov, skladnih z nizom \"{query}\".",
     "Disconnect" : "Prekinjeni povezavo",
+    "Error while loading browser sessions and device tokens" : "Napaka med nalaganjem brskalnika in ključev naprave",
+    "Error while creating device token" : "Napaka med izdelavo ključa naprave",
+    "Error while deleting the token" : "Napaka med brisanjem ključa",
     "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Prišlo je do napake. Uvoziti je treba ustrezno ASCII kodirano potrdilo PEM.",
     "Valid until {date}" : "Veljavno do {date}",
     "Delete" : "Izbriši",
@@ -109,6 +113,7 @@
     "Unlimited" : "Neomejeno",
     "Personal info" : "Osebni podatki",
     "Sessions" : "Seje",
+    "App passwords" : "Gesla aplikacije",
     "Sync clients" : "Uskladi odjemalce",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
     "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
@@ -143,12 +148,16 @@
     "Allow users to send mail notification for shared files to other users" : "Dovoli uporabnikom pošiljanje obvestil o souporabi datotek z drugimi uporabniki.",
     "Exclude groups from sharing" : "Izloči skupine iz souporabe",
     "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
+    "Last cron job execution: %s." : "Zadnje periodično opravilo: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Zadnje periodično opravilo: %s. Nekaj izgleda narobe.",
     "Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
     "Enable server-side encryption" : "Omogoči šifriranje na strežniku",
     "Please read carefully before activating server-side encryption: " : "Pozorno preberite opombe, preden omogočite strežniško šifriranje:",
+    "Be aware that encryption always increases the file size." : "Upoštevajte, da šifriranje vedno poveča velikost datoteke.",
+    "This is the final warning: Do you really want to enable encryption?" : "To je zadnje opozorilo. Ali resnično želite vključiti šifriranje?",
     "Enable encryption" : "Omogoči šifriranje",
     "Select default encryption module:" : "Izbor privzetega modula za šifriranje:",
     "Start migration" : "Začni selitev",
@@ -187,6 +196,7 @@
     "Documentation:" : "Dokumentacija:",
     "User documentation" : "Uporabniška dokumentacija",
     "Admin documentation" : "Skrbniška dokumentacija",
+    "Visit website" : "Obiščite spletno stran",
     "Report a bug" : "Pošlji poročilo o hrošču",
     "Show description …" : "Pokaži opis ...",
     "Hide description …" : "Skrij opis ...",
@@ -215,6 +225,7 @@
     "Select from Files" : "Izbor iz datotek",
     "Remove image" : "Odstrani sliko",
     "png or jpg, max. 20 MB" : "png ali jpg, največ. 20 MB",
+    "Picture provided by original account" : "Slika iz izvornega računa",
     "Cancel" : "Prekliči",
     "Choose as profile picture" : "Izberi kot sliko profila",
     "Full name" : "Polno ime",
@@ -233,7 +244,11 @@
     "Help translate" : "Sodelujte pri prevajanju",
     "Browser" : "Brskalnik",
     "Most recent activity" : "Zadnja dejavnost",
+    "You've linked these apps." : "Vi ste povezali te aplikacije.",
     "Name" : "Ime",
+    "App name" : "Naziv aplikacije",
+    "Create new app password" : "Ustvari novo geslo aplikacije",
+    "Username" : "Uporabniško ime",
     "Done" : "Končano",
     "Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
     "Desktop client" : "Namizni odjemalec",
@@ -247,7 +262,6 @@
     "Show user backend" : "Pokaži ozadnji program",
     "Send email to new user" : "Pošlji sporočilo novemu uporabniku",
     "Show email address" : "Pokaži naslov elektronske pošte",
-    "Username" : "Uporabniško ime",
     "E-Mail" : "Elektronska pošta",
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index eae031657e7..f8f6ab10897 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -279,6 +279,8 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Fjalëkalimet e aplikacioneve janë kodkalime që u japin leje një aplikacioni ose pajisjeje të hyjnë në llogarinë tuaj %s.",
     "App name" : "Emër aplikacioni",
     "Create new app password" : "Krijoni fjalëkalim aplikacioni të ri",
+    "Use the credentials below to configure your app or device." : "Përdorni kredencialet më poshtë për të formësuar aplikacionin apo pajisjen tuaj.",
+    "Username" : "Emër përdoruesi",
     "Done" : "U bë",
     "Get the apps to sync your files" : "Merrni aplikacionet për njëkohësim të kartelave tuaja",
     "Desktop client" : "Klient desktopi",
@@ -292,7 +294,6 @@ OC.L10N.register(
     "Show user backend" : "Shfaq programin klient të përdoruesit",
     "Send email to new user" : "Dërgo email përdoruesi të ri",
     "Show email address" : "Shfaq adresë email",
-    "Username" : "Emër përdoruesi",
     "E-Mail" : "Email",
     "Create" : "Krijoje",
     "Admin Recovery Password" : "Fjalëkalim Rikthimesh Nga Përgjegjësi",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index a983e86dd57..c3ad00b85f4 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -277,6 +277,8 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Fjalëkalimet e aplikacioneve janë kodkalime që u japin leje një aplikacioni ose pajisjeje të hyjnë në llogarinë tuaj %s.",
     "App name" : "Emër aplikacioni",
     "Create new app password" : "Krijoni fjalëkalim aplikacioni të ri",
+    "Use the credentials below to configure your app or device." : "Përdorni kredencialet më poshtë për të formësuar aplikacionin apo pajisjen tuaj.",
+    "Username" : "Emër përdoruesi",
     "Done" : "U bë",
     "Get the apps to sync your files" : "Merrni aplikacionet për njëkohësim të kartelave tuaja",
     "Desktop client" : "Klient desktopi",
@@ -290,7 +292,6 @@
     "Show user backend" : "Shfaq programin klient të përdoruesit",
     "Send email to new user" : "Dërgo email përdoruesi të ri",
     "Show email address" : "Shfaq adresë email",
-    "Username" : "Emër përdoruesi",
     "E-Mail" : "Email",
     "Create" : "Krijoje",
     "Admin Recovery Password" : "Fjalëkalim Rikthimesh Nga Përgjegjësi",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index 5b77f607971..12fd48962be 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -223,6 +223,7 @@ OC.L10N.register(
     "Language" : "Језик",
     "Help translate" : " Помозите у превођењу",
     "Name" : "назив",
+    "Username" : "Корисничко име",
     "Done" : "Завршено",
     "Get the apps to sync your files" : "Преузмите апликације ради синхронизовања ваших фајлова",
     "Desktop client" : "Клијент за рачунар",
@@ -236,7 +237,6 @@ OC.L10N.register(
     "Show user backend" : "Прикажи позадину за кориснике",
     "Send email to new user" : "Пошаљи е-пошту новом кориснику",
     "Show email address" : "Прикажи е-адресу",
-    "Username" : "Корисничко име",
     "E-Mail" : "Е-пошта",
     "Create" : "Направи",
     "Admin Recovery Password" : "Администраторска лозинка за опоравак",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 77513de8fac..b47ec180dd7 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -221,6 +221,7 @@
     "Language" : "Језик",
     "Help translate" : " Помозите у превођењу",
     "Name" : "назив",
+    "Username" : "Корисничко име",
     "Done" : "Завршено",
     "Get the apps to sync your files" : "Преузмите апликације ради синхронизовања ваших фајлова",
     "Desktop client" : "Клијент за рачунар",
@@ -234,7 +235,6 @@
     "Show user backend" : "Прикажи позадину за кориснике",
     "Send email to new user" : "Пошаљи е-пошту новом кориснику",
     "Show email address" : "Прикажи е-адресу",
-    "Username" : "Корисничко име",
     "E-Mail" : "Е-пошта",
     "Create" : "Направи",
     "Admin Recovery Password" : "Администраторска лозинка за опоравак",
diff --git a/settings/l10n/sr@latin.js b/settings/l10n/sr@latin.js
index 148b1580597..5693fbf995d 100644
--- a/settings/l10n/sr@latin.js
+++ b/settings/l10n/sr@latin.js
@@ -27,11 +27,11 @@ OC.L10N.register(
     "Change password" : "Izmeni lozinku",
     "Language" : "Jezik",
     "Name" : "naziv",
+    "Username" : "Korisničko ime",
     "Get the apps to sync your files" : "Preuzmite aplikacije za sinhronizaciju Vaših fajlova",
     "Desktop client" : "Desktop klijent",
     "Android app" : "Android aplikacija",
     "iOS app" : "iOS aplikacija",
-    "Username" : "Korisničko ime",
     "Create" : "Napravi",
     "Group" : "Grupa",
     "Other" : "Drugo"
diff --git a/settings/l10n/sr@latin.json b/settings/l10n/sr@latin.json
index c328b49d9b4..331191af2c5 100644
--- a/settings/l10n/sr@latin.json
+++ b/settings/l10n/sr@latin.json
@@ -25,11 +25,11 @@
     "Change password" : "Izmeni lozinku",
     "Language" : "Jezik",
     "Name" : "naziv",
+    "Username" : "Korisničko ime",
     "Get the apps to sync your files" : "Preuzmite aplikacije za sinhronizaciju Vaših fajlova",
     "Desktop client" : "Desktop klijent",
     "Android app" : "Android aplikacija",
     "iOS app" : "iOS aplikacija",
-    "Username" : "Korisničko ime",
     "Create" : "Napravi",
     "Group" : "Grupa",
     "Other" : "Drugo"
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index f34eb08688e..d42b832dd9c 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -274,6 +274,7 @@ OC.L10N.register(
     "Browser" : "Webbläsare",
     "Most recent activity" : "Senaste aktivitet",
     "Name" : "Namn",
+    "Username" : "Användarnamn",
     "Done" : "Färdig",
     "Get the apps to sync your files" : "Skaffa apparna för att synkronisera dina filer",
     "Desktop client" : "Skrivbordsklient",
@@ -287,7 +288,6 @@ OC.L10N.register(
     "Show user backend" : "Visa användar-backend",
     "Send email to new user" : "Skicka e-post till ny användare",
     "Show email address" : "Visa e-postadress",
-    "Username" : "Användarnamn",
     "E-Mail" : "E-post",
     "Create" : "Skapa",
     "Admin Recovery Password" : "Admin-återställningslösenord",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index b6a85c364b8..1f9b58ebc17 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -272,6 +272,7 @@
     "Browser" : "Webbläsare",
     "Most recent activity" : "Senaste aktivitet",
     "Name" : "Namn",
+    "Username" : "Användarnamn",
     "Done" : "Färdig",
     "Get the apps to sync your files" : "Skaffa apparna för att synkronisera dina filer",
     "Desktop client" : "Skrivbordsklient",
@@ -285,7 +286,6 @@
     "Show user backend" : "Visa användar-backend",
     "Send email to new user" : "Skicka e-post till ny användare",
     "Show email address" : "Visa e-postadress",
-    "Username" : "Användarnamn",
     "E-Mail" : "E-post",
     "Create" : "Skapa",
     "Admin Recovery Password" : "Admin-återställningslösenord",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 5e7b549ba3e..8979e85e9ea 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -258,6 +258,7 @@ OC.L10N.register(
     "Language" : "ภาษา",
     "Help translate" : "มาช่วยกันแปลสิ!",
     "Name" : "ชื่อ",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Done" : "เสร็จสิ้น",
     "Get the apps to sync your files" : "ใช้แอพพลิเคชันในการประสานไฟล์ของคุณ",
     "Desktop client" : "เดสก์ทอปผู้ใช้",
@@ -271,7 +272,6 @@ OC.L10N.register(
     "Show user backend" : "แสดงแบ็กเอนด์ของผู้ใช้",
     "Send email to new user" : "ส่งอีเมลไปยังผู้ใช้ใหม่",
     "Show email address" : "แสดงที่อยู่อีเมล",
-    "Username" : "ชื่อผู้ใช้งาน",
     "E-Mail" : "อีเมล",
     "Create" : "สร้าง",
     "Admin Recovery Password" : "กู้คืนรหัสผ่านดูแลระบบ",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index 22070291bb6..2c4ab7de54f 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -256,6 +256,7 @@
     "Language" : "ภาษา",
     "Help translate" : "มาช่วยกันแปลสิ!",
     "Name" : "ชื่อ",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Done" : "เสร็จสิ้น",
     "Get the apps to sync your files" : "ใช้แอพพลิเคชันในการประสานไฟล์ของคุณ",
     "Desktop client" : "เดสก์ทอปผู้ใช้",
@@ -269,7 +270,6 @@
     "Show user backend" : "แสดงแบ็กเอนด์ของผู้ใช้",
     "Send email to new user" : "ส่งอีเมลไปยังผู้ใช้ใหม่",
     "Show email address" : "แสดงที่อยู่อีเมล",
-    "Username" : "ชื่อผู้ใช้งาน",
     "E-Mail" : "อีเมล",
     "Create" : "สร้าง",
     "Admin Recovery Password" : "กู้คืนรหัสผ่านดูแลระบบ",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 313aed59be2..f49749e385a 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -263,6 +263,7 @@ OC.L10N.register(
     "Language" : "Dil",
     "Help translate" : "Çevirilere yardım edin",
     "Name" : "Ad",
+    "Username" : "Kullanıcı Adı",
     "Done" : "Bitti",
     "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
     "Desktop client" : "Masaüstü istemcisi",
@@ -276,7 +277,6 @@ OC.L10N.register(
     "Show user backend" : "Kullanıcı arka ucunu göster",
     "Send email to new user" : "Yeni kullanıcıya e-posta gönder",
     "Show email address" : "E-posta adresini göster",
-    "Username" : "Kullanıcı Adı",
     "E-Mail" : "E-Posta",
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index fdab4293468..5e444f1bfa9 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -261,6 +261,7 @@
     "Language" : "Dil",
     "Help translate" : "Çevirilere yardım edin",
     "Name" : "Ad",
+    "Username" : "Kullanıcı Adı",
     "Done" : "Bitti",
     "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
     "Desktop client" : "Masaüstü istemcisi",
@@ -274,7 +275,6 @@
     "Show user backend" : "Kullanıcı arka ucunu göster",
     "Send email to new user" : "Yeni kullanıcıya e-posta gönder",
     "Show email address" : "E-posta adresini göster",
-    "Username" : "Kullanıcı Adı",
     "E-Mail" : "E-Posta",
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index ab8df47d67a..ea79d0912bd 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -227,6 +227,7 @@ OC.L10N.register(
     "Language" : "Мова",
     "Help translate" : "Допомогти з перекладом",
     "Name" : "Ім’я",
+    "Username" : "Ім'я користувача",
     "Done" : "Готово",
     "Get the apps to sync your files" : "Отримати додатки для синхронізації ваших файлів",
     "Desktop client" : "Клієнт для ПК",
@@ -240,7 +241,6 @@ OC.L10N.register(
     "Show user backend" : "Показати користувача",
     "Send email to new user" : "Надіслати email новому користувачу",
     "Show email address" : "Показати адресу електронної пошти",
-    "Username" : "Ім'я користувача",
     "E-Mail" : "Адреса електронної пошти",
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index f8fa06b7a0d..576f3731f0d 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -225,6 +225,7 @@
     "Language" : "Мова",
     "Help translate" : "Допомогти з перекладом",
     "Name" : "Ім’я",
+    "Username" : "Ім'я користувача",
     "Done" : "Готово",
     "Get the apps to sync your files" : "Отримати додатки для синхронізації ваших файлів",
     "Desktop client" : "Клієнт для ПК",
@@ -238,7 +239,6 @@
     "Show user backend" : "Показати користувача",
     "Send email to new user" : "Надіслати email новому користувачу",
     "Show email address" : "Показати адресу електронної пошти",
-    "Username" : "Ім'я користувача",
     "E-Mail" : "Адреса електронної пошти",
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
diff --git a/settings/l10n/vi.js b/settings/l10n/vi.js
index f2decd23b0b..55ace0c8a40 100644
--- a/settings/l10n/vi.js
+++ b/settings/l10n/vi.js
@@ -59,9 +59,9 @@ OC.L10N.register(
     "Language" : "Ngôn ngữ",
     "Help translate" : "Hỗ trợ dịch thuật",
     "Name" : "Tên",
+    "Username" : "Tên đăng nhập",
     "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn",
     "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu",
-    "Username" : "Tên đăng nhập",
     "Create" : "Tạo",
     "Group" : "N",
     "Default Quota" : "Hạn ngạch mặt định",
diff --git a/settings/l10n/vi.json b/settings/l10n/vi.json
index bd843122822..8eb4b306a66 100644
--- a/settings/l10n/vi.json
+++ b/settings/l10n/vi.json
@@ -57,9 +57,9 @@
     "Language" : "Ngôn ngữ",
     "Help translate" : "Hỗ trợ dịch thuật",
     "Name" : "Tên",
+    "Username" : "Tên đăng nhập",
     "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn",
     "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu",
-    "Username" : "Tên đăng nhập",
     "Create" : "Tạo",
     "Group" : "N",
     "Default Quota" : "Hạn ngạch mặt định",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 6243996d0cf..05f981d769d 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -254,6 +254,7 @@ OC.L10N.register(
     "Language" : "语言",
     "Help translate" : "帮助翻译",
     "Name" : "名称",
+    "Username" : "用户名",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
@@ -266,7 +267,6 @@ OC.L10N.register(
     "Show user backend" : "显示用户后端",
     "Send email to new user" : "发送电子邮件给新用户",
     "Show email address" : "显示邮件地址",
-    "Username" : "用户名",
     "E-Mail" : "E-Mail",
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index ab4fa47531e..60aca425bb9 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -252,6 +252,7 @@
     "Language" : "语言",
     "Help translate" : "帮助翻译",
     "Name" : "名称",
+    "Username" : "用户名",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
@@ -264,7 +265,6 @@
     "Show user backend" : "显示用户后端",
     "Send email to new user" : "发送电子邮件给新用户",
     "Show email address" : "显示邮件地址",
-    "Username" : "用户名",
     "E-Mail" : "E-Mail",
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
index 6f1cd57b792..fbc7a93eb1d 100644
--- a/settings/l10n/zh_HK.js
+++ b/settings/l10n/zh_HK.js
@@ -46,9 +46,9 @@ OC.L10N.register(
     "Language" : "語言",
     "Help translate" : "幫忙翻譯",
     "Name" : "名稱",
+    "Username" : "用戶名稱",
     "Android app" : "Android 應用程式",
     "iOS app" : "iOS 應用程式",
-    "Username" : "用戶名稱",
     "Create" : "新增",
     "Group" : "群組",
     "Everyone" : "所有人",
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
index ac76df209b3..7ada073d1ff 100644
--- a/settings/l10n/zh_HK.json
+++ b/settings/l10n/zh_HK.json
@@ -44,9 +44,9 @@
     "Language" : "語言",
     "Help translate" : "幫忙翻譯",
     "Name" : "名稱",
+    "Username" : "用戶名稱",
     "Android app" : "Android 應用程式",
     "iOS app" : "iOS 應用程式",
-    "Username" : "用戶名稱",
     "Create" : "新增",
     "Group" : "群組",
     "Everyone" : "所有人",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 6bdc3504227..9c3b14eb170 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
     "Name" : "名稱",
+    "Username" : "使用者名稱",
     "Get the apps to sync your files" : "下載應用程式來同步您的檔案",
     "Desktop client" : "桌面客戶端",
     "Android app" : "Android 應用程式",
@@ -260,7 +261,6 @@ OC.L10N.register(
     "Show user backend" : "顯示用戶後台",
     "Send email to new user" : "寄送郵件給新用戶",
     "Show email address" : "顯示電子郵件信箱",
-    "Username" : "使用者名稱",
     "E-Mail" : "電子郵件",
     "Create" : "建立",
     "Admin Recovery Password" : "管理者復原密碼",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index 46fc0c9e00b..56ad8ee9328 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -246,6 +246,7 @@
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
     "Name" : "名稱",
+    "Username" : "使用者名稱",
     "Get the apps to sync your files" : "下載應用程式來同步您的檔案",
     "Desktop client" : "桌面客戶端",
     "Android app" : "Android 應用程式",
@@ -258,7 +259,6 @@
     "Show user backend" : "顯示用戶後台",
     "Send email to new user" : "寄送郵件給新用戶",
     "Show email address" : "顯示電子郵件信箱",
-    "Username" : "使用者名稱",
     "E-Mail" : "電子郵件",
     "Create" : "建立",
     "Admin Recovery Password" : "管理者復原密碼",
diff --git a/tests/lib/DB/DBSchemaTest.php b/tests/lib/DB/DBSchemaTest.php
index 284fc532c2a..ba17546a34a 100644
--- a/tests/lib/DB/DBSchemaTest.php
+++ b/tests/lib/DB/DBSchemaTest.php
@@ -8,15 +8,17 @@
 
 namespace Test\DB;
 
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 use OC_DB;
 use OCP\Security\ISecureRandom;
+use Test\TestCase;
 
 /**
  * Class DBSchemaTest
  *
  * @group DB
  */
-class DBSchemaTest extends \Test\TestCase {
+class DBSchemaTest extends TestCase {
 	protected $schema_file = 'static://test_db_scheme';
 	protected $schema_file2 = 'static://test_db_scheme2';
 	protected $table1;
@@ -53,7 +55,6 @@ class DBSchemaTest extends \Test\TestCase {
 	 * @medium
 	 */
 	public function testSchema() {
-		$platform = \OC::$server->getDatabaseConnection()->getDatabasePlatform();
 		$this->doTestSchemaCreating();
 		$this->doTestSchemaChanging();
 		$this->doTestSchemaDumping();
@@ -97,7 +98,7 @@ class DBSchemaTest extends \Test\TestCase {
 	 */
 	public function assertTableNotExist($table) {
 		$platform = \OC::$server->getDatabaseConnection()->getDatabasePlatform();
-		if ($platform instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
+		if ($platform instanceof SqlitePlatform) {
 			// sqlite removes the tables after closing the DB
 			$this->assertTrue(true);
 		} else {
diff --git a/tests/lib/DB/SchemaDiffTest.php b/tests/lib/DB/SchemaDiffTest.php
new file mode 100644
index 00000000000..b7bb3c2a9cb
--- /dev/null
+++ b/tests/lib/DB/SchemaDiffTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Test\DB;
+
+use Doctrine\DBAL\Schema\SchemaDiff;
+use OC\DB\MDB2SchemaManager;
+use OC\DB\MDB2SchemaReader;
+use OCP\IConfig;
+use Test\TestCase;
+
+/**
+ * Class MigratorTest
+ *
+ * @group DB
+ *
+ * @package Test\DB
+ */
+class SchemaDiffTest extends TestCase {
+	/** @var \Doctrine\DBAL\Connection $connection */
+	private $connection;
+
+	/** @var MDB2SchemaManager */
+	private $manager;
+
+	/** @var IConfig */
+	private $config;
+
+	/** @var string */
+	private $testPrefix;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->config = \OC::$server->getConfig();
+		$this->connection = \OC::$server->getDatabaseConnection();
+		$this->manager = new MDB2SchemaManager($this->connection);
+		$this->testPrefix= strtolower($this->getUniqueID($this->config->getSystemValue('dbtableprefix', 'oc_'), 3));
+	}
+
+	protected function tearDown() {
+		$this->manager->removeDBStructure('static://test_db_scheme');
+		parent::tearDown();
+	}
+
+	/**
+	 * @dataProvider providesSchemaFiles
+	 * @param string $xml
+	 */
+	public function testZeroChangeOnSchemaMigrations($xml) {
+
+		$xml = str_replace( '*dbprefix*', $this->testPrefix, $xml );
+		$schemaFile = 'static://test_db_scheme';
+		file_put_contents($schemaFile, $xml);
+
+		// apply schema
+		$this->manager->createDbFromStructure($schemaFile);
+
+		$schemaReader = new MDB2SchemaReader($this->config, $this->connection->getDatabasePlatform());
+		$endSchema = $schemaReader->loadSchemaFromFile($schemaFile);
+
+		// get the diff
+		/** @var SchemaDiff $diff */
+		$migrator = $this->manager->getMigrator();
+		$diff = $this->invokePrivate($migrator, 'getDiff', [$endSchema, $this->connection]);
+
+		// no sql statement is expected
+		$sqls = $diff->toSql($this->connection->getDatabasePlatform());
+		$this->assertEquals([], $sqls);
+	}
+
+	public function providesSchemaFiles() {
+		return [
+			'explicit test on autoincrement' => [file_get_contents(__DIR__ . '/schemDiffData/autoincrement.xml')],
+			'explicit test on clob' => [file_get_contents(__DIR__ . '/schemDiffData/clob.xml')],
+			'explicit test on unsigned' => [file_get_contents(__DIR__ . '/schemDiffData/unsigned.xml')],
+			'explicit test on default -1' => [file_get_contents(__DIR__ . '/schemDiffData/default-1.xml')],
+			'testing core schema' => [file_get_contents(__DIR__ . '/schemDiffData/core.xml')],
+		];
+	}
+}
diff --git a/tests/lib/DB/schemDiffData/autoincrement.xml b/tests/lib/DB/schemDiffData/autoincrement.xml
new file mode 100644
index 00000000000..458c5d8166f
--- /dev/null
+++ b/tests/lib/DB/schemDiffData/autoincrement.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<database>
+	<table>
+		<name>*dbprefix*external_config</name>
+		<declaration>
+			<field>
+				<name>config_id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<length>6</length>
+			</field>
+		</declaration>
+	</table>
+</database>
diff --git a/tests/lib/DB/schemDiffData/clob.xml b/tests/lib/DB/schemDiffData/clob.xml
new file mode 100644
index 00000000000..08aef18c31d
--- /dev/null
+++ b/tests/lib/DB/schemDiffData/clob.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<database>
+	<table>
+		<name>*dbprefix*external_config</name>
+		<declaration>
+			<field>
+				<name>value</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>100000</length>
+			</field>
+		</declaration>
+	</table>
+</database>
diff --git a/tests/lib/DB/schemDiffData/core.xml b/tests/lib/DB/schemDiffData/core.xml
new file mode 100644
index 00000000000..3775eb6cb37
--- /dev/null
+++ b/tests/lib/DB/schemDiffData/core.xml
@@ -0,0 +1,1347 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<database>
+
+	<table>
+
+		<!--
+		Namespaced Key-Value Store for Application Configuration.
+		 - Keys are namespaced per appid.
+		 - E.g. (core, global_cache_gc_lastrun) -> 1385463286
+		-->
+		<name>*dbprefix*appconfig</name>
+
+		<declaration>
+
+			<field>
+				<name>appid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>32</length>
+			</field>
+
+			<field>
+				<name>configkey</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>configvalue</name>
+				<type>clob</type>
+				<notnull>false</notnull>
+			</field>
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Bidirectional Map for Storage Names and Storage Ids.
+		 - Assigns each storage name a unique storage id integer.
+		 - Long storage names are hashed.
+		 - E.g.                     local::/tmp/ <-> 2
+		 - E.g. b5db994aa8c6625100e418406c798269 <-> 27
+		-->
+		<name>*dbprefix*storages</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>numeric_id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>available</name>
+				<type>integer</type>
+				<default>1</default>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>last_checked</name>
+				<type>integer</type>
+			</field>
+		</declaration>
+
+	</table>
+
+	<!-- a list of all mounted storage per user, populated on filesystem setup -->
+	<table>
+
+		<name>*dbprefix*mounts</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>storage_id</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+			</field>
+
+			<!-- fileid of the root of the mount, foreign key: oc_filecache.fileid -->
+			<field>
+				<name>root_id</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>user_id</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>mount_point</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>4000</length>
+			</field>
+
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Bidirectional Map for Mimetypes and Mimetype Id
+		 - Assigns each mimetype (and supertype) a unique mimetype id integer.
+		 - E.g.     application <-> 5
+		 - E.g. application/pdf <-> 6
+		-->
+		<name>*dbprefix*mimetypes</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>mimetype</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Main file table containing one row for each directory and file.
+		 - Assigns a unique integer fileid to each file (and directory)
+		 - Assigns an etag to each file (and directory)
+		 - Caches various file/dir properties such as:
+		  - path (filename, e.g. files/combinatoricslib-2.0_doc.zip)
+		  - path_hash = md5(path)
+		  - name (basename, e.g. combinatoricslib-2.0_doc.zip)
+		  - size (for directories this is the sum of all contained file sizes)
+		-->
+		<name>*dbprefix*filecache</name>
+
+		<declaration>
+
+			<field>
+				<name>fileid</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<length>4</length>
+			</field>
+
+			<!-- Foreign Key storages::numeric_id -->
+			<field>
+				<name>storage</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>path</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>4000</length>
+			</field>
+
+			<field>
+				<name>path_hash</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>32</length>
+			</field>
+
+			<!-- Foreign Key filecache::fileid -->
+			<field>
+				<name>parent</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>name</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>250</length>
+			</field>
+
+			<!-- Foreign Key mimetypes::id -->
+			<field>
+				<name>mimetype</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<!-- Foreign Key mimetypes::id -->
+			<field>
+				<name>mimepart</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>size</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>8</length>
+			</field>
+
+			<field>
+				<name>mtime</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>storage_mtime</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>encrypted</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+            <field>
+                <name>unencrypted_size</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <length>8</length>
+            </field>
+
+			<field>
+				<name>etag</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>40</length>
+			</field>
+
+            <field>
+                <name>permissions</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>false</notnull>
+                <length>4</length>
+            </field>
+
+			<field>
+				<name>checksum</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>255</length>
+			</field>
+
+
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Stores which groups have which users as members in an n:m relationship.
+		 - Maps group id (gid) to a set of users (uid)
+		 - Maps user id (uid) to a set of groups (gid) (but without index)
+		-->
+		<name>*dbprefix*group_user</name>
+
+		<declaration>
+
+			<!-- Foreign Key groups::gid -->
+			<field>
+				<name>gid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<!-- Foreign Key users::uid -->
+			<field>
+				<name>uid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Stores which groups have which users as admins in an n:m relationship.
+		 - Maps group id (gid) to a set of users (uid)
+		 - Maps user id (uid) to a set of groups (gid)
+
+		NOTE: This could (very likely) be reduced to a single bit in group_user
+		      instead of repeating varchars gid and uid here
+		-->
+		<name>*dbprefix*group_admin</name>
+
+		<declaration>
+
+			<!-- Foreign Key groups::gid -->
+			<field>
+				<name>gid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<!-- Foreign Key users::uid -->
+			<field>
+				<name>uid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		A simple list of groups.
+		-->
+		<name>*dbprefix*groups</name>
+
+		<declaration>
+
+			<field>
+				<name>gid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Namespaced Key-Value Store for User Preferences
+		 - Keys are namespaced per userid and appid.
+		 - E.g. (admin, files, cache_version) -> 5
+		-->
+		<name>*dbprefix*preferences</name>
+
+		<declaration>
+
+			<!-- Foreign Key users::uid -->
+			<field>
+				<name>userid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>appid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>32</length>
+			</field>
+
+			<field>
+				<name>configkey</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>configvalue</name>
+				<type>clob</type>
+				<notnull>false</notnull>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		WebDAV properties.
+		-->
+		<name>*dbprefix*properties</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<autoincrement>1</autoincrement>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<!-- Foreign Key users::uid -->
+			<field>
+				<name>userid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>propertypath</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+			<field>
+				<name>propertyname</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+			<field>
+				<name>propertyvalue</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Shares of all types (user-to-user, external-via-link, etc.)
+		-->
+		<name>*dbprefix*share</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<autoincrement>1</autoincrement>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<!-- Constant OCP\Share::SHARE_TYPE_* -->
+			<field>
+				<name>share_type</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>1</length>
+			</field>
+
+			<!-- Foreign Key users::uid or NULL -->
+			<field>
+				<name>share_with</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>255</length>
+			</field>
+
+			<!-- Foreign Key users::uid -->
+            <!-- This is the owner of the share
+                 which does not have to be the initiator of the share -->
+			<field>
+				<name>uid_owner</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<!-- Foreign Key users::uid -->
+            <!-- This is the initiator of the share -->
+			<field>
+				<name>uid_initiator</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>64</length>
+			</field>
+
+
+
+			<!-- Foreign Key share::id or NULL -->
+			<field>
+				<name>parent</name>
+				<type>integer</type>
+				<notnull>false</notnull>
+				<length>4</length>
+			</field>
+
+			<!-- E.g. file or folder -->
+			<field>
+				<name>item_type</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<!-- Foreign Key filecache::fileid -->
+			<field>
+				<name>item_source</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>255</length>
+			</field>
+
+			<field>
+				<name>item_target</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>255</length>
+			</field>
+
+			<!-- Foreign Key filecache::fileid -->
+			<field>
+				<name>file_source</name>
+				<type>integer</type>
+				<notnull>false</notnull>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>file_target</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>512</length>
+			</field>
+
+			<!-- Permission bitfield -->
+			<field>
+				<name>permissions</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>1</length>
+			</field>
+
+			<!-- Time of share creation -->
+			<field>
+				<name>stime</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>8</length>
+			</field>
+
+			<!-- Whether the receiver accepted the share, if share_with is set. -->
+			<field>
+				<name>accepted</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>1</length>
+			</field>
+
+			<!-- Time of share expiration -->
+			<field>
+				<name>expiration</name>
+				<type>timestamp</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<name>token</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>32</length>
+			</field>
+
+			<field>
+				<name>mail_send</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>1</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Scheduled background jobs.
+		See OC\BackgroundJob\JobList.
+		-->
+		<name>*dbprefix*jobs</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>class</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+			<field>
+				<name>argument</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>4000</length>
+			</field>
+
+			<field>
+				<!-- timestamp when the job was executed the last time -->
+				<name>last_run</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<!-- timestamp when the job was checked if it needs execution the last time -->
+				<name>last_checked</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<!-- timestamp when the job was reserved the last time, 1 day timeout -->
+				<name>reserved_at</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		List of usernames, their display name and login password.
+		-->
+		<name>*dbprefix*users</name>
+
+		<declaration>
+
+			<field>
+				<name>uid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>displayname</name>
+				<type>text</type>
+				<default></default>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>password</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+
+		</declaration>
+
+	</table>
+
+	<table>
+		<name>*dbprefix*authtoken</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+
+			<!-- Foreign Key users::uid -->
+			<field>
+				<name>uid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>login_name</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>password</name>
+				<type>clob</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<name>name</name>
+				<type>clob</type>
+				<default></default>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>token</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>200</length>
+			</field>
+
+			<field>
+				<name>type</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>2</length>
+			</field>
+
+			<field>
+				<name>last_activity</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+
+		</declaration>
+	</table>
+
+	<table>
+
+		<!--
+		List of tags (category) + a unique tag id (id) per user (uid) and type.
+		-->
+		<name>*dbprefix*vcategory</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+
+			<!-- Foreign Key users::uid -->
+			<field>
+				<name>uid</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>type</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>category</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+		</declaration>
+	</table>
+
+	<table>
+
+		<!--
+		Object-Tag associations per tag type.
+		-->
+		<name>*dbprefix*vcategory_to_object</name>
+
+		<declaration>
+
+		<field>
+			<name>objid</name>
+			<type>integer</type>
+			<default>0</default>
+			<notnull>true</notnull>
+			<unsigned>true</unsigned>
+			<length>4</length>
+		</field>
+
+		<!-- Foreign Key vcategory::id -->
+		<field>
+			<name>categoryid</name>
+			<type>integer</type>
+			<default>0</default>
+			<notnull>true</notnull>
+			<unsigned>true</unsigned>
+			<length>4</length>
+		</field>
+
+		<field>
+			<name>type</name>
+			<type>text</type>
+			<default></default>
+			<notnull>true</notnull>
+			<length>64</length>
+		</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+		<!--
+		List of system-wide tags
+		-->
+		<name>*dbprefix*systemtag</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+
+			<!-- Tag name -->
+			<field>
+				<name>name</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<!-- Visibility: 0 user-not-visible, 1 user-visible -->
+			<field>
+				<name>visibility</name>
+				<type>integer</type>
+				<default>1</default>
+				<notnull>true</notnull>
+				<length>1</length>
+			</field>
+
+			<!-- Editable: 0 user-not-editable, 1 user-editable -->
+			<field>
+				<name>editable</name>
+				<type>integer</type>
+				<default>1</default>
+				<notnull>true</notnull>
+				<length>1</length>
+			</field>
+
+		</declaration>
+	</table>
+
+	<table>
+
+		<!--
+		System tag to object associations per object type.
+		-->
+		<name>*dbprefix*systemtag_object_mapping</name>
+
+		<declaration>
+
+		<!-- object id (ex: file id for files)-->
+		<field>
+			<name>objectid</name>
+			<type>text</type>
+			<default></default>
+			<notnull>true</notnull>
+			<length>64</length>
+		</field>
+
+		<!-- object type (ex: "files")-->
+		<field>
+			<name>objecttype</name>
+			<type>text</type>
+			<default></default>
+			<notnull>true</notnull>
+			<length>64</length>
+		</field>
+
+		<!-- Foreign Key systemtag::id -->
+		<field>
+			<name>systemtagid</name>
+			<type>integer</type>
+			<default>0</default>
+			<notnull>true</notnull>
+			<unsigned>true</unsigned>
+			<length>4</length>
+		</field>
+
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		System tag to group mapping
+		-->
+		<name>*dbprefix*systemtag_group</name>
+
+		<declaration>
+
+		<!-- Foreign Key systemtag::id -->
+		<field>
+			<name>systemtagid</name>
+			<type>integer</type>
+			<default>0</default>
+			<notnull>true</notnull>
+			<unsigned>true</unsigned>
+			<length>4</length>
+		</field>
+
+		<field>
+			<name>gid</name>
+			<type>string</type>
+			<notnull>true</notnull>
+		</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Namespaced Key-Value Store for arbitrary data.
+		 - Keys are namespaced per userid and appid.
+		 - E.g. (admin, files, foo) -> bar
+		-->
+		<name>*dbprefix*privatedata</name>
+
+		<declaration>
+
+		<field>
+			<name>keyid</name>
+			<type>integer</type>
+			<default>0</default>
+			<notnull>true</notnull>
+			<unsigned>true</unsigned>
+			<length>4</length>
+			<autoincrement>1</autoincrement>
+		</field>
+
+		<!-- Foreign Key users::uid -->
+		<field>
+			<name>user</name>
+			<type>text</type>
+			<default></default>
+			<notnull>true</notnull>
+			<length>64</length>
+		</field>
+
+		<field>
+			<name>app</name>
+			<type>text</type>
+			<default></default>
+			<notnull>true</notnull>
+			<length>255</length>
+		</field>
+
+		<field>
+			<name>key</name>
+			<type>text</type>
+			<default></default>
+			<notnull>true</notnull>
+			<length>255</length>
+		</field>
+
+		<field>
+			<name>value</name>
+			<type>text</type>
+			<default></default>
+			<notnull>true</notnull>
+			<length>255</length>
+		</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
+		<!--
+		Table for storing transactional file locking
+		-->
+		<name>*dbprefix*file_locks</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+				<autoincrement>1</autoincrement>
+			</field>
+
+			<field>
+				<name>lock</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>key</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>ttl</name>
+				<type>integer</type>
+				<default>-1</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+		<!--
+		default place to store comment data
+		-->
+		<name>*dbprefix*comments</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+				<autoincrement>1</autoincrement>
+			</field>
+
+			<field>
+				<name>parent_id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>topmost_parent_id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>children_count</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>actor_type</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>actor_id</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>message</name>
+				<type>clob</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<name>verb</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>creation_timestamp</name>
+				<type>timestamp</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<name>latest_child_timestamp</name>
+				<type>timestamp</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<name>object_type</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>object_id</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+		<!--
+		default place to store per user and object read markers
+		-->
+		<name>*dbprefix*comments_read_markers</name>
+
+		<declaration>
+
+			<field>
+				<name>user_id</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>marker_datetime</name>
+				<type>timestamp</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<name>object_type</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>object_id</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+	<table>
+		<!--
+		Encrypted credentials storage
+		-->
+		<name>*dbprefix*credentials</name>
+
+		<declaration>
+
+			<field>
+				<name>user</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>identifier</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>credentials</name>
+				<type>clob</type>
+				<notnull>false</notnull>
+			</field>
+
+		</declaration>
+
+	</table>
+
+</database>
diff --git a/tests/lib/DB/schemDiffData/default-1.xml b/tests/lib/DB/schemDiffData/default-1.xml
new file mode 100644
index 00000000000..39b95a1f273
--- /dev/null
+++ b/tests/lib/DB/schemDiffData/default-1.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<database>
+
+	<table>
+
+		<!--
+		Table for storing transactional file locking
+		-->
+		<name>*dbprefix*file_locks</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+				<autoincrement>1</autoincrement>
+			</field>
+
+			<field>
+				<name>lock</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>key</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<default>(stupid text)</default>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>ttl</name>
+				<type>integer</type>
+				<default>-1</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+		</declaration>
+
+	</table>
+
+</database>
diff --git a/tests/lib/DB/schemDiffData/unsigned.xml b/tests/lib/DB/schemDiffData/unsigned.xml
new file mode 100644
index 00000000000..e89fd6a5d4e
--- /dev/null
+++ b/tests/lib/DB/schemDiffData/unsigned.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<database>
+
+	<table>
+
+		<!--
+		Scheduled background jobs.
+		See OC\BackgroundJob\JobList.
+		-->
+		<name>*dbprefix*jobs</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<unsigned>true</unsigned>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>class</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+			<field>
+				<name>argument</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>4000</length>
+			</field>
+
+			<field>
+				<!-- timestamp when the job was executed the last time -->
+				<name>last_run</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<!-- timestamp when the job was checked if it needs execution the last time -->
+				<name>last_checked</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+			<field>
+				<!-- timestamp when the job was reserved the last time, 1 day timeout -->
+				<name>reserved_at</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>false</notnull>
+			</field>
+
+		</declaration>
+
+	</table>
+
+</database>
diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php
index 447c6142f34..9bde2c664b6 100644
--- a/tests/lib/User/SessionTest.php
+++ b/tests/lib/User/SessionTest.php
@@ -729,6 +729,9 @@ class SessionTest extends \Test\TestCase {
 		$this->assertFalse($userSession->createSessionToken($request, $uid, $loginName, $password));
 	}
 
+	/**
+	 * @expectedException \OC\User\LoginException
+	 */
 	public function testTryTokenLoginWithDisabledUser() {
 		$manager = $this->getMockBuilder('\OC\User\Manager')
 			->disableOriginalConstructor()
@@ -761,7 +764,7 @@ class SessionTest extends \Test\TestCase {
 			->method('isEnabled')
 			->will($this->returnValue(false));
 
-		$this->assertFalse($userSession->tryTokenLogin($request));
+		$userSession->tryTokenLogin($request);
 	}
 
 	public function testValidateSessionDisabledUser() {
diff --git a/version.php b/version.php
index b439ffbbdad..86fb9bbf54c 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 0, 10);
+$OC_Version = array(9, 1, 0, 11);
 
 // The human readable string
-$OC_VersionString = '9.1.0 beta 2';
+$OC_VersionString = '9.1.0 RC1';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);