[tx-robot] updated from transifex

50 files changed, 3106 insertions, 3106 deletions

diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 05d6b346630..ea4bf9434e0 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "Email uložen",
     "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
     "Unable to change full name" : "Nelze změnit celé jméno",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Upozornění zabezpečení a nastavení",
-    "Sharing" : "Sdílení",
-    "Server-side encryption" : "Šifrování na serveru",
-    "External Storage" : "Externí úložiště",
-    "Cron" : "Cron",
-    "Email server" : "Emailový server",
-    "Log" : "Záznam",
-    "Tips & tricks" : "Tipy a triky",
-    "Updates" : "Aktualizace",
     "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
     "Language changed" : "Jazyk byl změněn",
     "Invalid request" : "Neplatný požadavek",
@@ -137,17 +126,55 @@ OC.L10N.register(
     "Sessions" : "Sezení",
     "App passwords" : "Hesla aplikací",
     "Sync clients" : "Synchronizační klienti",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
-    "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
-    "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy",
-    "Errors and fatal issues" : "Chyby a fatální problémy",
-    "Fatal issues only" : "Pouze fatální problémy",
     "None" : "Žádné",
     "Login" : "Přihlásit",
     "Plain" : "Čistý text",
     "NT LAN Manager" : "Správce NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Emailový server",
+    "Open documentation" : "Otevřít dokumentaci",
+    "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
+    "Send mode" : "Mód odesílání",
+    "Encryption" : "Šifrování",
+    "From address" : "Adresa odesílatele",
+    "mail" : "email",
+    "Authentication method" : "Metoda ověření",
+    "Authentication required" : "Vyžadováno ověření",
+    "Server address" : "Adresa serveru",
+    "Port" : "Port",
+    "Credentials" : "Přihlašovací údaje",
+    "SMTP Username" : "SMTP uživatelské jméno ",
+    "SMTP Password" : "SMTP heslo",
+    "Store credentials" : "Ukládat přihlašovací údaje",
+    "Test email settings" : "Test nastavení emailu",
+    "Send email" : "Odeslat email",
+    "Server-side encryption" : "Šifrování na serveru",
+    "Enable server-side encryption" : "Povolit šifrování na straně serveru",
+    "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Poté co je zapnuto šifrování, jsou od toho bodu všechny nahrávané soubory šifrovány serverem. Vypnout šifrování bude možné pouze později, až bude šifrovací modul tuto možnost podporovat a po splnění všech nutných podmínek (tzn. nastavení klíčů pro obnovení).",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Šifrování samotné ještě negarantuje bezpečnost systému. Přečtěte si prosím dokumentaci, chcete-li se dozvědět více informací o tom, jak aplikace pro šifrování funguje a jaké jsou podporované případy použití.",
+    "Be aware that encryption always increases the file size." : "Mějte na paměti, že šifrování vždy navýší velikost souboru.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Je vždy dobré vytvářet pravidelné zálohy svých dat, v případě zapnutého šifrování také zajistěte zálohu šifrovacích klíčů společně se zálohou dat.",
+    "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
+    "Enable encryption" : "Povolit šifrování",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
+    "Select default encryption module:" : "Vybrat výchozí šifrovací modul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Povolte prosím \"Default encryption module\" a spusťte příkaz 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou.",
+    "Start migration" : "Spustit migraci",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
+    "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
+    "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy",
+    "Errors and fatal issues" : "Chyby a fatální problémy",
+    "Fatal issues only" : "Pouze fatální problémy",
+    "Log" : "Záznam",
+    "What to log" : "Co se má logovat",
+    "Download logfile" : "Stáhnout soubor logu",
+    "More" : "Více",
+    "Less" : "Méně",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!",
+    "Security & setup warnings" : "Upozornění zabezpečení a nastavení",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php není nejspíše správně nastaveno pro dotazování na proměnné hodnoty systému. Test s getenv(\"PATH\") vrací pouze prázdnou odpověď.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Zkontrolujte prosím konfiguraci php podle <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">instalační dokumentace ↗</a>, hlavně při použití php-fpm.",
     "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." : "Konfigurace je nastavena pouze pro čtení. Toto znemožňuje některá nastavení přes webové rozhraní. Dále musí být pro každou změnu povolen zápis do konfiguračního souboru ručně.",
@@ -164,7 +191,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Nebylo možné spustit službu cron v CLI. Došlo k následujícím technickým chybám:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Prosím překontrolujte <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">instalační pokyny ↗</a> a zkontrolujte jakékoliv chyby a varování v <a href=\"#log-section\">logu</a>.",
     "All checks passed." : "Všechny testy byly úspěšné.",
-    "Open documentation" : "Otevřít dokumentaci",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Poslední cron proběhl: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
+    "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
+    "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
+    "Version" : "Verze",
+    "Sharing" : "Sdílení",
     "Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
     "Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
     "Allow public uploads" : "Povolit veřejné nahrávání souborů",
@@ -181,45 +216,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Vyjmout skupiny ze sdílení",
     "These groups will still be able to receive shares, but not to initiate them." : "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Povolit automatické vyplňování v dialogu sdílení. Pokud je toto vypnuto, je třeba ručně vyplňovat celé uživatelské jméno.",
-    "Last cron job execution: %s." : "Poslední cron proběhl: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
-    "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
-    "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
-    "Enable server-side encryption" : "Povolit šifrování na straně serveru",
-    "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Poté co je zapnuto šifrování, jsou od toho bodu všechny nahrávané soubory šifrovány serverem. Vypnout šifrování bude možné pouze později, až bude šifrovací modul tuto možnost podporovat a po splnění všech nutných podmínek (tzn. nastavení klíčů pro obnovení).",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Šifrování samotné ještě negarantuje bezpečnost systému. Přečtěte si prosím dokumentaci, chcete-li se dozvědět více informací o tom, jak aplikace pro šifrování funguje a jaké jsou podporované případy použití.",
-    "Be aware that encryption always increases the file size." : "Mějte na paměti, že šifrování vždy navýší velikost souboru.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Je vždy dobré vytvářet pravidelné zálohy svých dat, v případě zapnutého šifrování také zajistěte zálohu šifrovacích klíčů společně se zálohou dat.",
-    "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
-    "Enable encryption" : "Povolit šifrování",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
-    "Select default encryption module:" : "Vybrat výchozí šifrovací modul:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Povolte prosím \"Default encryption module\" a spusťte příkaz 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou.",
-    "Start migration" : "Spustit migraci",
-    "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
-    "Send mode" : "Mód odesílání",
-    "Encryption" : "Šifrování",
-    "From address" : "Adresa odesílatele",
-    "mail" : "email",
-    "Authentication method" : "Metoda ověření",
-    "Authentication required" : "Vyžadováno ověření",
-    "Server address" : "Adresa serveru",
-    "Port" : "Port",
-    "Credentials" : "Přihlašovací údaje",
-    "SMTP Username" : "SMTP uživatelské jméno ",
-    "SMTP Password" : "SMTP heslo",
-    "Store credentials" : "Ukládat přihlašovací údaje",
-    "Test email settings" : "Test nastavení emailu",
-    "Send email" : "Odeslat email",
-    "What to log" : "Co se má logovat",
-    "Download logfile" : "Stáhnout soubor logu",
-    "More" : "Více",
-    "Less" : "Méně",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!",
+    "Tips & tricks" : "Tipy a triky",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Je použita databáze SQLite. Pro větší instalace doporučujeme přejít na robustnější databázi.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Pro migraci na jinou databázi použijte v příkazovém řádku nástroj: 'occ db:convert-type' nebo nahlédněte do <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentace ↗</a>.",
@@ -229,7 +226,6 @@ OC.L10N.register(
     "Improving the config.php" : "Vylepšení souboru config.php",
     "Theming" : "Vzhledy",
     "Hardening and security guidance" : "Průvodce vylepšením bezpečnosti",
-    "Version" : "Verze",
     "Developer documentation" : "Vývojářská dokumentace",
     "Experimental applications ahead" : "Experimentální aplikace v pořadí",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentální aplikace nejsou prověřovány na bezpečnostní chyby, mohou být nestabilní a velmi se měnit. Jejich instalací můžete způsobit ztrátu dat nebo bezpečnostní problémy.",
@@ -285,6 +281,11 @@ OC.L10N.register(
     "Change password" : "Změnit heslo",
     "Language" : "Jazyk",
     "Help translate" : "Pomoci s překladem",
+    "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
+    "Desktop client" : "Aplikace pro počítač",
+    "Android app" : "Aplikace pro Android",
+    "iOS app" : "iOS aplikace",
+    "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
     "Web, desktop and mobile clients currently logged in to your account." : "Weboví, desktopoví a mobilní klienti aktuálně přihlášeni k vašemu účtu.",
     "Device" : "Přístroj",
     "Last activity" : "Poslední aktivita",
@@ -296,12 +297,6 @@ OC.L10N.register(
     "For security reasons this password will only be shown once." : "Toto heslo bude z bezpečnostních důvodů zobrazeno pouze jedenkrát.",
     "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č",
-    "Android app" : "Aplikace pro Android",
-    "iOS app" : "iOS aplikace",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li projekt podpořit\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">připojte se k vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte informace dál</a>!",
-    "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Vyvíjeno {communityopen}Nextcloud komunitou{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}AGPL{linkclose}.",
     "Follow us on Google Plus!" : "Sledujte nás na Google Plus!",
     "Subscribe to our twitter channel!" : "Odebírejte náš twitter kanál!",
@@ -331,6 +326,10 @@ OC.L10N.register(
     "set new password" : "nastavit nové heslo",
     "change email address" : "změnit emailovou adresu",
     "Default" : "Výchozí",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Externí úložiště",
+    "Updates" : "Aktualizace",
     "no group" : "není ve skupině",
     "add group" : "přidat skupinu",
     "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Vaše databáze neběží s úrovní izolace transakcí \"READ COMMITED\". Toto může způsobit problémy při paralelním spouštění více akcí současně.",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index e07e1fba926..6d96c433a4f 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -33,17 +33,6 @@
     "Email saved" : "Email uložen",
     "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
     "Unable to change full name" : "Nelze změnit celé jméno",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Upozornění zabezpečení a nastavení",
-    "Sharing" : "Sdílení",
-    "Server-side encryption" : "Šifrování na serveru",
-    "External Storage" : "Externí úložiště",
-    "Cron" : "Cron",
-    "Email server" : "Emailový server",
-    "Log" : "Záznam",
-    "Tips & tricks" : "Tipy a triky",
-    "Updates" : "Aktualizace",
     "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
     "Language changed" : "Jazyk byl změněn",
     "Invalid request" : "Neplatný požadavek",
@@ -135,17 +124,55 @@
     "Sessions" : "Sezení",
     "App passwords" : "Hesla aplikací",
     "Sync clients" : "Synchronizační klienti",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
-    "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
-    "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy",
-    "Errors and fatal issues" : "Chyby a fatální problémy",
-    "Fatal issues only" : "Pouze fatální problémy",
     "None" : "Žádné",
     "Login" : "Přihlásit",
     "Plain" : "Čistý text",
     "NT LAN Manager" : "Správce NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Emailový server",
+    "Open documentation" : "Otevřít dokumentaci",
+    "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
+    "Send mode" : "Mód odesílání",
+    "Encryption" : "Šifrování",
+    "From address" : "Adresa odesílatele",
+    "mail" : "email",
+    "Authentication method" : "Metoda ověření",
+    "Authentication required" : "Vyžadováno ověření",
+    "Server address" : "Adresa serveru",
+    "Port" : "Port",
+    "Credentials" : "Přihlašovací údaje",
+    "SMTP Username" : "SMTP uživatelské jméno ",
+    "SMTP Password" : "SMTP heslo",
+    "Store credentials" : "Ukládat přihlašovací údaje",
+    "Test email settings" : "Test nastavení emailu",
+    "Send email" : "Odeslat email",
+    "Server-side encryption" : "Šifrování na serveru",
+    "Enable server-side encryption" : "Povolit šifrování na straně serveru",
+    "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Poté co je zapnuto šifrování, jsou od toho bodu všechny nahrávané soubory šifrovány serverem. Vypnout šifrování bude možné pouze později, až bude šifrovací modul tuto možnost podporovat a po splnění všech nutných podmínek (tzn. nastavení klíčů pro obnovení).",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Šifrování samotné ještě negarantuje bezpečnost systému. Přečtěte si prosím dokumentaci, chcete-li se dozvědět více informací o tom, jak aplikace pro šifrování funguje a jaké jsou podporované případy použití.",
+    "Be aware that encryption always increases the file size." : "Mějte na paměti, že šifrování vždy navýší velikost souboru.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Je vždy dobré vytvářet pravidelné zálohy svých dat, v případě zapnutého šifrování také zajistěte zálohu šifrovacích klíčů společně se zálohou dat.",
+    "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
+    "Enable encryption" : "Povolit šifrování",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
+    "Select default encryption module:" : "Vybrat výchozí šifrovací modul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Povolte prosím \"Default encryption module\" a spusťte příkaz 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou.",
+    "Start migration" : "Spustit migraci",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
+    "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
+    "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy",
+    "Errors and fatal issues" : "Chyby a fatální problémy",
+    "Fatal issues only" : "Pouze fatální problémy",
+    "Log" : "Záznam",
+    "What to log" : "Co se má logovat",
+    "Download logfile" : "Stáhnout soubor logu",
+    "More" : "Více",
+    "Less" : "Méně",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!",
+    "Security & setup warnings" : "Upozornění zabezpečení a nastavení",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php není nejspíše správně nastaveno pro dotazování na proměnné hodnoty systému. Test s getenv(\"PATH\") vrací pouze prázdnou odpověď.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Zkontrolujte prosím konfiguraci php podle <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">instalační dokumentace ↗</a>, hlavně při použití php-fpm.",
     "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." : "Konfigurace je nastavena pouze pro čtení. Toto znemožňuje některá nastavení přes webové rozhraní. Dále musí být pro každou změnu povolen zápis do konfiguračního souboru ručně.",
@@ -162,7 +189,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Nebylo možné spustit službu cron v CLI. Došlo k následujícím technickým chybám:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Prosím překontrolujte <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">instalační pokyny ↗</a> a zkontrolujte jakékoliv chyby a varování v <a href=\"#log-section\">logu</a>.",
     "All checks passed." : "Všechny testy byly úspěšné.",
-    "Open documentation" : "Otevřít dokumentaci",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Poslední cron proběhl: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
+    "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
+    "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
+    "Version" : "Verze",
+    "Sharing" : "Sdílení",
     "Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
     "Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
     "Allow public uploads" : "Povolit veřejné nahrávání souborů",
@@ -179,45 +214,7 @@
     "Exclude groups from sharing" : "Vyjmout skupiny ze sdílení",
     "These groups will still be able to receive shares, but not to initiate them." : "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Povolit automatické vyplňování v dialogu sdílení. Pokud je toto vypnuto, je třeba ručně vyplňovat celé uživatelské jméno.",
-    "Last cron job execution: %s." : "Poslední cron proběhl: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
-    "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
-    "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
-    "Enable server-side encryption" : "Povolit šifrování na straně serveru",
-    "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Poté co je zapnuto šifrování, jsou od toho bodu všechny nahrávané soubory šifrovány serverem. Vypnout šifrování bude možné pouze později, až bude šifrovací modul tuto možnost podporovat a po splnění všech nutných podmínek (tzn. nastavení klíčů pro obnovení).",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Šifrování samotné ještě negarantuje bezpečnost systému. Přečtěte si prosím dokumentaci, chcete-li se dozvědět více informací o tom, jak aplikace pro šifrování funguje a jaké jsou podporované případy použití.",
-    "Be aware that encryption always increases the file size." : "Mějte na paměti, že šifrování vždy navýší velikost souboru.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Je vždy dobré vytvářet pravidelné zálohy svých dat, v případě zapnutého šifrování také zajistěte zálohu šifrovacích klíčů společně se zálohou dat.",
-    "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
-    "Enable encryption" : "Povolit šifrování",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
-    "Select default encryption module:" : "Vybrat výchozí šifrovací modul:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Povolte prosím \"Default encryption module\" a spusťte příkaz 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou.",
-    "Start migration" : "Spustit migraci",
-    "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
-    "Send mode" : "Mód odesílání",
-    "Encryption" : "Šifrování",
-    "From address" : "Adresa odesílatele",
-    "mail" : "email",
-    "Authentication method" : "Metoda ověření",
-    "Authentication required" : "Vyžadováno ověření",
-    "Server address" : "Adresa serveru",
-    "Port" : "Port",
-    "Credentials" : "Přihlašovací údaje",
-    "SMTP Username" : "SMTP uživatelské jméno ",
-    "SMTP Password" : "SMTP heslo",
-    "Store credentials" : "Ukládat přihlašovací údaje",
-    "Test email settings" : "Test nastavení emailu",
-    "Send email" : "Odeslat email",
-    "What to log" : "Co se má logovat",
-    "Download logfile" : "Stáhnout soubor logu",
-    "More" : "Více",
-    "Less" : "Méně",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!",
+    "Tips & tricks" : "Tipy a triky",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Je použita databáze SQLite. Pro větší instalace doporučujeme přejít na robustnější databázi.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Pro migraci na jinou databázi použijte v příkazovém řádku nástroj: 'occ db:convert-type' nebo nahlédněte do <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentace ↗</a>.",
@@ -227,7 +224,6 @@
     "Improving the config.php" : "Vylepšení souboru config.php",
     "Theming" : "Vzhledy",
     "Hardening and security guidance" : "Průvodce vylepšením bezpečnosti",
-    "Version" : "Verze",
     "Developer documentation" : "Vývojářská dokumentace",
     "Experimental applications ahead" : "Experimentální aplikace v pořadí",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentální aplikace nejsou prověřovány na bezpečnostní chyby, mohou být nestabilní a velmi se měnit. Jejich instalací můžete způsobit ztrátu dat nebo bezpečnostní problémy.",
@@ -283,6 +279,11 @@
     "Change password" : "Změnit heslo",
     "Language" : "Jazyk",
     "Help translate" : "Pomoci s překladem",
+    "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
+    "Desktop client" : "Aplikace pro počítač",
+    "Android app" : "Aplikace pro Android",
+    "iOS app" : "iOS aplikace",
+    "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
     "Web, desktop and mobile clients currently logged in to your account." : "Weboví, desktopoví a mobilní klienti aktuálně přihlášeni k vašemu účtu.",
     "Device" : "Přístroj",
     "Last activity" : "Poslední aktivita",
@@ -294,12 +295,6 @@
     "For security reasons this password will only be shown once." : "Toto heslo bude z bezpečnostních důvodů zobrazeno pouze jedenkrát.",
     "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č",
-    "Android app" : "Aplikace pro Android",
-    "iOS app" : "iOS aplikace",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li projekt podpořit\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">připojte se k vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte informace dál</a>!",
-    "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Vyvíjeno {communityopen}Nextcloud komunitou{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}AGPL{linkclose}.",
     "Follow us on Google Plus!" : "Sledujte nás na Google Plus!",
     "Subscribe to our twitter channel!" : "Odebírejte náš twitter kanál!",
@@ -329,6 +324,10 @@
     "set new password" : "nastavit nové heslo",
     "change email address" : "změnit emailovou adresu",
     "Default" : "Výchozí",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Externí úložiště",
+    "Updates" : "Aktualizace",
     "no group" : "není ve skupině",
     "add group" : "přidat skupinu",
     "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Vaše databáze neběží s úrovní izolace transakcí \"READ COMMITED\". Toto může způsobit problémy při paralelním spouštění více akcí současně.",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 6a184440ef0..97115f875bc 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Your full name has been changed." : "Dein vollständiger Name wurde geändert.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
-    "Sharing" : "Teilen",
-    "Server-side encryption" : "Serverseitige Verschlüsselung",
-    "External Storage" : "Externer Speicher",
-    "Cron" : "Cron",
-    "Email server" : "E-Mail-Server",
-    "Log" : "Log",
-    "Tips & tricks" : "Tipps & Tricks",
-    "Updates" : "Updates",
     "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
     "Language changed" : "Sprache geändert",
     "Invalid request" : "Fehlerhafte Anfrage",
@@ -137,17 +126,55 @@ OC.L10N.register(
     "Sessions" : "Sitzungen",
     "App passwords" : "App-Passwörter",
     "Sync clients" : "Sync-Clients",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
-    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
-    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
-    "Errors and fatal issues" : "Fehler und fatale Probleme",
-    "Fatal issues only" : "Nur fatale Probleme",
     "None" : "Nichts",
     "Login" : "Anmelden",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-Mail-Server",
+    "Open documentation" : "Dokumentation öffnen",
+    "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
+    "Send mode" : "Sendemodus",
+    "Encryption" : "Verschlüsselung",
+    "From address" : "Absenderadresse",
+    "mail" : "E-Mail",
+    "Authentication method" : "Authentifizierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Serveradresse",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "E-Mail-Einstellungen testen",
+    "Send email" : "E-Mail senden",
+    "Server-side encryption" : "Serverseitige Verschlüsselung",
+    "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Please read carefully before activating server-side encryption: " : "Bitte sorgfältig lesen, bevor die serverseitige Verschlüsselung aktiviert wird:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu erstellen. Falls du die Verschlüsselung nutzt, sollte auch eine Sicherung der Kodierungsschlüssel zusammen mit deinen Daten durchgeführt werden.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
+    "Enable encryption" : "Verschlüsselung aktivieren",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Es wurde kein Verschlüsselungs-Modul geladen, bitte ein Verschlüsselungs-Modul im Anwendungs-Menü aktivieren.",
+    "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Die Kodierungsschlüssel der alten Verschlüsselung müssen zur neuen Version migriert werden (ownCloud <= 8.0). Bitte »Default Encryption Module« aktivieren und »occ encryption:migrate« aufrufen.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Kodierungsschlüssel der alten Verschlüsselung migrieren (ownCloud <= 8.0).",
+    "Start migration" : "Migration beginnen",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
+    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
+    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
+    "Errors and fatal issues" : "Fehler und fatale Probleme",
+    "Fatal issues only" : "Nur fatale Probleme",
+    "Log" : "Log",
+    "What to log" : "Was geloggt wird",
+    "Download logfile" : "Logdatei herunterladen",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
+    "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration durchlesen, sowie die PHP-Konfiguration Ihres Servers überprüfen, insbesondere dann, wenn PHP-FPM eingesetzt wird.",
     "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." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
@@ -164,7 +191,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfe noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrolliere das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
     "All checks passed." : "Alle Überprüfungen bestanden.",
-    "Open documentation" : "Dokumentation öffnen",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Version" : "Version",
+    "Sharing" : "Teilen",
     "Allow apps to use the Share API" : "Apps die Benutzung der Share-API erlauben",
     "Allow users to share via link" : "Benutzern erlauben, Inhalte über Links zu teilen",
     "Allow public uploads" : "Öffentliches Hochladen erlauben",
@@ -181,45 +216,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Die Auto-Vervollständigung von Benutzernamen im Teilen-Dialog erlauben. Wenn dies deaktiviert ist, muss der vollständige Benutzername eingegeben werden.",
-    "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
-    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
-    "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "Please read carefully before activating server-side encryption: " : "Bitte sorgfältig lesen, bevor die serverseitige Verschlüsselung aktiviert wird:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
-    "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu erstellen. Falls du die Verschlüsselung nutzt, sollte auch eine Sicherung der Kodierungsschlüssel zusammen mit deinen Daten durchgeführt werden.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
-    "Enable encryption" : "Verschlüsselung aktivieren",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Es wurde kein Verschlüsselungs-Modul geladen, bitte ein Verschlüsselungs-Modul im Anwendungs-Menü aktivieren.",
-    "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Die Kodierungsschlüssel der alten Verschlüsselung müssen zur neuen Version migriert werden (ownCloud <= 8.0). Bitte »Default Encryption Module« aktivieren und »occ encryption:migrate« aufrufen.",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Kodierungsschlüssel der alten Verschlüsselung migrieren (ownCloud <= 8.0).",
-    "Start migration" : "Migration beginnen",
-    "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
-    "Send mode" : "Sendemodus",
-    "Encryption" : "Verschlüsselung",
-    "From address" : "Absenderadresse",
-    "mail" : "E-Mail",
-    "Authentication method" : "Authentifizierungsmethode",
-    "Authentication required" : "Authentifizierung benötigt",
-    "Server address" : "Serveradresse",
-    "Port" : "Port",
-    "Credentials" : "Zugangsdaten",
-    "SMTP Username" : "SMTP Benutzername",
-    "SMTP Password" : "SMTP Passwort",
-    "Store credentials" : "Anmeldeinformationen speichern",
-    "Test email settings" : "E-Mail-Einstellungen testen",
-    "Send email" : "E-Mail senden",
-    "What to log" : "Was geloggt wird",
-    "Download logfile" : "Logdatei herunterladen",
-    "More" : "Mehr",
-    "Less" : "Weniger",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
+    "Tips & tricks" : "Tipps & Tricks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.",
@@ -229,7 +226,6 @@ OC.L10N.register(
     "Improving the config.php" : "Die config.php optimieren",
     "Theming" : "Themes verwenden",
     "Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen",
-    "Version" : "Version",
     "Developer documentation" : "Dokumentation für Entwickler",
     "Experimental applications ahead" : "Experimentelle Apps nachfolgend",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
@@ -285,6 +281,11 @@ OC.L10N.register(
     "Change password" : "Passwort ändern",
     "Language" : "Sprache",
     "Help translate" : "Hilf bei der Übersetzung",
+    "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
+    "Desktop client" : "Desktop-Client",
+    "Android app" : "Android-App",
+    "iOS app" : "iOS-App",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "Web, desktop and mobile clients currently logged in to your account." : "Aktuell in Deinem Konto eingeloggte Web-, Desktop- und Mobil-Clients.",
     "Device" : "Gerät",
     "Last activity" : "Letzte Aktivität",
@@ -296,12 +297,6 @@ OC.L10N.register(
     "For security reasons this password will only be shown once." : "Aus Sicherheitsgründen wird das Passwort nur einmal angezeigt.",
     "Username" : "Benutzername",
     "Done" : "Erledigt",
-    "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
-    "Desktop client" : "Desktop-Client",
-    "Android app" : "Android-App",
-    "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn du das Projekt unterstützen möchtest\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">hilf uns bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehle es weiter</a>!",
-    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Entwickelt von der {communityopen}Nextcloud community{linkclose}, der {githubopen}Quellcode{linkclose} ist lizensiert unter  {licenseopen}AGPL{linkclose}-Lizenz.",
     "Follow us on Google Plus!" : "Folgen Sie uns zu Google Plus!",
     "Like our facebook page!" : "Like uns auf unserer Facebook-Seite!",
@@ -332,6 +327,10 @@ OC.L10N.register(
     "set new password" : "Neues Passwort setzen",
     "change email address" : "E-Mail-Adresse ändern",
     "Default" : "Standard",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Externer Speicher",
+    "Updates" : "Updates",
     "no group" : "Keine Gruppe",
     "add group" : "Gruppe hinzufügen",
     "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Deine Datenbank läuft nicht mit der \"READ COMMITED\" Transaktionsisolationsstufe. Dies kann Probleme hervorrufen, wenn mehrere Aktionen parallel ausgeführt werden.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 71dd372154c..3389bda6008 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -33,17 +33,6 @@
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Your full name has been changed." : "Dein vollständiger Name wurde geändert.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
-    "Sharing" : "Teilen",
-    "Server-side encryption" : "Serverseitige Verschlüsselung",
-    "External Storage" : "Externer Speicher",
-    "Cron" : "Cron",
-    "Email server" : "E-Mail-Server",
-    "Log" : "Log",
-    "Tips & tricks" : "Tipps & Tricks",
-    "Updates" : "Updates",
     "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
     "Language changed" : "Sprache geändert",
     "Invalid request" : "Fehlerhafte Anfrage",
@@ -135,17 +124,55 @@
     "Sessions" : "Sitzungen",
     "App passwords" : "App-Passwörter",
     "Sync clients" : "Sync-Clients",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
-    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
-    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
-    "Errors and fatal issues" : "Fehler und fatale Probleme",
-    "Fatal issues only" : "Nur fatale Probleme",
     "None" : "Nichts",
     "Login" : "Anmelden",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-Mail-Server",
+    "Open documentation" : "Dokumentation öffnen",
+    "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
+    "Send mode" : "Sendemodus",
+    "Encryption" : "Verschlüsselung",
+    "From address" : "Absenderadresse",
+    "mail" : "E-Mail",
+    "Authentication method" : "Authentifizierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Serveradresse",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "E-Mail-Einstellungen testen",
+    "Send email" : "E-Mail senden",
+    "Server-side encryption" : "Serverseitige Verschlüsselung",
+    "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Please read carefully before activating server-side encryption: " : "Bitte sorgfältig lesen, bevor die serverseitige Verschlüsselung aktiviert wird:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu erstellen. Falls du die Verschlüsselung nutzt, sollte auch eine Sicherung der Kodierungsschlüssel zusammen mit deinen Daten durchgeführt werden.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
+    "Enable encryption" : "Verschlüsselung aktivieren",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Es wurde kein Verschlüsselungs-Modul geladen, bitte ein Verschlüsselungs-Modul im Anwendungs-Menü aktivieren.",
+    "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Die Kodierungsschlüssel der alten Verschlüsselung müssen zur neuen Version migriert werden (ownCloud <= 8.0). Bitte »Default Encryption Module« aktivieren und »occ encryption:migrate« aufrufen.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Kodierungsschlüssel der alten Verschlüsselung migrieren (ownCloud <= 8.0).",
+    "Start migration" : "Migration beginnen",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
+    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
+    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
+    "Errors and fatal issues" : "Fehler und fatale Probleme",
+    "Fatal issues only" : "Nur fatale Probleme",
+    "Log" : "Log",
+    "What to log" : "Was geloggt wird",
+    "Download logfile" : "Logdatei herunterladen",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
+    "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration durchlesen, sowie die PHP-Konfiguration Ihres Servers überprüfen, insbesondere dann, wenn PHP-FPM eingesetzt wird.",
     "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." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
@@ -162,7 +189,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfe noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrolliere das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
     "All checks passed." : "Alle Überprüfungen bestanden.",
-    "Open documentation" : "Dokumentation öffnen",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Version" : "Version",
+    "Sharing" : "Teilen",
     "Allow apps to use the Share API" : "Apps die Benutzung der Share-API erlauben",
     "Allow users to share via link" : "Benutzern erlauben, Inhalte über Links zu teilen",
     "Allow public uploads" : "Öffentliches Hochladen erlauben",
@@ -179,45 +214,7 @@
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Die Auto-Vervollständigung von Benutzernamen im Teilen-Dialog erlauben. Wenn dies deaktiviert ist, muss der vollständige Benutzername eingegeben werden.",
-    "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
-    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
-    "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "Please read carefully before activating server-side encryption: " : "Bitte sorgfältig lesen, bevor die serverseitige Verschlüsselung aktiviert wird:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
-    "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu erstellen. Falls du die Verschlüsselung nutzt, sollte auch eine Sicherung der Kodierungsschlüssel zusammen mit deinen Daten durchgeführt werden.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
-    "Enable encryption" : "Verschlüsselung aktivieren",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Es wurde kein Verschlüsselungs-Modul geladen, bitte ein Verschlüsselungs-Modul im Anwendungs-Menü aktivieren.",
-    "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Die Kodierungsschlüssel der alten Verschlüsselung müssen zur neuen Version migriert werden (ownCloud <= 8.0). Bitte »Default Encryption Module« aktivieren und »occ encryption:migrate« aufrufen.",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Kodierungsschlüssel der alten Verschlüsselung migrieren (ownCloud <= 8.0).",
-    "Start migration" : "Migration beginnen",
-    "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
-    "Send mode" : "Sendemodus",
-    "Encryption" : "Verschlüsselung",
-    "From address" : "Absenderadresse",
-    "mail" : "E-Mail",
-    "Authentication method" : "Authentifizierungsmethode",
-    "Authentication required" : "Authentifizierung benötigt",
-    "Server address" : "Serveradresse",
-    "Port" : "Port",
-    "Credentials" : "Zugangsdaten",
-    "SMTP Username" : "SMTP Benutzername",
-    "SMTP Password" : "SMTP Passwort",
-    "Store credentials" : "Anmeldeinformationen speichern",
-    "Test email settings" : "E-Mail-Einstellungen testen",
-    "Send email" : "E-Mail senden",
-    "What to log" : "Was geloggt wird",
-    "Download logfile" : "Logdatei herunterladen",
-    "More" : "Mehr",
-    "Less" : "Weniger",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
+    "Tips & tricks" : "Tipps & Tricks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.",
@@ -227,7 +224,6 @@
     "Improving the config.php" : "Die config.php optimieren",
     "Theming" : "Themes verwenden",
     "Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen",
-    "Version" : "Version",
     "Developer documentation" : "Dokumentation für Entwickler",
     "Experimental applications ahead" : "Experimentelle Apps nachfolgend",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
@@ -283,6 +279,11 @@
     "Change password" : "Passwort ändern",
     "Language" : "Sprache",
     "Help translate" : "Hilf bei der Übersetzung",
+    "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
+    "Desktop client" : "Desktop-Client",
+    "Android app" : "Android-App",
+    "iOS app" : "iOS-App",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "Web, desktop and mobile clients currently logged in to your account." : "Aktuell in Deinem Konto eingeloggte Web-, Desktop- und Mobil-Clients.",
     "Device" : "Gerät",
     "Last activity" : "Letzte Aktivität",
@@ -294,12 +295,6 @@
     "For security reasons this password will only be shown once." : "Aus Sicherheitsgründen wird das Passwort nur einmal angezeigt.",
     "Username" : "Benutzername",
     "Done" : "Erledigt",
-    "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
-    "Desktop client" : "Desktop-Client",
-    "Android app" : "Android-App",
-    "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn du das Projekt unterstützen möchtest\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">hilf uns bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehle es weiter</a>!",
-    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Entwickelt von der {communityopen}Nextcloud community{linkclose}, der {githubopen}Quellcode{linkclose} ist lizensiert unter  {licenseopen}AGPL{linkclose}-Lizenz.",
     "Follow us on Google Plus!" : "Folgen Sie uns zu Google Plus!",
     "Like our facebook page!" : "Like uns auf unserer Facebook-Seite!",
@@ -330,6 +325,10 @@
     "set new password" : "Neues Passwort setzen",
     "change email address" : "E-Mail-Adresse ändern",
     "Default" : "Standard",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Externer Speicher",
+    "Updates" : "Updates",
     "no group" : "Keine Gruppe",
     "add group" : "Gruppe hinzufügen",
     "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Deine Datenbank läuft nicht mit der \"READ COMMITED\" Transaktionsisolationsstufe. Dies kann Probleme hervorrufen, wenn mehrere Aktionen parallel ausgeführt werden.",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index b13250a181d..304805aba6d 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
-    "Sharing" : "Teilen",
-    "Server-side encryption" : "Serverseitige Verschlüsselung",
-    "External Storage" : "Externer Speicher",
-    "Cron" : "Cron",
-    "Email server" : "E-Mail-Server",
-    "Log" : "Log",
-    "Tips & tricks" : "Tipps & Tricks",
-    "Updates" : "Updates",
     "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
     "Language changed" : "Sprache geändert",
     "Invalid request" : "Ungültige Anforderung",
@@ -137,17 +126,55 @@ OC.L10N.register(
     "Sessions" : "Sitzungen",
     "App passwords" : "App-Passwörter",
     "Sync clients" : "Sync-Clients",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
-    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
-    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
-    "Errors and fatal issues" : "Fehler und fatale Probleme",
-    "Fatal issues only" : "Nur kritische Fehler",
     "None" : "Keine",
     "Login" : "Anmelden",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-Mail-Server",
+    "Open documentation" : "Dokumentation öffnen",
+    "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
+    "Send mode" : "Sendemodus",
+    "Encryption" : "Verschlüsselung",
+    "From address" : "Absenderadresse",
+    "mail" : "Mail",
+    "Authentication method" : "Authentifizierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Serveradresse",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP-Benutzername",
+    "SMTP Password" : "SMTP-Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "E-Mail-Einstellungen testen",
+    "Send email" : "E-Mail senden",
+    "Server-side encryption" : "Serverseitige Verschlüsselung",
+    "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die serverseitige Verschlüsselung aktivieren:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lese in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "Be aware that encryption always increases the file size." : "Bedenken Sie, dass durch die Verschlüsselung die Dateigröße zunimmt. ",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von ihren Daten zu machen. Falls Sie die Verschlüsselung nutzen, sollten Sie auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit ihren Daten machen.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?",
+    "Enable encryption" : "Verschlüsselung aktivieren",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
+    "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren. Bitte aktivieren Sie das \"Default Encryption Module\" und rufen Sie 'occ encryption:migrate' auf.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren.",
+    "Start migration" : "Migration beginnen",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
+    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
+    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
+    "Errors and fatal issues" : "Fehler und fatale Probleme",
+    "Fatal issues only" : "Nur kritische Fehler",
+    "Log" : "Log",
+    "What to log" : "Was geloggt wird",
+    "Download logfile" : "Logdatei herunterladen",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
+    "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schauen Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzten.",
     "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." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
@@ -164,7 +191,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfen Sie noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrollieren Sie das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
     "All checks passed." : "Alle Checks bestanden.",
-    "Open documentation" : "Dokumentation öffnen",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Version" : "Version",
+    "Sharing" : "Teilen",
     "Allow apps to use the Share API" : "Apps die Benutzung der Share-API erlauben",
     "Allow users to share via link" : "Benutzern erlauben, Inhalte über Links zu teilen",
     "Allow public uploads" : "Öffentliches Hochladen erlauben",
@@ -181,45 +216,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Die Auto-Vervollständigung von Benutzernamen im Teilen-Dialog erlauben. Wenn dies deaktiviert ist, muss der vollständige Benutzername eingegeben werden.",
-    "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
-    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
-    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die serverseitige Verschlüsselung aktivieren:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lese in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
-    "Be aware that encryption always increases the file size." : "Bedenke das durch die Verschlüsselung die Dateigröße zunimmt. ",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von ihren Daten zu machen. Falls Sie die Verschlüsselung nutzen, sollten Sie auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit ihren Daten machen.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?",
-    "Enable encryption" : "Verschlüsselung aktivieren",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
-    "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren. Bitte aktivieren Sie das \"Default Encryption Module\" und rufen Sie 'occ encryption:migrate' auf.",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren.",
-    "Start migration" : "Migration beginnen",
-    "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
-    "Send mode" : "Sendemodus",
-    "Encryption" : "Verschlüsselung",
-    "From address" : "Absenderadresse",
-    "mail" : "Mail",
-    "Authentication method" : "Authentifizierungsmethode",
-    "Authentication required" : "Authentifizierung benötigt",
-    "Server address" : "Serveradresse",
-    "Port" : "Port",
-    "Credentials" : "Zugangsdaten",
-    "SMTP Username" : "SMTP-Benutzername",
-    "SMTP Password" : "SMTP-Passwort",
-    "Store credentials" : "Anmeldeinformationen speichern",
-    "Test email settings" : "E-Mail-Einstellungen testen",
-    "Send email" : "E-Mail senden",
-    "What to log" : "Was geloggt wird",
-    "Download logfile" : "Logdatei herunterladen",
-    "More" : "Mehr",
-    "Less" : "Weniger",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
+    "Tips & tricks" : "Tipps & Tricks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.",
@@ -229,7 +226,6 @@ OC.L10N.register(
     "Improving the config.php" : "Die config.php optimieren",
     "Theming" : "Themes verwenden",
     "Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen",
-    "Version" : "Version",
     "Developer documentation" : "Dokumentation für Entwickler",
     "Experimental applications ahead" : "Experimentelle Apps nachfolgend",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
@@ -285,6 +281,11 @@ OC.L10N.register(
     "Change password" : "Passwort ändern",
     "Language" : "Sprache",
     "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+    "Desktop client" : "Desktop-Client",
+    "Android app" : "Android-App",
+    "iOS app" : "iOS-App",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "Web, desktop and mobile clients currently logged in to your account." : "Aktuell in Ihrem Konto eingeloggte Web-, Desktop- und Mobil-Clients.",
     "Device" : "Gerät",
     "Last activity" : "Letzte Aktivität",
@@ -296,12 +297,6 @@ OC.L10N.register(
     "For security reasons this password will only be shown once." : "Aus Sicherheitsgründen wird das Passwort nur einmal angezeigt.",
     "Username" : "Benutzername",
     "Done" : "Erledigt",
-    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
-    "Desktop client" : "Desktop-Client",
-    "Android app" : "Android-App",
-    "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">helfen Sie bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehlen Sie es weiter</a>!",
-    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Entwickelt von der {communityopen}Nextcloud community{linkclose}, der {githubopen}Quellcode{linkclose} ist lizensiert unter  {licenseopen}AGPL{linkclose}-Lizenz.",
     "Follow us on Google Plus!" : "Folgen Sie uns zu Google Plus!",
     "Like our facebook page!" : "Liken Sie uns auf unserer Facebook-Seite!",
@@ -332,6 +327,10 @@ OC.L10N.register(
     "set new password" : "Neues Passwort setzen",
     "change email address" : "E-Mail-Adresse ändern",
     "Default" : "Standard",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Externer Speicher",
+    "Updates" : "Updates",
     "no group" : "Keine Gruppe",
     "add group" : "Gruppe hinzufügen",
     "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "ihre Datenbank läuft nicht mit der \"READ COMMITED\" Transaktionsisolationsstufe. Dies kann Probleme hervorrufen, wenn mehrere Aktionen parallel ausgeführt werden.",
@@ -342,7 +341,7 @@ OC.L10N.register(
     "Storage Location" : "Speicherort",
     "User Backend" : "Benutzer-Backend",
     "Last Login" : "Letzte Anmeldung",
-    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Nextcloud-Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
     "No apps found for \"{query}\"" : "Keine Applikationen für \"{query}\" gefunden",
     "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schauen Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzen.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index ff09a7f1976..f7c8fa4f26b 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -33,17 +33,6 @@
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
-    "Sharing" : "Teilen",
-    "Server-side encryption" : "Serverseitige Verschlüsselung",
-    "External Storage" : "Externer Speicher",
-    "Cron" : "Cron",
-    "Email server" : "E-Mail-Server",
-    "Log" : "Log",
-    "Tips & tricks" : "Tipps & Tricks",
-    "Updates" : "Updates",
     "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
     "Language changed" : "Sprache geändert",
     "Invalid request" : "Ungültige Anforderung",
@@ -135,17 +124,55 @@
     "Sessions" : "Sitzungen",
     "App passwords" : "App-Passwörter",
     "Sync clients" : "Sync-Clients",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
-    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
-    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
-    "Errors and fatal issues" : "Fehler und fatale Probleme",
-    "Fatal issues only" : "Nur kritische Fehler",
     "None" : "Keine",
     "Login" : "Anmelden",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-Mail-Server",
+    "Open documentation" : "Dokumentation öffnen",
+    "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
+    "Send mode" : "Sendemodus",
+    "Encryption" : "Verschlüsselung",
+    "From address" : "Absenderadresse",
+    "mail" : "Mail",
+    "Authentication method" : "Authentifizierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Serveradresse",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP-Benutzername",
+    "SMTP Password" : "SMTP-Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "E-Mail-Einstellungen testen",
+    "Send email" : "E-Mail senden",
+    "Server-side encryption" : "Serverseitige Verschlüsselung",
+    "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die serverseitige Verschlüsselung aktivieren:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lese in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "Be aware that encryption always increases the file size." : "Bedenken Sie, dass durch die Verschlüsselung die Dateigröße zunimmt. ",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von ihren Daten zu machen. Falls Sie die Verschlüsselung nutzen, sollten Sie auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit ihren Daten machen.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?",
+    "Enable encryption" : "Verschlüsselung aktivieren",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
+    "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren. Bitte aktivieren Sie das \"Default Encryption Module\" und rufen Sie 'occ encryption:migrate' auf.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren.",
+    "Start migration" : "Migration beginnen",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
+    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
+    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
+    "Errors and fatal issues" : "Fehler und fatale Probleme",
+    "Fatal issues only" : "Nur kritische Fehler",
+    "Log" : "Log",
+    "What to log" : "Was geloggt wird",
+    "Download logfile" : "Logdatei herunterladen",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
+    "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schauen Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzten.",
     "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." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
@@ -162,7 +189,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfen Sie noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrollieren Sie das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
     "All checks passed." : "Alle Checks bestanden.",
-    "Open documentation" : "Dokumentation öffnen",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Version" : "Version",
+    "Sharing" : "Teilen",
     "Allow apps to use the Share API" : "Apps die Benutzung der Share-API erlauben",
     "Allow users to share via link" : "Benutzern erlauben, Inhalte über Links zu teilen",
     "Allow public uploads" : "Öffentliches Hochladen erlauben",
@@ -179,45 +214,7 @@
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Die Auto-Vervollständigung von Benutzernamen im Teilen-Dialog erlauben. Wenn dies deaktiviert ist, muss der vollständige Benutzername eingegeben werden.",
-    "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
-    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
-    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die serverseitige Verschlüsselung aktivieren:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lese in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
-    "Be aware that encryption always increases the file size." : "Bedenke das durch die Verschlüsselung die Dateigröße zunimmt. ",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von ihren Daten zu machen. Falls Sie die Verschlüsselung nutzen, sollten Sie auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit ihren Daten machen.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?",
-    "Enable encryption" : "Verschlüsselung aktivieren",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
-    "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren. Bitte aktivieren Sie das \"Default Encryption Module\" und rufen Sie 'occ encryption:migrate' auf.",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren.",
-    "Start migration" : "Migration beginnen",
-    "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
-    "Send mode" : "Sendemodus",
-    "Encryption" : "Verschlüsselung",
-    "From address" : "Absenderadresse",
-    "mail" : "Mail",
-    "Authentication method" : "Authentifizierungsmethode",
-    "Authentication required" : "Authentifizierung benötigt",
-    "Server address" : "Serveradresse",
-    "Port" : "Port",
-    "Credentials" : "Zugangsdaten",
-    "SMTP Username" : "SMTP-Benutzername",
-    "SMTP Password" : "SMTP-Passwort",
-    "Store credentials" : "Anmeldeinformationen speichern",
-    "Test email settings" : "E-Mail-Einstellungen testen",
-    "Send email" : "E-Mail senden",
-    "What to log" : "Was geloggt wird",
-    "Download logfile" : "Logdatei herunterladen",
-    "More" : "Mehr",
-    "Less" : "Weniger",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
+    "Tips & tricks" : "Tipps & Tricks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.",
@@ -227,7 +224,6 @@
     "Improving the config.php" : "Die config.php optimieren",
     "Theming" : "Themes verwenden",
     "Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen",
-    "Version" : "Version",
     "Developer documentation" : "Dokumentation für Entwickler",
     "Experimental applications ahead" : "Experimentelle Apps nachfolgend",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
@@ -283,6 +279,11 @@
     "Change password" : "Passwort ändern",
     "Language" : "Sprache",
     "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+    "Desktop client" : "Desktop-Client",
+    "Android app" : "Android-App",
+    "iOS app" : "iOS-App",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "Web, desktop and mobile clients currently logged in to your account." : "Aktuell in Ihrem Konto eingeloggte Web-, Desktop- und Mobil-Clients.",
     "Device" : "Gerät",
     "Last activity" : "Letzte Aktivität",
@@ -294,12 +295,6 @@
     "For security reasons this password will only be shown once." : "Aus Sicherheitsgründen wird das Passwort nur einmal angezeigt.",
     "Username" : "Benutzername",
     "Done" : "Erledigt",
-    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
-    "Desktop client" : "Desktop-Client",
-    "Android app" : "Android-App",
-    "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">helfen Sie bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehlen Sie es weiter</a>!",
-    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Entwickelt von der {communityopen}Nextcloud community{linkclose}, der {githubopen}Quellcode{linkclose} ist lizensiert unter  {licenseopen}AGPL{linkclose}-Lizenz.",
     "Follow us on Google Plus!" : "Folgen Sie uns zu Google Plus!",
     "Like our facebook page!" : "Liken Sie uns auf unserer Facebook-Seite!",
@@ -330,6 +325,10 @@
     "set new password" : "Neues Passwort setzen",
     "change email address" : "E-Mail-Adresse ändern",
     "Default" : "Standard",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Externer Speicher",
+    "Updates" : "Updates",
     "no group" : "Keine Gruppe",
     "add group" : "Gruppe hinzufügen",
     "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "ihre Datenbank läuft nicht mit der \"READ COMMITED\" Transaktionsisolationsstufe. Dies kann Probleme hervorrufen, wenn mehrere Aktionen parallel ausgeführt werden.",
@@ -340,7 +339,7 @@
     "Storage Location" : "Speicherort",
     "User Backend" : "Benutzer-Backend",
     "Last Login" : "Letzte Anmeldung",
-    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Nextcloud-Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
     "No apps found for \"{query}\"" : "Keine Applikationen für \"{query}\" gefunden",
     "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schauen Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzen.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index a5d06cd12a2..087043bd47e 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "Email saved",
     "Your full name has been changed." : "Your full name has been changed.",
     "Unable to change full name" : "Unable to change full name",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Security & setup warnings",
-    "Sharing" : "Sharing",
-    "Server-side encryption" : "Server-side encryption",
-    "External Storage" : "External Storage",
-    "Cron" : "Cron",
-    "Email server" : "Email server",
-    "Log" : "Log",
-    "Tips & tricks" : "Tips & tricks",
-    "Updates" : "Updates",
     "Couldn't remove app." : "Couldn't remove app.",
     "Language changed" : "Language changed",
     "Invalid request" : "Invalid request",
@@ -120,17 +109,55 @@ OC.L10N.register(
     "Sessions" : "Sessions",
     "App passwords" : "App passwords",
     "Sync clients" : "Sync clients",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
-    "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
-    "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues",
-    "Errors and fatal issues" : "Errors and fatal issues",
-    "Fatal issues only" : "Fatal issues only",
     "None" : "None",
     "Login" : "Login",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Email server",
+    "Open documentation" : "Open documentation",
+    "This is used for sending out notifications." : "This is used for sending out notifications.",
+    "Send mode" : "Send mode",
+    "Encryption" : "Encryption",
+    "From address" : "From address",
+    "mail" : "mail",
+    "Authentication method" : "Authentication method",
+    "Authentication required" : "Authentication required",
+    "Server address" : "Server address",
+    "Port" : "Port",
+    "Credentials" : "Credentials",
+    "SMTP Username" : "SMTP Username",
+    "SMTP Password" : "SMTP Password",
+    "Store credentials" : "Store credentials",
+    "Test email settings" : "Test email settings",
+    "Send email" : "Send email",
+    "Server-side encryption" : "Server-side encryption",
+    "Enable server-side encryption" : "Enable server-side encryption",
+    "Please read carefully before activating server-side encryption: " : "Please read carefully before activating server-side encryption: ",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encryption alone does not guarantee complete security. Please read the documentation for information on how the encryption app works, and supported use cases.",
+    "Be aware that encryption always increases the file size." : "Be aware that encryption always increases the file size.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data.",
+    "This is the final warning: Do you really want to enable encryption?" : "This is the final warning: Do you really want to enable encryption?",
+    "Enable encryption" : "Enable encryption",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "No encryption module loaded, please enable an encryption module in the app menu.",
+    "Select default encryption module:" : "Select default encryption module:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.",
+    "Start migration" : "Start migration",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
+    "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues",
+    "Errors and fatal issues" : "Errors and fatal issues",
+    "Fatal issues only" : "Fatal issues only",
+    "Log" : "Log",
+    "What to log" : "What to log",
+    "Download logfile" : "Download logfile",
+    "More" : "More",
+    "Less" : "Less",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "The logfile is larger than 100 MB. Downloading it may take some time!",
+    "Security & setup warnings" : "Security & setup warnings",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.",
     "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." : "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.",
@@ -146,7 +173,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>.",
     "All checks passed." : "All checks passed.",
-    "Open documentation" : "Open documentation",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Last cron job execution: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Last cron job execution: %s. Something seems wrong.",
+    "Cron was not executed yet!" : "Cron was not executed yet!",
+    "Execute one task with each page loaded" : "Execute one task with each page loaded",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
+    "Version" : "Version",
+    "Sharing" : "Sharing",
     "Allow apps to use the Share API" : "Allow apps to use the Share API",
     "Allow users to share via link" : "Allow users to share via link",
     "Allow public uploads" : "Allow public uploads",
@@ -163,45 +198,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Exclude groups from sharing",
     "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered.",
-    "Last cron job execution: %s." : "Last cron job execution: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Last cron job execution: %s. Something seems wrong.",
-    "Cron was not executed yet!" : "Cron was not executed yet!",
-    "Execute one task with each page loaded" : "Execute one task with each page loaded",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
-    "Enable server-side encryption" : "Enable server-side encryption",
-    "Please read carefully before activating server-side encryption: " : "Please read carefully before activating server-side encryption: ",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encryption alone does not guarantee complete security. Please read the documentation for information on how the encryption app works, and supported use cases.",
-    "Be aware that encryption always increases the file size." : "Be aware that encryption always increases the file size.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data.",
-    "This is the final warning: Do you really want to enable encryption?" : "This is the final warning: Do you really want to enable encryption?",
-    "Enable encryption" : "Enable encryption",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "No encryption module loaded, please enable an encryption module in the app menu.",
-    "Select default encryption module:" : "Select default encryption module:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.",
-    "Start migration" : "Start migration",
-    "This is used for sending out notifications." : "This is used for sending out notifications.",
-    "Send mode" : "Send mode",
-    "Encryption" : "Encryption",
-    "From address" : "From address",
-    "mail" : "mail",
-    "Authentication method" : "Authentication method",
-    "Authentication required" : "Authentication required",
-    "Server address" : "Server address",
-    "Port" : "Port",
-    "Credentials" : "Credentials",
-    "SMTP Username" : "SMTP Username",
-    "SMTP Password" : "SMTP Password",
-    "Store credentials" : "Store credentials",
-    "Test email settings" : "Test email settings",
-    "Send email" : "Send email",
-    "What to log" : "What to log",
-    "Download logfile" : "Download logfile",
-    "More" : "More",
-    "Less" : "Less",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "The logfile is larger than 100 MB. Downloading it may take some time!",
+    "Tips & tricks" : "Tips & tricks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite is used as database. For larger installations, we recommend you switch to a different database backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especially when using the desktop client for file syncing, the use of SQLite is discouraged.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>.",
@@ -211,7 +208,6 @@ OC.L10N.register(
     "Improving the config.php" : "Improving the config.php",
     "Theming" : "Theming",
     "Hardening and security guidance" : "Hardening and security guidance",
-    "Version" : "Version",
     "Developer documentation" : "Developer documentation",
     "Experimental applications ahead" : "Experimental applications ahead",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches.",
@@ -267,18 +263,17 @@ OC.L10N.register(
     "Change password" : "Change password",
     "Language" : "Language",
     "Help translate" : "Help translate",
+    "Get the apps to sync your files" : "Get the apps to sync your files",
+    "Desktop client" : "Desktop client",
+    "Android app" : "Android app",
+    "iOS app" : "iOS app",
+    "Show First Run Wizard again" : "Show First Run Wizard again",
     "Name" : "Name",
     "App name" : "App name",
     "Create new app password" : "Create new app password",
     "Use the credentials below to configure your app or device." : "Use the credentials below to configure your app or device.",
     "Username" : "Username",
     "Done" : "Done",
-    "Get the apps to sync your files" : "Get the apps to sync your files",
-    "Desktop client" : "Desktop client",
-    "Android app" : "Android app",
-    "iOS app" : "iOS app",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "To support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!",
-    "Show First Run Wizard again" : "Show First Run Wizard again",
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
     "Show user backend" : "Show user backend",
@@ -297,6 +292,10 @@ OC.L10N.register(
     "change full name" : "change full name",
     "set new password" : "set new password",
     "change email address" : "change email address",
-    "Default" : "Default"
+    "Default" : "Default",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "External Storage",
+    "Updates" : "Updates"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 083441b2a4d..934d11cef92 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -33,17 +33,6 @@
     "Email saved" : "Email saved",
     "Your full name has been changed." : "Your full name has been changed.",
     "Unable to change full name" : "Unable to change full name",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Security & setup warnings",
-    "Sharing" : "Sharing",
-    "Server-side encryption" : "Server-side encryption",
-    "External Storage" : "External Storage",
-    "Cron" : "Cron",
-    "Email server" : "Email server",
-    "Log" : "Log",
-    "Tips & tricks" : "Tips & tricks",
-    "Updates" : "Updates",
     "Couldn't remove app." : "Couldn't remove app.",
     "Language changed" : "Language changed",
     "Invalid request" : "Invalid request",
@@ -118,17 +107,55 @@
     "Sessions" : "Sessions",
     "App passwords" : "App passwords",
     "Sync clients" : "Sync clients",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
-    "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
-    "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues",
-    "Errors and fatal issues" : "Errors and fatal issues",
-    "Fatal issues only" : "Fatal issues only",
     "None" : "None",
     "Login" : "Login",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Email server",
+    "Open documentation" : "Open documentation",
+    "This is used for sending out notifications." : "This is used for sending out notifications.",
+    "Send mode" : "Send mode",
+    "Encryption" : "Encryption",
+    "From address" : "From address",
+    "mail" : "mail",
+    "Authentication method" : "Authentication method",
+    "Authentication required" : "Authentication required",
+    "Server address" : "Server address",
+    "Port" : "Port",
+    "Credentials" : "Credentials",
+    "SMTP Username" : "SMTP Username",
+    "SMTP Password" : "SMTP Password",
+    "Store credentials" : "Store credentials",
+    "Test email settings" : "Test email settings",
+    "Send email" : "Send email",
+    "Server-side encryption" : "Server-side encryption",
+    "Enable server-side encryption" : "Enable server-side encryption",
+    "Please read carefully before activating server-side encryption: " : "Please read carefully before activating server-side encryption: ",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encryption alone does not guarantee complete security. Please read the documentation for information on how the encryption app works, and supported use cases.",
+    "Be aware that encryption always increases the file size." : "Be aware that encryption always increases the file size.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data.",
+    "This is the final warning: Do you really want to enable encryption?" : "This is the final warning: Do you really want to enable encryption?",
+    "Enable encryption" : "Enable encryption",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "No encryption module loaded, please enable an encryption module in the app menu.",
+    "Select default encryption module:" : "Select default encryption module:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.",
+    "Start migration" : "Start migration",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
+    "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues",
+    "Errors and fatal issues" : "Errors and fatal issues",
+    "Fatal issues only" : "Fatal issues only",
+    "Log" : "Log",
+    "What to log" : "What to log",
+    "Download logfile" : "Download logfile",
+    "More" : "More",
+    "Less" : "Less",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "The logfile is larger than 100 MB. Downloading it may take some time!",
+    "Security & setup warnings" : "Security & setup warnings",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.",
     "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." : "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.",
@@ -144,7 +171,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>.",
     "All checks passed." : "All checks passed.",
-    "Open documentation" : "Open documentation",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Last cron job execution: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Last cron job execution: %s. Something seems wrong.",
+    "Cron was not executed yet!" : "Cron was not executed yet!",
+    "Execute one task with each page loaded" : "Execute one task with each page loaded",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
+    "Version" : "Version",
+    "Sharing" : "Sharing",
     "Allow apps to use the Share API" : "Allow apps to use the Share API",
     "Allow users to share via link" : "Allow users to share via link",
     "Allow public uploads" : "Allow public uploads",
@@ -161,45 +196,7 @@
     "Exclude groups from sharing" : "Exclude groups from sharing",
     "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered.",
-    "Last cron job execution: %s." : "Last cron job execution: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Last cron job execution: %s. Something seems wrong.",
-    "Cron was not executed yet!" : "Cron was not executed yet!",
-    "Execute one task with each page loaded" : "Execute one task with each page loaded",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
-    "Enable server-side encryption" : "Enable server-side encryption",
-    "Please read carefully before activating server-side encryption: " : "Please read carefully before activating server-side encryption: ",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encryption alone does not guarantee complete security. Please read the documentation for information on how the encryption app works, and supported use cases.",
-    "Be aware that encryption always increases the file size." : "Be aware that encryption always increases the file size.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data.",
-    "This is the final warning: Do you really want to enable encryption?" : "This is the final warning: Do you really want to enable encryption?",
-    "Enable encryption" : "Enable encryption",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "No encryption module loaded, please enable an encryption module in the app menu.",
-    "Select default encryption module:" : "Select default encryption module:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.",
-    "Start migration" : "Start migration",
-    "This is used for sending out notifications." : "This is used for sending out notifications.",
-    "Send mode" : "Send mode",
-    "Encryption" : "Encryption",
-    "From address" : "From address",
-    "mail" : "mail",
-    "Authentication method" : "Authentication method",
-    "Authentication required" : "Authentication required",
-    "Server address" : "Server address",
-    "Port" : "Port",
-    "Credentials" : "Credentials",
-    "SMTP Username" : "SMTP Username",
-    "SMTP Password" : "SMTP Password",
-    "Store credentials" : "Store credentials",
-    "Test email settings" : "Test email settings",
-    "Send email" : "Send email",
-    "What to log" : "What to log",
-    "Download logfile" : "Download logfile",
-    "More" : "More",
-    "Less" : "Less",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "The logfile is larger than 100 MB. Downloading it may take some time!",
+    "Tips & tricks" : "Tips & tricks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite is used as database. For larger installations, we recommend you switch to a different database backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especially when using the desktop client for file syncing, the use of SQLite is discouraged.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>.",
@@ -209,7 +206,6 @@
     "Improving the config.php" : "Improving the config.php",
     "Theming" : "Theming",
     "Hardening and security guidance" : "Hardening and security guidance",
-    "Version" : "Version",
     "Developer documentation" : "Developer documentation",
     "Experimental applications ahead" : "Experimental applications ahead",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches.",
@@ -265,18 +261,17 @@
     "Change password" : "Change password",
     "Language" : "Language",
     "Help translate" : "Help translate",
+    "Get the apps to sync your files" : "Get the apps to sync your files",
+    "Desktop client" : "Desktop client",
+    "Android app" : "Android app",
+    "iOS app" : "iOS app",
+    "Show First Run Wizard again" : "Show First Run Wizard again",
     "Name" : "Name",
     "App name" : "App name",
     "Create new app password" : "Create new app password",
     "Use the credentials below to configure your app or device." : "Use the credentials below to configure your app or device.",
     "Username" : "Username",
     "Done" : "Done",
-    "Get the apps to sync your files" : "Get the apps to sync your files",
-    "Desktop client" : "Desktop client",
-    "Android app" : "Android app",
-    "iOS app" : "iOS app",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "To support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!",
-    "Show First Run Wizard again" : "Show First Run Wizard again",
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
     "Show user backend" : "Show user backend",
@@ -295,6 +290,10 @@
     "change full name" : "change full name",
     "set new password" : "set new password",
     "change email address" : "change email address",
-    "Default" : "Default"
+    "Default" : "Default",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "External Storage",
+    "Updates" : "Updates"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index e25e9ac8877..83f137babdf 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "Correo electrónico guardado",
     "Your full name has been changed." : "Se ha cambiado su nombre completo.",
     "Unable to change full name" : "No se puede cambiar el nombre completo",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Avisos de seguridad y configuración",
-    "Sharing" : "Compartiendo",
-    "Server-side encryption" : "Cifrado en el servidor",
-    "External Storage" : "Almacenamiento externo",
-    "Cron" : "Cron",
-    "Email server" : "Servidor de correo electrónico",
-    "Log" : "Registro",
-    "Tips & tricks" : "Sugerencias y trucos",
-    "Updates" : "Actualizaciones",
     "Couldn't remove app." : "No se pudo eliminar la aplicación.",
     "Language changed" : "Idioma cambiado",
     "Invalid request" : "Petición no válida",
@@ -133,17 +122,55 @@ OC.L10N.register(
     "Sessions" : "Sesiones",
     "App passwords" : "Contraseñas de la app",
     "Sync clients" : "Clientes de sincronización",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
-    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
-    "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
-    "Errors and fatal issues" : "Errores y problemas fatales",
-    "Fatal issues only" : "Problemas fatales solamente",
     "None" : "Ninguno",
     "Login" : "Iniciar sesión",
     "Plain" : "Plano",
     "NT LAN Manager" : "Gestor de NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Servidor de correo electrónico",
+    "Open documentation" : "Abrir Documentación",
+    "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
+    "Send mode" : "Modo de envío",
+    "Encryption" : "Cifrado",
+    "From address" : "Desde la dirección",
+    "mail" : "correo electrónico",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Se necesita autenticación",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nombre de usuario SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Store credentials" : "Almacenar credenciales",
+    "Test email settings" : "Probar configuración de correo electrónico",
+    "Send email" : "Enviar mensaje",
+    "Server-side encryption" : "Cifrado en el servidor",
+    "Enable server-side encryption" : "Habilitar cifrado en el servidor",
+    "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Una vez que el cifrado está habilitado, todos los archivos subidos al servidor desde ese punto en adelante se cifrarán en reposo en el servidor. Sólo será posible desactivar el cifrado en una fecha posterior si el módulo de cifrado activado soporta esa función, y todas las condiciones previas (por ejemplo, el establecimiento de una clave de recuperación) se cumplan.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "El cifrado no garantiza por sí solo la seguridad del sistema. Por favor, vea la documentación para más información sobre cómo funciona la app de cifrado y los casos de uso soportados.",
+    "Be aware that encryption always increases the file size." : "Tenga presente que la encripción siempre incrementa el tamaño del archivo.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es siempre bueno crear copias de seguridad de sus datos, en el caso del cifrado, asegúrese de tener una copia de seguridad de las claves de cifrado junto con sus datos.",
+    "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
+    "Enable encryption" : "Habilitar cifrado",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
+    "Select default encryption module:" : "Seleccione el módulo de cifrado por defecto:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Necesita migrar sus claves de cifrado provenientes del antiguo sistema (ownCloud <= 8.0) al nuevo. Por favor habilite el \"Módulo de cifrado por defecto\" y ejecute 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Se necesita migrar las claves de cifrado del antiguo sistema (ownCloud <= 8.0) al nuevo sistema.",
+    "Start migration" : "Iniciar migración",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
+    "Errors and fatal issues" : "Errores y problemas fatales",
+    "Fatal issues only" : "Problemas fatales solamente",
+    "Log" : "Registro",
+    "What to log" : "Que registrar",
+    "Download logfile" : "Descargar archivo de registro",
+    "More" : "Más",
+    "Less" : "Menos",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.",
+    "Security & setup warnings" : "Avisos de seguridad y configuración",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor revisa la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación de instalación ↗</a> para notas de configuración PHP y la configuración PHP de tu servidor, especialmente cuando se está usando php-fpm",
     "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." : "Se ha habilitado la configuración de sólo lectura. Esto evita tener que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
@@ -160,7 +187,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, compruebe de nuevo las <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guías de instalación ↗</a>, y comprueba por cualquier error o advertencia en el  <a href=\"#log-section\">Registro</a>",
     "All checks passed." : "Ha pasado todos los controles",
-    "Open documentation" : "Abrir Documentación",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Cron se ejecutó por última vez: %s",
+    "Last cron job execution: %s. Something seems wrong." : "Cron se ejecutó por última vez: %s. Algo va mal.",
+    "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
+    "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
+    "Version" : "Versión",
+    "Sharing" : "Compartiendo",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
     "Allow public uploads" : "Permitir subidas públicas",
@@ -177,45 +212,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Excluye grupos de compartir",
     "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir autocompletación del nombre de usuario en diálogos de compartición. Si está deshabilitado, se requiere introducir el nombre de usuario.",
-    "Last cron job execution: %s." : "Cron se ejecutó por última vez: %s",
-    "Last cron job execution: %s. Something seems wrong." : "Cron se ejecutó por última vez: %s. Algo va mal.",
-    "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
-    "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
-    "Enable server-side encryption" : "Habilitar cifrado en el servidor",
-    "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Una vez que el cifrado está habilitado, todos los archivos subidos al servidor desde ese punto en adelante se cifrarán en reposo en el servidor. Sólo será posible desactivar el cifrado en una fecha posterior si el módulo de cifrado activado soporta esa función, y todas las condiciones previas (por ejemplo, el establecimiento de una clave de recuperación) se cumplan.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "El cifrado no garantiza por sí solo la seguridad del sistema. Por favor, vea la documentación para más información sobre cómo funciona la app de cifrado y los casos de uso soportados.",
-    "Be aware that encryption always increases the file size." : "Tenga presente que la encripción siempre incrementa el tamaño del archivo.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es siempre bueno crear copias de seguridad de sus datos, en el caso del cifrado, asegúrese de tener una copia de seguridad de las claves de cifrado junto con sus datos.",
-    "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
-    "Enable encryption" : "Habilitar cifrado",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
-    "Select default encryption module:" : "Seleccione el módulo de cifrado por defecto:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Necesita migrar sus claves de cifrado provenientes del antiguo sistema (ownCloud <= 8.0) al nuevo. Por favor habilite el \"Módulo de cifrado por defecto\" y ejecute 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Se necesita migrar las claves de cifrado del antiguo sistema (ownCloud <= 8.0) al nuevo sistema.",
-    "Start migration" : "Iniciar migración",
-    "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
-    "Send mode" : "Modo de envío",
-    "Encryption" : "Cifrado",
-    "From address" : "Desde la dirección",
-    "mail" : "correo electrónico",
-    "Authentication method" : "Método de autenticación",
-    "Authentication required" : "Se necesita autenticación",
-    "Server address" : "Dirección del servidor",
-    "Port" : "Puerto",
-    "Credentials" : "Credenciales",
-    "SMTP Username" : "Nombre de usuario SMTP",
-    "SMTP Password" : "Contraseña SMTP",
-    "Store credentials" : "Almacenar credenciales",
-    "Test email settings" : "Probar configuración de correo electrónico",
-    "Send email" : "Enviar mensaje",
-    "What to log" : "Que registrar",
-    "Download logfile" : "Descargar archivo de registro",
-    "More" : "Más",
-    "Less" : "Menos",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.",
+    "Tips & tricks" : "Sugerencias y trucos",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar a otra base de datos usa la herramienta de línea de comandos 'occ db:convert-type' o mira la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación ↗</a>.",
@@ -225,7 +222,6 @@ OC.L10N.register(
     "Improving the config.php" : "Mejorar el config.php",
     "Theming" : "Personalizar el tema",
     "Hardening and security guidance" : "Guía de protección y seguridad",
-    "Version" : "Versión",
     "Developer documentation" : "Documentación de desarrollador",
     "Experimental applications ahead" : "Aplicaciones experimentales más adelante",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Las aplicaciones experimentales no están verificadas por problemas de seguridad, recientes o conocidas por ser inestables y/o bajo un fuerte desarrollo. Instalándolas pueden causar pérdida de datos o violación de seguridades.",
@@ -281,6 +277,11 @@ OC.L10N.register(
     "Change password" : "Cambiar contraseña",
     "Language" : "Idioma",
     "Help translate" : "Ayúdanos a traducir",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "Desktop client" : "Cliente de escritorio",
+    "Android app" : "Aplicación de Android",
+    "iOS app" : "La aplicación de iOS",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
     "Web, desktop and mobile clients currently logged in to your account." : "Clientes web, móviles y de escritorio actualmente conectados a tu cuenta.",
     "Device" : "Dispositivo",
     "Last activity" : "Última actividad",
@@ -291,12 +292,6 @@ OC.L10N.register(
     "Use the credentials below to configure your app or device." : "Use las siguientes credenciales para configurar su app o dispositivo.",
     "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",
-    "Android app" : "Aplicación de Android",
-    "iOS app" : "La aplicación de iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere apoyar el proyecto\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">únase a su desarrollo</a>\n⇥⇥o\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">'difunda la palabra!</a>!",
-    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
     "Show storage location" : "Mostrar la ubicación del almacenamiento",
     "Show last log in" : "Mostrar el último inicio de sesión",
     "Show user backend" : "Mostrar motor de usuario",
@@ -320,6 +315,10 @@ OC.L10N.register(
     "change full name" : "cambiar el nombre completo",
     "set new password" : "establecer nueva contraseña",
     "change email address" : "cambiar dirección de correo electrónico",
-    "Default" : "Predeterminado"
+    "Default" : "Predeterminado",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Almacenamiento externo",
+    "Updates" : "Actualizaciones"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 977023a8f1e..039509fa924 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -33,17 +33,6 @@
     "Email saved" : "Correo electrónico guardado",
     "Your full name has been changed." : "Se ha cambiado su nombre completo.",
     "Unable to change full name" : "No se puede cambiar el nombre completo",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Avisos de seguridad y configuración",
-    "Sharing" : "Compartiendo",
-    "Server-side encryption" : "Cifrado en el servidor",
-    "External Storage" : "Almacenamiento externo",
-    "Cron" : "Cron",
-    "Email server" : "Servidor de correo electrónico",
-    "Log" : "Registro",
-    "Tips & tricks" : "Sugerencias y trucos",
-    "Updates" : "Actualizaciones",
     "Couldn't remove app." : "No se pudo eliminar la aplicación.",
     "Language changed" : "Idioma cambiado",
     "Invalid request" : "Petición no válida",
@@ -131,17 +120,55 @@
     "Sessions" : "Sesiones",
     "App passwords" : "Contraseñas de la app",
     "Sync clients" : "Clientes de sincronización",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
-    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
-    "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
-    "Errors and fatal issues" : "Errores y problemas fatales",
-    "Fatal issues only" : "Problemas fatales solamente",
     "None" : "Ninguno",
     "Login" : "Iniciar sesión",
     "Plain" : "Plano",
     "NT LAN Manager" : "Gestor de NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Servidor de correo electrónico",
+    "Open documentation" : "Abrir Documentación",
+    "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
+    "Send mode" : "Modo de envío",
+    "Encryption" : "Cifrado",
+    "From address" : "Desde la dirección",
+    "mail" : "correo electrónico",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Se necesita autenticación",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nombre de usuario SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Store credentials" : "Almacenar credenciales",
+    "Test email settings" : "Probar configuración de correo electrónico",
+    "Send email" : "Enviar mensaje",
+    "Server-side encryption" : "Cifrado en el servidor",
+    "Enable server-side encryption" : "Habilitar cifrado en el servidor",
+    "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Una vez que el cifrado está habilitado, todos los archivos subidos al servidor desde ese punto en adelante se cifrarán en reposo en el servidor. Sólo será posible desactivar el cifrado en una fecha posterior si el módulo de cifrado activado soporta esa función, y todas las condiciones previas (por ejemplo, el establecimiento de una clave de recuperación) se cumplan.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "El cifrado no garantiza por sí solo la seguridad del sistema. Por favor, vea la documentación para más información sobre cómo funciona la app de cifrado y los casos de uso soportados.",
+    "Be aware that encryption always increases the file size." : "Tenga presente que la encripción siempre incrementa el tamaño del archivo.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es siempre bueno crear copias de seguridad de sus datos, en el caso del cifrado, asegúrese de tener una copia de seguridad de las claves de cifrado junto con sus datos.",
+    "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
+    "Enable encryption" : "Habilitar cifrado",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
+    "Select default encryption module:" : "Seleccione el módulo de cifrado por defecto:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Necesita migrar sus claves de cifrado provenientes del antiguo sistema (ownCloud <= 8.0) al nuevo. Por favor habilite el \"Módulo de cifrado por defecto\" y ejecute 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Se necesita migrar las claves de cifrado del antiguo sistema (ownCloud <= 8.0) al nuevo sistema.",
+    "Start migration" : "Iniciar migración",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
+    "Errors and fatal issues" : "Errores y problemas fatales",
+    "Fatal issues only" : "Problemas fatales solamente",
+    "Log" : "Registro",
+    "What to log" : "Que registrar",
+    "Download logfile" : "Descargar archivo de registro",
+    "More" : "Más",
+    "Less" : "Menos",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.",
+    "Security & setup warnings" : "Avisos de seguridad y configuración",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor revisa la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación de instalación ↗</a> para notas de configuración PHP y la configuración PHP de tu servidor, especialmente cuando se está usando php-fpm",
     "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." : "Se ha habilitado la configuración de sólo lectura. Esto evita tener que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
@@ -158,7 +185,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, compruebe de nuevo las <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guías de instalación ↗</a>, y comprueba por cualquier error o advertencia en el  <a href=\"#log-section\">Registro</a>",
     "All checks passed." : "Ha pasado todos los controles",
-    "Open documentation" : "Abrir Documentación",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Cron se ejecutó por última vez: %s",
+    "Last cron job execution: %s. Something seems wrong." : "Cron se ejecutó por última vez: %s. Algo va mal.",
+    "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
+    "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
+    "Version" : "Versión",
+    "Sharing" : "Compartiendo",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
     "Allow public uploads" : "Permitir subidas públicas",
@@ -175,45 +210,7 @@
     "Exclude groups from sharing" : "Excluye grupos de compartir",
     "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir autocompletación del nombre de usuario en diálogos de compartición. Si está deshabilitado, se requiere introducir el nombre de usuario.",
-    "Last cron job execution: %s." : "Cron se ejecutó por última vez: %s",
-    "Last cron job execution: %s. Something seems wrong." : "Cron se ejecutó por última vez: %s. Algo va mal.",
-    "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
-    "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
-    "Enable server-side encryption" : "Habilitar cifrado en el servidor",
-    "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Una vez que el cifrado está habilitado, todos los archivos subidos al servidor desde ese punto en adelante se cifrarán en reposo en el servidor. Sólo será posible desactivar el cifrado en una fecha posterior si el módulo de cifrado activado soporta esa función, y todas las condiciones previas (por ejemplo, el establecimiento de una clave de recuperación) se cumplan.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "El cifrado no garantiza por sí solo la seguridad del sistema. Por favor, vea la documentación para más información sobre cómo funciona la app de cifrado y los casos de uso soportados.",
-    "Be aware that encryption always increases the file size." : "Tenga presente que la encripción siempre incrementa el tamaño del archivo.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es siempre bueno crear copias de seguridad de sus datos, en el caso del cifrado, asegúrese de tener una copia de seguridad de las claves de cifrado junto con sus datos.",
-    "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
-    "Enable encryption" : "Habilitar cifrado",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
-    "Select default encryption module:" : "Seleccione el módulo de cifrado por defecto:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Necesita migrar sus claves de cifrado provenientes del antiguo sistema (ownCloud <= 8.0) al nuevo. Por favor habilite el \"Módulo de cifrado por defecto\" y ejecute 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Se necesita migrar las claves de cifrado del antiguo sistema (ownCloud <= 8.0) al nuevo sistema.",
-    "Start migration" : "Iniciar migración",
-    "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
-    "Send mode" : "Modo de envío",
-    "Encryption" : "Cifrado",
-    "From address" : "Desde la dirección",
-    "mail" : "correo electrónico",
-    "Authentication method" : "Método de autenticación",
-    "Authentication required" : "Se necesita autenticación",
-    "Server address" : "Dirección del servidor",
-    "Port" : "Puerto",
-    "Credentials" : "Credenciales",
-    "SMTP Username" : "Nombre de usuario SMTP",
-    "SMTP Password" : "Contraseña SMTP",
-    "Store credentials" : "Almacenar credenciales",
-    "Test email settings" : "Probar configuración de correo electrónico",
-    "Send email" : "Enviar mensaje",
-    "What to log" : "Que registrar",
-    "Download logfile" : "Descargar archivo de registro",
-    "More" : "Más",
-    "Less" : "Menos",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.",
+    "Tips & tricks" : "Sugerencias y trucos",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar a otra base de datos usa la herramienta de línea de comandos 'occ db:convert-type' o mira la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación ↗</a>.",
@@ -223,7 +220,6 @@
     "Improving the config.php" : "Mejorar el config.php",
     "Theming" : "Personalizar el tema",
     "Hardening and security guidance" : "Guía de protección y seguridad",
-    "Version" : "Versión",
     "Developer documentation" : "Documentación de desarrollador",
     "Experimental applications ahead" : "Aplicaciones experimentales más adelante",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Las aplicaciones experimentales no están verificadas por problemas de seguridad, recientes o conocidas por ser inestables y/o bajo un fuerte desarrollo. Instalándolas pueden causar pérdida de datos o violación de seguridades.",
@@ -279,6 +275,11 @@
     "Change password" : "Cambiar contraseña",
     "Language" : "Idioma",
     "Help translate" : "Ayúdanos a traducir",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "Desktop client" : "Cliente de escritorio",
+    "Android app" : "Aplicación de Android",
+    "iOS app" : "La aplicación de iOS",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
     "Web, desktop and mobile clients currently logged in to your account." : "Clientes web, móviles y de escritorio actualmente conectados a tu cuenta.",
     "Device" : "Dispositivo",
     "Last activity" : "Última actividad",
@@ -289,12 +290,6 @@
     "Use the credentials below to configure your app or device." : "Use las siguientes credenciales para configurar su app o dispositivo.",
     "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",
-    "Android app" : "Aplicación de Android",
-    "iOS app" : "La aplicación de iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere apoyar el proyecto\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">únase a su desarrollo</a>\n⇥⇥o\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">'difunda la palabra!</a>!",
-    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
     "Show storage location" : "Mostrar la ubicación del almacenamiento",
     "Show last log in" : "Mostrar el último inicio de sesión",
     "Show user backend" : "Mostrar motor de usuario",
@@ -318,6 +313,10 @@
     "change full name" : "cambiar el nombre completo",
     "set new password" : "establecer nueva contraseña",
     "change email address" : "cambiar dirección de correo electrónico",
-    "Default" : "Predeterminado"
+    "Default" : "Predeterminado",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Almacenamiento externo",
+    "Updates" : "Actualizaciones"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index c4d0657d86a..016064cbeba 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -34,17 +34,6 @@ OC.L10N.register(
     "Email saved" : "Sähköposti tallennettu",
     "Your full name has been changed." : "Koko nimesi on muutettu.",
     "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset",
-    "Sharing" : "Jakaminen",
-    "Server-side encryption" : "Palvelinpään salaus",
-    "External Storage" : "Erillinen tallennusväline",
-    "Cron" : "Cron",
-    "Email server" : "Sähköpostipalvelin",
-    "Log" : "Loki",
-    "Tips & tricks" : "Vinkit",
-    "Updates" : "Päivitykset",
     "Couldn't remove app." : "Sovelluksen poistaminen epäonnistui.",
     "Language changed" : "Kieli on vaihdettu",
     "Invalid request" : "Virheellinen pyyntö",
@@ -114,16 +103,51 @@ OC.L10N.register(
     "Sessions" : "Istunnot",
     "App passwords" : "Sovellusten salasanat",
     "Sync clients" : "Synkronointisovellukset",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
-    "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
-    "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat",
-    "Errors and fatal issues" : "Virheet ja vakavat ongelmat",
-    "Fatal issues only" : "Vain vakavat ongelmat",
     "None" : "Ei mitään",
     "Login" : "Kirjaudu",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Sähköpostipalvelin",
+    "Open documentation" : "Avaa dokumentaatio",
+    "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
+    "Send mode" : "Lähetystila",
+    "Encryption" : "Salaus",
+    "From address" : "Lähettäjän osoite",
+    "Authentication method" : "Tunnistautumistapa",
+    "Authentication required" : "Tunnistautuminen vaaditaan",
+    "Server address" : "Palvelimen osoite",
+    "Port" : "Portti",
+    "Credentials" : "Tilitiedot",
+    "SMTP Username" : "SMTP-käyttäjätunnus",
+    "SMTP Password" : "SMTP-salasana",
+    "Store credentials" : "Säilytä tilitiedot",
+    "Test email settings" : "Testaa sähköpostiasetukset",
+    "Send email" : "Lähetä sähköpostiviesti",
+    "Server-side encryption" : "Palvelinpään salaus",
+    "Enable server-side encryption" : "Käytä palvelinpään salausta",
+    "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
+    "Be aware that encryption always increases the file size." : "Ota huomioon, että salaus kasvattaa aina tiedostojen kokoa.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Säännöllisten varmuuskopioiden ottaminen on erittäin tärkeää. Jos olet ottanut salauksen käyttöön, huolehdi salausavainten varmuuskopioinnista.",
+    "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
+    "Enable encryption" : "Käytä salausta",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
+    "Select default encryption module:" : "Valitse oletuksena käytettävä salausmoduuli:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen. Ota \"Default encryption module\" käyttöön ja suorita komento 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen.",
+    "Start migration" : "Käynnistä migraatio",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
+    "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
+    "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat",
+    "Errors and fatal issues" : "Virheet ja vakavat ongelmat",
+    "Fatal issues only" : "Vain vakavat ongelmat",
+    "Log" : "Loki",
+    "What to log" : "Mitä kerätään lokiin",
+    "Download logfile" : "Lataa lokitiedosto",
+    "More" : "Enemmän",
+    "Less" : "Vähemmän",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.",
+    "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset",
     "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." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Tämä johtuu todennäköisesti välimuistista tai kiihdyttimestä kuten Zend OPcachesta tai eAcceleratorista.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s alle version %2$s on asennettu.  Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan %1$s-versioon.",
@@ -133,7 +157,15 @@ OC.L10N.register(
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Suosittelemme asentamaan vaaditut paketit järjestelmään, jotta järjestelmässä on tuki yhdelle seuraavista maa-asetuksista: %s.",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Cron-työn suorittaminen komentorivin kautta ei onnistunut. Ilmeni seuraavia teknisiä virheitä:",
     "All checks passed." : "Läpäistiin kaikki tarkistukset.",
-    "Open documentation" : "Avaa dokumentaatio",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
+    "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
+    "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
+    "Version" : "Versio",
+    "Sharing" : "Jakaminen",
     "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
     "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
     "Allow public uploads" : "Salli julkiset lähetykset",
@@ -150,42 +182,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Kiellä ryhmiä jakamasta",
     "These groups will still be able to receive shares, but not to initiate them." : "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Salli käyttäjätunnuksen automaattinen täydentäminen jakamisikkunnassa. Jos tämä asetus on pois käytöstä, tulee käyttäjätunnus kirjoittaa kokonaan itse.",
-    "Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
-    "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
-    "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-    "Enable server-side encryption" : "Käytä palvelinpään salausta",
-    "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
-    "Be aware that encryption always increases the file size." : "Ota huomioon, että salaus kasvattaa aina tiedostojen kokoa.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Säännöllisten varmuuskopioiden ottaminen on erittäin tärkeää. Jos olet ottanut salauksen käyttöön, huolehdi salausavainten varmuuskopioinnista.",
-    "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
-    "Enable encryption" : "Käytä salausta",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
-    "Select default encryption module:" : "Valitse oletuksena käytettävä salausmoduuli:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen. Ota \"Default encryption module\" käyttöön ja suorita komento 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen.",
-    "Start migration" : "Käynnistä migraatio",
-    "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
-    "Send mode" : "Lähetystila",
-    "Encryption" : "Salaus",
-    "From address" : "Lähettäjän osoite",
-    "Authentication method" : "Tunnistautumistapa",
-    "Authentication required" : "Tunnistautuminen vaaditaan",
-    "Server address" : "Palvelimen osoite",
-    "Port" : "Portti",
-    "Credentials" : "Tilitiedot",
-    "SMTP Username" : "SMTP-käyttäjätunnus",
-    "SMTP Password" : "SMTP-salasana",
-    "Store credentials" : "Säilytä tilitiedot",
-    "Test email settings" : "Testaa sähköpostiasetukset",
-    "Send email" : "Lähetä sähköpostiviesti",
-    "What to log" : "Mitä kerätään lokiin",
-    "Download logfile" : "Lataa lokitiedosto",
-    "More" : "Enemmän",
-    "Less" : "Vähemmän",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.",
+    "Tips & tricks" : "Vinkit",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLitea käytetään tietokantana. Suuria asennuksia varten on suositeltavaa vaihtaa muuhun tietokantaan.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
     "How to do backups" : "Kuinka tehdä varmuuskopioita",
@@ -194,7 +191,6 @@ OC.L10N.register(
     "Improving the config.php" : "Config.php-tiedoston parantaminen",
     "Theming" : "Teemojen käyttö",
     "Hardening and security guidance" : "Turvaamis- ja tietoturvaopas",
-    "Version" : "Versio",
     "Developer documentation" : "Kehittäjädokumentaatio",
     "Experimental applications ahead" : "Kokeellisia sovelluksia edessä",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Kokeellisia sovelluksia ei ole tarkistettu tietoturvauhkien varalta. Sovellukset ovat uusia, ne saattavat olla epävakaita ja ovat nopean kehityksen alaisia. Kokeellisten sovellusten asentaminen saattaa aiheuttaa tietojen katoamista tai tietoturvauhkia.",
@@ -248,16 +244,16 @@ OC.L10N.register(
     "Change password" : "Vaihda salasana",
     "Language" : "Kieli",
     "Help translate" : "Auta kääntämisessä",
-    "Name" : "Nimi",
-    "App name" : "Sovelluksen nimi",
-    "Create new app password" : "Luo uusi sovellussalasana",
-    "Username" : "Käyttäjätunnus",
-    "Done" : "Valmis",
     "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
     "Desktop client" : "Työpöytäsovellus",
     "Android app" : "Android-sovellus",
     "iOS app" : "iOS-sovellus",
     "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen",
+    "Name" : "Nimi",
+    "App name" : "Sovelluksen nimi",
+    "Create new app password" : "Luo uusi sovellussalasana",
+    "Username" : "Käyttäjätunnus",
+    "Done" : "Valmis",
     "Show storage location" : "Näytä tallennustilan sijainti",
     "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
     "Show user backend" : "Näytä käyttäjätaustaosa",
@@ -276,6 +272,10 @@ OC.L10N.register(
     "change full name" : "muuta koko nimi",
     "set new password" : "aseta uusi salasana",
     "change email address" : "vaihda sähköpostiosoite",
-    "Default" : "Oletus"
+    "Default" : "Oletus",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Erillinen tallennusväline",
+    "Updates" : "Päivitykset"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index b2c32b1e6ff..a076736fcfc 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -32,17 +32,6 @@
     "Email saved" : "Sähköposti tallennettu",
     "Your full name has been changed." : "Koko nimesi on muutettu.",
     "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset",
-    "Sharing" : "Jakaminen",
-    "Server-side encryption" : "Palvelinpään salaus",
-    "External Storage" : "Erillinen tallennusväline",
-    "Cron" : "Cron",
-    "Email server" : "Sähköpostipalvelin",
-    "Log" : "Loki",
-    "Tips & tricks" : "Vinkit",
-    "Updates" : "Päivitykset",
     "Couldn't remove app." : "Sovelluksen poistaminen epäonnistui.",
     "Language changed" : "Kieli on vaihdettu",
     "Invalid request" : "Virheellinen pyyntö",
@@ -112,16 +101,51 @@
     "Sessions" : "Istunnot",
     "App passwords" : "Sovellusten salasanat",
     "Sync clients" : "Synkronointisovellukset",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
-    "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
-    "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat",
-    "Errors and fatal issues" : "Virheet ja vakavat ongelmat",
-    "Fatal issues only" : "Vain vakavat ongelmat",
     "None" : "Ei mitään",
     "Login" : "Kirjaudu",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Sähköpostipalvelin",
+    "Open documentation" : "Avaa dokumentaatio",
+    "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
+    "Send mode" : "Lähetystila",
+    "Encryption" : "Salaus",
+    "From address" : "Lähettäjän osoite",
+    "Authentication method" : "Tunnistautumistapa",
+    "Authentication required" : "Tunnistautuminen vaaditaan",
+    "Server address" : "Palvelimen osoite",
+    "Port" : "Portti",
+    "Credentials" : "Tilitiedot",
+    "SMTP Username" : "SMTP-käyttäjätunnus",
+    "SMTP Password" : "SMTP-salasana",
+    "Store credentials" : "Säilytä tilitiedot",
+    "Test email settings" : "Testaa sähköpostiasetukset",
+    "Send email" : "Lähetä sähköpostiviesti",
+    "Server-side encryption" : "Palvelinpään salaus",
+    "Enable server-side encryption" : "Käytä palvelinpään salausta",
+    "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
+    "Be aware that encryption always increases the file size." : "Ota huomioon, että salaus kasvattaa aina tiedostojen kokoa.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Säännöllisten varmuuskopioiden ottaminen on erittäin tärkeää. Jos olet ottanut salauksen käyttöön, huolehdi salausavainten varmuuskopioinnista.",
+    "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
+    "Enable encryption" : "Käytä salausta",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
+    "Select default encryption module:" : "Valitse oletuksena käytettävä salausmoduuli:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen. Ota \"Default encryption module\" käyttöön ja suorita komento 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen.",
+    "Start migration" : "Käynnistä migraatio",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
+    "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
+    "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat",
+    "Errors and fatal issues" : "Virheet ja vakavat ongelmat",
+    "Fatal issues only" : "Vain vakavat ongelmat",
+    "Log" : "Loki",
+    "What to log" : "Mitä kerätään lokiin",
+    "Download logfile" : "Lataa lokitiedosto",
+    "More" : "Enemmän",
+    "Less" : "Vähemmän",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.",
+    "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset",
     "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." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Tämä johtuu todennäköisesti välimuistista tai kiihdyttimestä kuten Zend OPcachesta tai eAcceleratorista.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s alle version %2$s on asennettu.  Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan %1$s-versioon.",
@@ -131,7 +155,15 @@
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Suosittelemme asentamaan vaaditut paketit järjestelmään, jotta järjestelmässä on tuki yhdelle seuraavista maa-asetuksista: %s.",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Cron-työn suorittaminen komentorivin kautta ei onnistunut. Ilmeni seuraavia teknisiä virheitä:",
     "All checks passed." : "Läpäistiin kaikki tarkistukset.",
-    "Open documentation" : "Avaa dokumentaatio",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
+    "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
+    "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
+    "Version" : "Versio",
+    "Sharing" : "Jakaminen",
     "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
     "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
     "Allow public uploads" : "Salli julkiset lähetykset",
@@ -148,42 +180,7 @@
     "Exclude groups from sharing" : "Kiellä ryhmiä jakamasta",
     "These groups will still be able to receive shares, but not to initiate them." : "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Salli käyttäjätunnuksen automaattinen täydentäminen jakamisikkunnassa. Jos tämä asetus on pois käytöstä, tulee käyttäjätunnus kirjoittaa kokonaan itse.",
-    "Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
-    "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
-    "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-    "Enable server-side encryption" : "Käytä palvelinpään salausta",
-    "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
-    "Be aware that encryption always increases the file size." : "Ota huomioon, että salaus kasvattaa aina tiedostojen kokoa.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Säännöllisten varmuuskopioiden ottaminen on erittäin tärkeää. Jos olet ottanut salauksen käyttöön, huolehdi salausavainten varmuuskopioinnista.",
-    "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
-    "Enable encryption" : "Käytä salausta",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
-    "Select default encryption module:" : "Valitse oletuksena käytettävä salausmoduuli:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen. Ota \"Default encryption module\" käyttöön ja suorita komento 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen.",
-    "Start migration" : "Käynnistä migraatio",
-    "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
-    "Send mode" : "Lähetystila",
-    "Encryption" : "Salaus",
-    "From address" : "Lähettäjän osoite",
-    "Authentication method" : "Tunnistautumistapa",
-    "Authentication required" : "Tunnistautuminen vaaditaan",
-    "Server address" : "Palvelimen osoite",
-    "Port" : "Portti",
-    "Credentials" : "Tilitiedot",
-    "SMTP Username" : "SMTP-käyttäjätunnus",
-    "SMTP Password" : "SMTP-salasana",
-    "Store credentials" : "Säilytä tilitiedot",
-    "Test email settings" : "Testaa sähköpostiasetukset",
-    "Send email" : "Lähetä sähköpostiviesti",
-    "What to log" : "Mitä kerätään lokiin",
-    "Download logfile" : "Lataa lokitiedosto",
-    "More" : "Enemmän",
-    "Less" : "Vähemmän",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.",
+    "Tips & tricks" : "Vinkit",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLitea käytetään tietokantana. Suuria asennuksia varten on suositeltavaa vaihtaa muuhun tietokantaan.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
     "How to do backups" : "Kuinka tehdä varmuuskopioita",
@@ -192,7 +189,6 @@
     "Improving the config.php" : "Config.php-tiedoston parantaminen",
     "Theming" : "Teemojen käyttö",
     "Hardening and security guidance" : "Turvaamis- ja tietoturvaopas",
-    "Version" : "Versio",
     "Developer documentation" : "Kehittäjädokumentaatio",
     "Experimental applications ahead" : "Kokeellisia sovelluksia edessä",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Kokeellisia sovelluksia ei ole tarkistettu tietoturvauhkien varalta. Sovellukset ovat uusia, ne saattavat olla epävakaita ja ovat nopean kehityksen alaisia. Kokeellisten sovellusten asentaminen saattaa aiheuttaa tietojen katoamista tai tietoturvauhkia.",
@@ -246,16 +242,16 @@
     "Change password" : "Vaihda salasana",
     "Language" : "Kieli",
     "Help translate" : "Auta kääntämisessä",
-    "Name" : "Nimi",
-    "App name" : "Sovelluksen nimi",
-    "Create new app password" : "Luo uusi sovellussalasana",
-    "Username" : "Käyttäjätunnus",
-    "Done" : "Valmis",
     "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
     "Desktop client" : "Työpöytäsovellus",
     "Android app" : "Android-sovellus",
     "iOS app" : "iOS-sovellus",
     "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen",
+    "Name" : "Nimi",
+    "App name" : "Sovelluksen nimi",
+    "Create new app password" : "Luo uusi sovellussalasana",
+    "Username" : "Käyttäjätunnus",
+    "Done" : "Valmis",
     "Show storage location" : "Näytä tallennustilan sijainti",
     "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
     "Show user backend" : "Näytä käyttäjätaustaosa",
@@ -274,6 +270,10 @@
     "change full name" : "muuta koko nimi",
     "set new password" : "aseta uusi salasana",
     "change email address" : "vaihda sähköpostiosoite",
-    "Default" : "Oletus"
+    "Default" : "Oletus",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Erillinen tallennusväline",
+    "Updates" : "Päivitykset"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 4a4a920b42c..66e9e091823 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "E-mail sauvegardé",
     "Your full name has been changed." : "Votre nom complet a été modifié.",
     "Unable to change full name" : "Impossible de changer le nom complet",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Avertissements de sécurité & configuration",
-    "Sharing" : "Partage",
-    "Server-side encryption" : "Chiffrement côté serveur",
-    "External Storage" : "Stockage externe",
-    "Cron" : "Cron",
-    "Email server" : "Serveur e-mail",
-    "Log" : "Log",
-    "Tips & tricks" : "Trucs et astuces",
-    "Updates" : "Mises à jour",
     "Couldn't remove app." : "Impossible de supprimer l'application.",
     "Language changed" : "Langue changée",
     "Invalid request" : "Requête non valide",
@@ -68,7 +57,7 @@ OC.L10N.register(
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les tests de sécurité. Elles sont activement maintenues et leur code source est ouvert. Leurs développeurs les considèrent stables pour une utilisation normale.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Cette application est nouvelle ou instable, et sa sécurité n'a pas été vérifiée. Installez-la à vos risques et périls!",
     "Update to %s" : "Mettre à niveau vers la version %s",
-    "_You have %n app update pending_::_You have %n app updates pending_" : ["Vous avez %n application qui attend ça  mise a jour .","Vous avez %n applications qui attendent leurs mise a jour ."],
+    "_You have %n app update pending_::_You have %n app updates pending_" : ["Vous avez %n application qui attend ça  mise a jour .","Vous avez %n applications en attente de mise à jour"],
     "Please wait...." : "Veuillez patienter…",
     "Error while disabling app" : "Erreur lors de la désactivation de l'application",
     "Disable" : "Désactiver",
@@ -133,17 +122,55 @@ OC.L10N.register(
     "Sessions" : "Sessions",
     "App passwords" : "Mots de passe de l'application",
     "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",
-    "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales",
-    "Errors and fatal issues" : "Erreurs et erreurs fatales",
-    "Fatal issues only" : "Erreurs fatales uniquement",
     "None" : "Aucun",
     "Login" : "Login",
     "Plain" : "En clair",
     "NT LAN Manager" : "Gestionnaire du réseau NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Serveur e-mail",
+    "Open documentation" : "Voir la documentation",
+    "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
+    "Send mode" : "Mode d'envoi",
+    "Encryption" : "Chiffrement",
+    "From address" : "Adresse source",
+    "mail" : "e-mail",
+    "Authentication method" : "Méthode d'authentification",
+    "Authentication required" : "Authentification requise",
+    "Server address" : "Adresse du serveur",
+    "Port" : "Port",
+    "Credentials" : "Informations d'identification",
+    "SMTP Username" : "Nom d'utilisateur SMTP",
+    "SMTP Password" : "Mot de passe SMTP",
+    "Store credentials" : "Enregistrer les identifiants",
+    "Test email settings" : "Tester les paramètres e-mail",
+    "Send email" : "Envoyer un e-mail",
+    "Server-side encryption" : "Chiffrement côté serveur",
+    "Enable server-side encryption" : "Activer le chiffrement côté serveur",
+    "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Une fois le chiffrement activé, les fichiers téléversés sur le serveur à partir de ce moment seront stockés sous forme chiffrée. Il n'est possible de désactiver le chiffrement que si le module utilisé le permet spécifiquement, et que toutes les conditions préalables sont réunies pour ce faire (par exemple la création d'une clef de récupération).",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne garantit pas la sécurité du système. Veuillez consulter la documentation pour plus d'informations à propos du fonction de l'application de chiffrement, et des cas d'utilisations supportés.",
+    "Be aware that encryption always increases the file size." : "Veuillez noter que le chiffrement augmente toujours la taille des fichiers.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Il est opportun de sauvegarder régulièrement vos données. Si ces données sont chiffrées, n'oubliez pas de sauvegarder aussi les clés de chiffrement.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
+    "Enable encryption" : "Activer le chiffrement",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
+    "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle. Veuillez activer l'application \"Default Encryption Module\" et exécuter 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle.",
+    "Start migration" : "Démarrer la migration",
+    "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",
+    "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales",
+    "Errors and fatal issues" : "Erreurs et erreurs fatales",
+    "Fatal issues only" : "Erreurs fatales uniquement",
+    "Log" : "Log",
+    "What to log" : "Ce qu'il faut journaliser",
+    "Download logfile" : "Télécharger le fichier de journalisation",
+    "More" : "Plus",
+    "Less" : "Moins",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "La taille du fichier journal excède 100 Mo. Le télécharger peut prendre un certain temps!",
+    "Security & setup warnings" : "Avertissements de sécurité & configuration",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez consulter <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">la documentation d'installation ↗</a> pour savoir comment configurer php sur votre serveur, en particulier en cas d'utilisation de php-fpm.",
     "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.",
@@ -160,7 +187,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
     "All checks passed." : "Tous les tests ont réussi.",
-    "Open documentation" : "Voir la documentation",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
+    "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
+    "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Utilisez un service webcron pour exécuter cron.php toutes les 15 minutes par HTTP",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
+    "Version" : "Version",
+    "Sharing" : "Partage",
     "Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
     "Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
     "Allow public uploads" : "Autoriser les téléversements publics",
@@ -177,45 +212,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Empêcher certains groupes de partager",
     "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Activer l'autocomplétion des noms d'utilisateurs dans la fenêtre de partage. Si cette option est désactivée,  les noms complets doivent être indiqués.",
-    "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
-    "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
-    "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Utilisez un service webcron pour exécuter cron.php toutes les 15 minutes par HTTP",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
-    "Enable server-side encryption" : "Activer le chiffrement côté serveur",
-    "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Une fois le chiffrement activé, les fichiers téléversés sur le serveur à partir de ce moment seront stockés sous forme chiffrée. Il n'est possible de désactiver le chiffrement que si le module utilisé le permet spécifiquement, et que toutes les conditions préalables sont réunies pour ce faire (par exemple la création d'une clef de récupération).",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne garantit pas la sécurité du système. Veuillez consulter la documentation pour plus d'informations à propos du fonction de l'application de chiffrement, et des cas d'utilisations supportés.",
-    "Be aware that encryption always increases the file size." : "Veuillez noter que le chiffrement augmente toujours la taille des fichiers.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Il est opportun de sauvegarder régulièrement vos données. Si ces données sont chiffrées, n'oubliez pas de sauvegarder aussi les clés de chiffrement.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
-    "Enable encryption" : "Activer le chiffrement",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
-    "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle. Veuillez activer l'application \"Default Encryption Module\" et exécuter 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle.",
-    "Start migration" : "Démarrer la migration",
-    "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
-    "Send mode" : "Mode d'envoi",
-    "Encryption" : "Chiffrement",
-    "From address" : "Adresse source",
-    "mail" : "e-mail",
-    "Authentication method" : "Méthode d'authentification",
-    "Authentication required" : "Authentification requise",
-    "Server address" : "Adresse du serveur",
-    "Port" : "Port",
-    "Credentials" : "Informations d'identification",
-    "SMTP Username" : "Nom d'utilisateur SMTP",
-    "SMTP Password" : "Mot de passe SMTP",
-    "Store credentials" : "Enregistrer les identifiants",
-    "Test email settings" : "Tester les paramètres e-mail",
-    "Send email" : "Envoyer un e-mail",
-    "What to log" : "Ce qu'il faut journaliser",
-    "Download logfile" : "Télécharger le fichier de journalisation",
-    "More" : "Plus",
-    "Less" : "Moins",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "La taille du fichier journal excède 100 Mo. Le télécharger peut prendre un certain temps!",
+    "Tips & tricks" : "Trucs et astuces",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "L'utilisation de SQLite est particulièrement déconseillée si vous utilisez le client de bureau pour synchroniser vos données.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>.",
@@ -225,7 +222,6 @@ OC.L10N.register(
     "Improving the config.php" : "Amélioration du config.php ",
     "Theming" : "Personnalisation de l'apparence",
     "Hardening and security guidance" : "Guide pour le renforcement et la sécurité",
-    "Version" : "Version",
     "Developer documentation" : "Documentation pour développeurs",
     "Experimental applications ahead" : "Attention! Applications expérimentales",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Les applications expérimentales n'ont pas fait l'objet de tests de sécurité, sont encore en développement et peuvent être instables. Les installer peut causer des pertes de données ou des failles de sécurité. ",
@@ -281,6 +277,11 @@ OC.L10N.register(
     "Change password" : "Changer de mot de passe",
     "Language" : "Langue",
     "Help translate" : "Aidez à traduire",
+    "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
+    "Desktop client" : "Client de bureau",
+    "Android app" : "Application Android",
+    "iOS app" : "Application iOS",
+    "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion",
     "Web, desktop and mobile clients currently logged in to your account." : "Clients web, desktop et mobiles actuellement connectés sur votre compte.",
     "Device" : "Périphérique",
     "Last activity" : "Dernière activité",
@@ -291,12 +292,6 @@ OC.L10N.register(
     "Use the credentials below to configure your app or device." : "Utilisez les informations d'identification ci-dessous pour configurer votre application ou appareil.",
     "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",
-    "Android app" : "Application Android",
-    "iOS app" : "Application iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous voulez supporter le projet <a href=\"https://nextcloud.com/contribute\" target=\"_blank\" rel=\"noreferrer\">rejoindre le développement</a> ou <a href=\"https://nextcloud.com/contribute\" target=\"_blank\" rel=\"noreferrer\">promouvoir</a> !",
-    "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion",
     "Show storage location" : "Afficher l'emplacement du stockage",
     "Show last log in" : "Montrer la dernière connexion",
     "Show user backend" : "Montrer la source de l'identifiant",
@@ -320,6 +315,10 @@ OC.L10N.register(
     "change full name" : "Modifier le nom complet",
     "set new password" : "Changer le mot de passe",
     "change email address" : "changer l'adresse e-mail",
-    "Default" : "Défaut"
+    "Default" : "Défaut",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Stockage externe",
+    "Updates" : "Mises à jour"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 05c363babb7..e77bf2502dc 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -33,17 +33,6 @@
     "Email saved" : "E-mail sauvegardé",
     "Your full name has been changed." : "Votre nom complet a été modifié.",
     "Unable to change full name" : "Impossible de changer le nom complet",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Avertissements de sécurité & configuration",
-    "Sharing" : "Partage",
-    "Server-side encryption" : "Chiffrement côté serveur",
-    "External Storage" : "Stockage externe",
-    "Cron" : "Cron",
-    "Email server" : "Serveur e-mail",
-    "Log" : "Log",
-    "Tips & tricks" : "Trucs et astuces",
-    "Updates" : "Mises à jour",
     "Couldn't remove app." : "Impossible de supprimer l'application.",
     "Language changed" : "Langue changée",
     "Invalid request" : "Requête non valide",
@@ -66,7 +55,7 @@
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les tests de sécurité. Elles sont activement maintenues et leur code source est ouvert. Leurs développeurs les considèrent stables pour une utilisation normale.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Cette application est nouvelle ou instable, et sa sécurité n'a pas été vérifiée. Installez-la à vos risques et périls!",
     "Update to %s" : "Mettre à niveau vers la version %s",
-    "_You have %n app update pending_::_You have %n app updates pending_" : ["Vous avez %n application qui attend ça  mise a jour .","Vous avez %n applications qui attendent leurs mise a jour ."],
+    "_You have %n app update pending_::_You have %n app updates pending_" : ["Vous avez %n application qui attend ça  mise a jour .","Vous avez %n applications en attente de mise à jour"],
     "Please wait...." : "Veuillez patienter…",
     "Error while disabling app" : "Erreur lors de la désactivation de l'application",
     "Disable" : "Désactiver",
@@ -131,17 +120,55 @@
     "Sessions" : "Sessions",
     "App passwords" : "Mots de passe de l'application",
     "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",
-    "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales",
-    "Errors and fatal issues" : "Erreurs et erreurs fatales",
-    "Fatal issues only" : "Erreurs fatales uniquement",
     "None" : "Aucun",
     "Login" : "Login",
     "Plain" : "En clair",
     "NT LAN Manager" : "Gestionnaire du réseau NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Serveur e-mail",
+    "Open documentation" : "Voir la documentation",
+    "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
+    "Send mode" : "Mode d'envoi",
+    "Encryption" : "Chiffrement",
+    "From address" : "Adresse source",
+    "mail" : "e-mail",
+    "Authentication method" : "Méthode d'authentification",
+    "Authentication required" : "Authentification requise",
+    "Server address" : "Adresse du serveur",
+    "Port" : "Port",
+    "Credentials" : "Informations d'identification",
+    "SMTP Username" : "Nom d'utilisateur SMTP",
+    "SMTP Password" : "Mot de passe SMTP",
+    "Store credentials" : "Enregistrer les identifiants",
+    "Test email settings" : "Tester les paramètres e-mail",
+    "Send email" : "Envoyer un e-mail",
+    "Server-side encryption" : "Chiffrement côté serveur",
+    "Enable server-side encryption" : "Activer le chiffrement côté serveur",
+    "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Une fois le chiffrement activé, les fichiers téléversés sur le serveur à partir de ce moment seront stockés sous forme chiffrée. Il n'est possible de désactiver le chiffrement que si le module utilisé le permet spécifiquement, et que toutes les conditions préalables sont réunies pour ce faire (par exemple la création d'une clef de récupération).",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne garantit pas la sécurité du système. Veuillez consulter la documentation pour plus d'informations à propos du fonction de l'application de chiffrement, et des cas d'utilisations supportés.",
+    "Be aware that encryption always increases the file size." : "Veuillez noter que le chiffrement augmente toujours la taille des fichiers.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Il est opportun de sauvegarder régulièrement vos données. Si ces données sont chiffrées, n'oubliez pas de sauvegarder aussi les clés de chiffrement.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
+    "Enable encryption" : "Activer le chiffrement",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
+    "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle. Veuillez activer l'application \"Default Encryption Module\" et exécuter 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle.",
+    "Start migration" : "Démarrer la migration",
+    "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",
+    "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales",
+    "Errors and fatal issues" : "Erreurs et erreurs fatales",
+    "Fatal issues only" : "Erreurs fatales uniquement",
+    "Log" : "Log",
+    "What to log" : "Ce qu'il faut journaliser",
+    "Download logfile" : "Télécharger le fichier de journalisation",
+    "More" : "Plus",
+    "Less" : "Moins",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "La taille du fichier journal excède 100 Mo. Le télécharger peut prendre un certain temps!",
+    "Security & setup warnings" : "Avertissements de sécurité & configuration",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez consulter <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">la documentation d'installation ↗</a> pour savoir comment configurer php sur votre serveur, en particulier en cas d'utilisation de php-fpm.",
     "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.",
@@ -158,7 +185,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
     "All checks passed." : "Tous les tests ont réussi.",
-    "Open documentation" : "Voir la documentation",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
+    "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
+    "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Utilisez un service webcron pour exécuter cron.php toutes les 15 minutes par HTTP",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
+    "Version" : "Version",
+    "Sharing" : "Partage",
     "Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
     "Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
     "Allow public uploads" : "Autoriser les téléversements publics",
@@ -175,45 +210,7 @@
     "Exclude groups from sharing" : "Empêcher certains groupes de partager",
     "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Activer l'autocomplétion des noms d'utilisateurs dans la fenêtre de partage. Si cette option est désactivée,  les noms complets doivent être indiqués.",
-    "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
-    "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
-    "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Utilisez un service webcron pour exécuter cron.php toutes les 15 minutes par HTTP",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
-    "Enable server-side encryption" : "Activer le chiffrement côté serveur",
-    "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Une fois le chiffrement activé, les fichiers téléversés sur le serveur à partir de ce moment seront stockés sous forme chiffrée. Il n'est possible de désactiver le chiffrement que si le module utilisé le permet spécifiquement, et que toutes les conditions préalables sont réunies pour ce faire (par exemple la création d'une clef de récupération).",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne garantit pas la sécurité du système. Veuillez consulter la documentation pour plus d'informations à propos du fonction de l'application de chiffrement, et des cas d'utilisations supportés.",
-    "Be aware that encryption always increases the file size." : "Veuillez noter que le chiffrement augmente toujours la taille des fichiers.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Il est opportun de sauvegarder régulièrement vos données. Si ces données sont chiffrées, n'oubliez pas de sauvegarder aussi les clés de chiffrement.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
-    "Enable encryption" : "Activer le chiffrement",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
-    "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle. Veuillez activer l'application \"Default Encryption Module\" et exécuter 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle.",
-    "Start migration" : "Démarrer la migration",
-    "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
-    "Send mode" : "Mode d'envoi",
-    "Encryption" : "Chiffrement",
-    "From address" : "Adresse source",
-    "mail" : "e-mail",
-    "Authentication method" : "Méthode d'authentification",
-    "Authentication required" : "Authentification requise",
-    "Server address" : "Adresse du serveur",
-    "Port" : "Port",
-    "Credentials" : "Informations d'identification",
-    "SMTP Username" : "Nom d'utilisateur SMTP",
-    "SMTP Password" : "Mot de passe SMTP",
-    "Store credentials" : "Enregistrer les identifiants",
-    "Test email settings" : "Tester les paramètres e-mail",
-    "Send email" : "Envoyer un e-mail",
-    "What to log" : "Ce qu'il faut journaliser",
-    "Download logfile" : "Télécharger le fichier de journalisation",
-    "More" : "Plus",
-    "Less" : "Moins",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "La taille du fichier journal excède 100 Mo. Le télécharger peut prendre un certain temps!",
+    "Tips & tricks" : "Trucs et astuces",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "L'utilisation de SQLite est particulièrement déconseillée si vous utilisez le client de bureau pour synchroniser vos données.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>.",
@@ -223,7 +220,6 @@
     "Improving the config.php" : "Amélioration du config.php ",
     "Theming" : "Personnalisation de l'apparence",
     "Hardening and security guidance" : "Guide pour le renforcement et la sécurité",
-    "Version" : "Version",
     "Developer documentation" : "Documentation pour développeurs",
     "Experimental applications ahead" : "Attention! Applications expérimentales",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Les applications expérimentales n'ont pas fait l'objet de tests de sécurité, sont encore en développement et peuvent être instables. Les installer peut causer des pertes de données ou des failles de sécurité. ",
@@ -279,6 +275,11 @@
     "Change password" : "Changer de mot de passe",
     "Language" : "Langue",
     "Help translate" : "Aidez à traduire",
+    "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
+    "Desktop client" : "Client de bureau",
+    "Android app" : "Application Android",
+    "iOS app" : "Application iOS",
+    "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion",
     "Web, desktop and mobile clients currently logged in to your account." : "Clients web, desktop et mobiles actuellement connectés sur votre compte.",
     "Device" : "Périphérique",
     "Last activity" : "Dernière activité",
@@ -289,12 +290,6 @@
     "Use the credentials below to configure your app or device." : "Utilisez les informations d'identification ci-dessous pour configurer votre application ou appareil.",
     "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",
-    "Android app" : "Application Android",
-    "iOS app" : "Application iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous voulez supporter le projet <a href=\"https://nextcloud.com/contribute\" target=\"_blank\" rel=\"noreferrer\">rejoindre le développement</a> ou <a href=\"https://nextcloud.com/contribute\" target=\"_blank\" rel=\"noreferrer\">promouvoir</a> !",
-    "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion",
     "Show storage location" : "Afficher l'emplacement du stockage",
     "Show last log in" : "Montrer la dernière connexion",
     "Show user backend" : "Montrer la source de l'identifiant",
@@ -318,6 +313,10 @@
     "change full name" : "Modifier le nom complet",
     "set new password" : "Changer le mot de passe",
     "change email address" : "changer l'adresse e-mail",
-    "Default" : "Défaut"
+    "Default" : "Défaut",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Stockage externe",
+    "Updates" : "Mises à jour"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
index bfdcb9de110..7d79a676867 100644
--- a/settings/l10n/he.js
+++ b/settings/l10n/he.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "הדואר האלקטרוני נשמר",
     "Your full name has been changed." : "השם המלא שלך הוחלף",
     "Unable to change full name" : "לא ניתן לשנות שם מלא",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "הזהרות אבטחה והתקנה",
-    "Sharing" : "שיתוף",
-    "Server-side encryption" : "הצפנת צד שרת",
-    "External Storage" : "אחסון חיצוני",
-    "Cron" : "Cron",
-    "Email server" : "שרת דואר אלקטרוני",
-    "Log" : "יומן",
-    "Tips & tricks" : "עצות ותחבולות",
-    "Updates" : "עדכונים",
     "Couldn't remove app." : "לא ניתן להסיר את היישום.",
     "Language changed" : "שפה השתנתה",
     "Invalid request" : "בקשה לא חוקית",
@@ -118,17 +107,54 @@ OC.L10N.register(
     "Sessions" : "שיחות",
     "App passwords" : "סיסמת יישום",
     "Sync clients" : "סנכרון לקוחות",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "הכול (נושאים חמורים, שגיאות, אזהרות, מידע, ניפוי שגיאות)",
-    "Info, warnings, errors and fatal issues" : "מידע, אזהרות, שגיאות ונושאים חמורים",
-    "Warnings, errors and fatal issues" : "אזהרות, שגיאות ונושאים חמורים",
-    "Errors and fatal issues" : "שגיאות ונושאים חמורים",
-    "Fatal issues only" : "נושאים חמורים בלבד",
     "None" : "כלום",
     "Login" : "התחברות",
     "Plain" : "רגיל",
     "NT LAN Manager" : "מנהל רשת NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "שרת דואר אלקטרוני",
+    "Open documentation" : "תיעוד פתוח",
+    "This is used for sending out notifications." : "משתמשים בזה כדי לשלוח הודעות.",
+    "Send mode" : "מצב שליחה",
+    "Encryption" : "הצפנה",
+    "From address" : "מכתובת",
+    "mail" : "mail",
+    "Authentication method" : "שיטת אימות",
+    "Authentication required" : "נדרש אימות",
+    "Server address" : "כתובת שרת",
+    "Port" : "שער",
+    "Credentials" : "פרטי גישה",
+    "SMTP Username" : "שם משתמש SMTP ",
+    "SMTP Password" : "סיסמת SMTP",
+    "Store credentials" : "שמירת אישורים",
+    "Test email settings" : "בדיקת הגדרות דואר אלקטרוני",
+    "Send email" : "שליחת דואר אלקטרוני",
+    "Server-side encryption" : "הצפנת צד שרת",
+    "Enable server-side encryption" : "הפעלת הצפנה בצד שרת",
+    "Please read carefully before activating server-side encryption: " : "יש לקרוא בתשומת לב רבה לפני שמפעילים הצפנת צד שרת:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "ברגע שהצפנה מופעלת, כל הקבצים שיועלו לשרת מרגע זה יהיו מוצפנים בשרת. ניתן יהיה לנטרל את ההצפנה בעתיד רק אם מודול ההצפנה תומך בפונקציה זו, וכל התנאים המוקדמים (דהיינו הגדרת מפתח השחזור) מתקיימים.",
+    "Be aware that encryption always increases the file size." : "תשומת לב לכך שהצפנה בהכרח מגדילה את גודל הקובץ.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "תמיד טוב ליצור גיבוי קבוע למידע , במקרה של הצפנה יש לוודא שגם מפתחות ההצפנה מגובים עם המידע שלך.",
+    "This is the final warning: Do you really want to enable encryption?" : "זו הזהרה אחרונה: האם באמת ברצונך להפעיל הצפנה?",
+    "Enable encryption" : "אפשר הצפנה",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "לא נמצא מודול הצפנה, יש לאפשר מודול הצפנה בתפריט היישומים.",
+    "Select default encryption module:" : "יש לבחור מודול הצפנת ברירת מחדל:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "יש להמיר את מפתחות ההצפנה שלך בממערכת ההצפנה הישנה (ownCloud <= 8.0) למערכת החדשה. יש לאפשר את \"מודול הצפנה ברירת מחדש\" ולהריץ 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "יש להמיר את מפתחות ההצפנה שלך בממערכת ההצפנה הישנה (ownCloud <= 8.0) למערכת החדשה.",
+    "Start migration" : "התחלת המרה",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "הכול (נושאים חמורים, שגיאות, אזהרות, מידע, ניפוי שגיאות)",
+    "Info, warnings, errors and fatal issues" : "מידע, אזהרות, שגיאות ונושאים חמורים",
+    "Warnings, errors and fatal issues" : "אזהרות, שגיאות ונושאים חמורים",
+    "Errors and fatal issues" : "שגיאות ונושאים חמורים",
+    "Fatal issues only" : "נושאים חמורים בלבד",
+    "Log" : "יומן",
+    "What to log" : "מה לנטר בלוג",
+    "Download logfile" : "הורדת קובץ לוג",
+    "More" : "יותר",
+    "Less" : "פחות",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "קובץ הלוג גדול מ- 100 מגה-בייט. הורדה עלולה לקחת זמן רב!",
+    "Security & setup warnings" : "הזהרות אבטחה והתקנה",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "יש לבדוק את <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">הגדרות ההתקנה ↗</a> אחר הערות תצורת php ותצורת php של השרת שלך, בעיקר כשמשתמשים ב- php-fpm.",
     "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." : "תצורת קריאה בלבד הופעלה. תצורה זו מונעת קביעת מספר הגדרות באמצעות ממשק האינטרנט. יתר על כן, יש צורך להגדיר ההרשאות כתיבה באופן ידני לכל עדכון.",
@@ -144,7 +170,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "לא ניתן היה להפעיל את cronjob דרך CLI. השגיאות הבאות נצפתו:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "יש לבדוק בשבע עיניים את <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">מדריכי ההתקנה ↗</a>, ויש לחפש אחר שגיאות או הזהרות ב- <a href=\"#log-section\">לוג</a>.",
     "All checks passed." : "כל הבדיקות עברו",
-    "Open documentation" : "תיעוד פתוח",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "פעילות cron job אחרונה: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "פעילות cron job אחרונה: %s. משהו נראה שגוי.",
+    "Cron was not executed yet!" : "Cron עדיין לא בוצע!",
+    "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php רשום בשירות webcron לקרוא ל- cron.php בכל 15 דקות באמצעות http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "ניתן להשתמש בשירות cron לקרוא לקובץ cron.php בכל 15 דקות.",
+    "Version" : "גרסה",
+    "Sharing" : "שיתוף",
     "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
     "Allow users to share via link" : "אפשר למשתמשים לשתף באמצעות קישור",
     "Allow public uploads" : "אפשר העלאות ציבוריות",
@@ -161,44 +195,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "מניעת קבוצות משיתוף",
     "These groups will still be able to receive shares, but not to initiate them." : "קבוצות אלו עדיין יוכלו לקבל שיתופים, אך לא לשתף בעצמם.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "אפשר השלמה אוטומטית של שמות משתמש בתפריט שיתוף. אם תכונה זו מנוטרלת יש להכניס שם משתמש מלא.",
-    "Last cron job execution: %s." : "פעילות cron job אחרונה: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "פעילות cron job אחרונה: %s. משהו נראה שגוי.",
-    "Cron was not executed yet!" : "Cron עדיין לא בוצע!",
-    "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php רשום בשירות webcron לקרוא ל- cron.php בכל 15 דקות באמצעות http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "ניתן להשתמש בשירות cron לקרוא לקובץ cron.php בכל 15 דקות.",
-    "Enable server-side encryption" : "הפעלת הצפנה בצד שרת",
-    "Please read carefully before activating server-side encryption: " : "יש לקרוא בתשומת לב רבה לפני שמפעילים הצפנת צד שרת:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "ברגע שהצפנה מופעלת, כל הקבצים שיועלו לשרת מרגע זה יהיו מוצפנים בשרת. ניתן יהיה לנטרל את ההצפנה בעתיד רק אם מודול ההצפנה תומך בפונקציה זו, וכל התנאים המוקדמים (דהיינו הגדרת מפתח השחזור) מתקיימים.",
-    "Be aware that encryption always increases the file size." : "תשומת לב לכך שהצפנה בהכרח מגדילה את גודל הקובץ.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "תמיד טוב ליצור גיבוי קבוע למידע , במקרה של הצפנה יש לוודא שגם מפתחות ההצפנה מגובים עם המידע שלך.",
-    "This is the final warning: Do you really want to enable encryption?" : "זו הזהרה אחרונה: האם באמת ברצונך להפעיל הצפנה?",
-    "Enable encryption" : "אפשר הצפנה",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "לא נמצא מודול הצפנה, יש לאפשר מודול הצפנה בתפריט היישומים.",
-    "Select default encryption module:" : "יש לבחור מודול הצפנת ברירת מחדל:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "יש להמיר את מפתחות ההצפנה שלך בממערכת ההצפנה הישנה (ownCloud <= 8.0) למערכת החדשה. יש לאפשר את \"מודול הצפנה ברירת מחדש\" ולהריץ 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "יש להמיר את מפתחות ההצפנה שלך בממערכת ההצפנה הישנה (ownCloud <= 8.0) למערכת החדשה.",
-    "Start migration" : "התחלת המרה",
-    "This is used for sending out notifications." : "משתמשים בזה כדי לשלוח הודעות.",
-    "Send mode" : "מצב שליחה",
-    "Encryption" : "הצפנה",
-    "From address" : "מכתובת",
-    "mail" : "mail",
-    "Authentication method" : "שיטת אימות",
-    "Authentication required" : "נדרש אימות",
-    "Server address" : "כתובת שרת",
-    "Port" : "שער",
-    "Credentials" : "פרטי גישה",
-    "SMTP Username" : "שם משתמש SMTP ",
-    "SMTP Password" : "סיסמת SMTP",
-    "Store credentials" : "שמירת אישורים",
-    "Test email settings" : "בדיקת הגדרות דואר אלקטרוני",
-    "Send email" : "שליחת דואר אלקטרוני",
-    "What to log" : "מה לנטר בלוג",
-    "Download logfile" : "הורדת קובץ לוג",
-    "More" : "יותר",
-    "Less" : "פחות",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "קובץ הלוג גדול מ- 100 מגה-בייט. הורדה עלולה לקחת זמן רב!",
+    "Tips & tricks" : "עצות ותחבולות",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "המערכת משתמשת ב- SQLite כמסד נתונים. להתקנות גדולות אנו ממליצים לעבור למסדי נתונים צד אחורי אחרים.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "במיוחד כאשר משתמשים במחשב שולחני לסנכרון קבצים השימוש ב SQLite אינו מומלץ.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "למעבר למסד נתונים אחר יש להשתמש בכלי שורת פקודה: 'occ db:convert-type', או לעיין ב- <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">תיעוד↗</a>.",
@@ -208,7 +205,6 @@ OC.L10N.register(
     "Improving the config.php" : "שיפור קובץ config.php",
     "Theming" : "ערכת נושא",
     "Hardening and security guidance" : "הדרכת הקשחה ואבטחה",
-    "Version" : "גרסה",
     "Developer documentation" : "תיעוד מפתח",
     "Experimental applications ahead" : "ישומים ניסיוניים לפנים",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "יישומים ניסיוניים לא נבדקו לבעיות אבטחה, חדשים או ידועים כלא יציבים ותחת פיתוח כבד. התקנה שלהם עלולה להוביל לאיבוד מידע או לפרצות אבטחה.",
@@ -262,16 +258,16 @@ OC.L10N.register(
     "Change password" : "שינוי סיסמא",
     "Language" : "שפה",
     "Help translate" : "עזרה בתרגום",
-    "Name" : "שם",
-    "App name" : "שם יישום",
-    "Create new app password" : "יצירת סיסמת יישום חדשה",
-    "Username" : "שם משתמש",
-    "Done" : "הסתיים",
     "Get the apps to sync your files" : "קבלת היישומים לסנכרון הקבצים שלך",
     "Desktop client" : "מחשב אישי",
     "Android app" : "יישום אנדרואיד",
     "iOS app" : "יישום אייפון",
     "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב",
+    "Name" : "שם",
+    "App name" : "שם יישום",
+    "Create new app password" : "יצירת סיסמת יישום חדשה",
+    "Username" : "שם משתמש",
+    "Done" : "הסתיים",
     "Show storage location" : "הצגת מיקום אחסון",
     "Show last log in" : "הצגת כניסה אחרונה",
     "Show user backend" : "הצגת צד אחורי למשתמש",
@@ -290,6 +286,10 @@ OC.L10N.register(
     "change full name" : "שינוי שם מלא",
     "set new password" : "הגדרת סיסמא חדשה",
     "change email address" : "שינוי כתובת דואר אלקטרוני",
-    "Default" : "ברירת מחדל"
+    "Default" : "ברירת מחדל",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "אחסון חיצוני",
+    "Updates" : "עדכונים"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
index 89129380062..c1d9ac60ad9 100644
--- a/settings/l10n/he.json
+++ b/settings/l10n/he.json
@@ -33,17 +33,6 @@
     "Email saved" : "הדואר האלקטרוני נשמר",
     "Your full name has been changed." : "השם המלא שלך הוחלף",
     "Unable to change full name" : "לא ניתן לשנות שם מלא",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "הזהרות אבטחה והתקנה",
-    "Sharing" : "שיתוף",
-    "Server-side encryption" : "הצפנת צד שרת",
-    "External Storage" : "אחסון חיצוני",
-    "Cron" : "Cron",
-    "Email server" : "שרת דואר אלקטרוני",
-    "Log" : "יומן",
-    "Tips & tricks" : "עצות ותחבולות",
-    "Updates" : "עדכונים",
     "Couldn't remove app." : "לא ניתן להסיר את היישום.",
     "Language changed" : "שפה השתנתה",
     "Invalid request" : "בקשה לא חוקית",
@@ -116,17 +105,54 @@
     "Sessions" : "שיחות",
     "App passwords" : "סיסמת יישום",
     "Sync clients" : "סנכרון לקוחות",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "הכול (נושאים חמורים, שגיאות, אזהרות, מידע, ניפוי שגיאות)",
-    "Info, warnings, errors and fatal issues" : "מידע, אזהרות, שגיאות ונושאים חמורים",
-    "Warnings, errors and fatal issues" : "אזהרות, שגיאות ונושאים חמורים",
-    "Errors and fatal issues" : "שגיאות ונושאים חמורים",
-    "Fatal issues only" : "נושאים חמורים בלבד",
     "None" : "כלום",
     "Login" : "התחברות",
     "Plain" : "רגיל",
     "NT LAN Manager" : "מנהל רשת NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "שרת דואר אלקטרוני",
+    "Open documentation" : "תיעוד פתוח",
+    "This is used for sending out notifications." : "משתמשים בזה כדי לשלוח הודעות.",
+    "Send mode" : "מצב שליחה",
+    "Encryption" : "הצפנה",
+    "From address" : "מכתובת",
+    "mail" : "mail",
+    "Authentication method" : "שיטת אימות",
+    "Authentication required" : "נדרש אימות",
+    "Server address" : "כתובת שרת",
+    "Port" : "שער",
+    "Credentials" : "פרטי גישה",
+    "SMTP Username" : "שם משתמש SMTP ",
+    "SMTP Password" : "סיסמת SMTP",
+    "Store credentials" : "שמירת אישורים",
+    "Test email settings" : "בדיקת הגדרות דואר אלקטרוני",
+    "Send email" : "שליחת דואר אלקטרוני",
+    "Server-side encryption" : "הצפנת צד שרת",
+    "Enable server-side encryption" : "הפעלת הצפנה בצד שרת",
+    "Please read carefully before activating server-side encryption: " : "יש לקרוא בתשומת לב רבה לפני שמפעילים הצפנת צד שרת:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "ברגע שהצפנה מופעלת, כל הקבצים שיועלו לשרת מרגע זה יהיו מוצפנים בשרת. ניתן יהיה לנטרל את ההצפנה בעתיד רק אם מודול ההצפנה תומך בפונקציה זו, וכל התנאים המוקדמים (דהיינו הגדרת מפתח השחזור) מתקיימים.",
+    "Be aware that encryption always increases the file size." : "תשומת לב לכך שהצפנה בהכרח מגדילה את גודל הקובץ.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "תמיד טוב ליצור גיבוי קבוע למידע , במקרה של הצפנה יש לוודא שגם מפתחות ההצפנה מגובים עם המידע שלך.",
+    "This is the final warning: Do you really want to enable encryption?" : "זו הזהרה אחרונה: האם באמת ברצונך להפעיל הצפנה?",
+    "Enable encryption" : "אפשר הצפנה",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "לא נמצא מודול הצפנה, יש לאפשר מודול הצפנה בתפריט היישומים.",
+    "Select default encryption module:" : "יש לבחור מודול הצפנת ברירת מחדל:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "יש להמיר את מפתחות ההצפנה שלך בממערכת ההצפנה הישנה (ownCloud <= 8.0) למערכת החדשה. יש לאפשר את \"מודול הצפנה ברירת מחדש\" ולהריץ 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "יש להמיר את מפתחות ההצפנה שלך בממערכת ההצפנה הישנה (ownCloud <= 8.0) למערכת החדשה.",
+    "Start migration" : "התחלת המרה",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "הכול (נושאים חמורים, שגיאות, אזהרות, מידע, ניפוי שגיאות)",
+    "Info, warnings, errors and fatal issues" : "מידע, אזהרות, שגיאות ונושאים חמורים",
+    "Warnings, errors and fatal issues" : "אזהרות, שגיאות ונושאים חמורים",
+    "Errors and fatal issues" : "שגיאות ונושאים חמורים",
+    "Fatal issues only" : "נושאים חמורים בלבד",
+    "Log" : "יומן",
+    "What to log" : "מה לנטר בלוג",
+    "Download logfile" : "הורדת קובץ לוג",
+    "More" : "יותר",
+    "Less" : "פחות",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "קובץ הלוג גדול מ- 100 מגה-בייט. הורדה עלולה לקחת זמן רב!",
+    "Security & setup warnings" : "הזהרות אבטחה והתקנה",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "יש לבדוק את <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">הגדרות ההתקנה ↗</a> אחר הערות תצורת php ותצורת php של השרת שלך, בעיקר כשמשתמשים ב- php-fpm.",
     "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." : "תצורת קריאה בלבד הופעלה. תצורה זו מונעת קביעת מספר הגדרות באמצעות ממשק האינטרנט. יתר על כן, יש צורך להגדיר ההרשאות כתיבה באופן ידני לכל עדכון.",
@@ -142,7 +168,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "לא ניתן היה להפעיל את cronjob דרך CLI. השגיאות הבאות נצפתו:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "יש לבדוק בשבע עיניים את <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">מדריכי ההתקנה ↗</a>, ויש לחפש אחר שגיאות או הזהרות ב- <a href=\"#log-section\">לוג</a>.",
     "All checks passed." : "כל הבדיקות עברו",
-    "Open documentation" : "תיעוד פתוח",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "פעילות cron job אחרונה: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "פעילות cron job אחרונה: %s. משהו נראה שגוי.",
+    "Cron was not executed yet!" : "Cron עדיין לא בוצע!",
+    "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php רשום בשירות webcron לקרוא ל- cron.php בכל 15 דקות באמצעות http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "ניתן להשתמש בשירות cron לקרוא לקובץ cron.php בכל 15 דקות.",
+    "Version" : "גרסה",
+    "Sharing" : "שיתוף",
     "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
     "Allow users to share via link" : "אפשר למשתמשים לשתף באמצעות קישור",
     "Allow public uploads" : "אפשר העלאות ציבוריות",
@@ -159,44 +193,7 @@
     "Exclude groups from sharing" : "מניעת קבוצות משיתוף",
     "These groups will still be able to receive shares, but not to initiate them." : "קבוצות אלו עדיין יוכלו לקבל שיתופים, אך לא לשתף בעצמם.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "אפשר השלמה אוטומטית של שמות משתמש בתפריט שיתוף. אם תכונה זו מנוטרלת יש להכניס שם משתמש מלא.",
-    "Last cron job execution: %s." : "פעילות cron job אחרונה: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "פעילות cron job אחרונה: %s. משהו נראה שגוי.",
-    "Cron was not executed yet!" : "Cron עדיין לא בוצע!",
-    "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php רשום בשירות webcron לקרוא ל- cron.php בכל 15 דקות באמצעות http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "ניתן להשתמש בשירות cron לקרוא לקובץ cron.php בכל 15 דקות.",
-    "Enable server-side encryption" : "הפעלת הצפנה בצד שרת",
-    "Please read carefully before activating server-side encryption: " : "יש לקרוא בתשומת לב רבה לפני שמפעילים הצפנת צד שרת:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "ברגע שהצפנה מופעלת, כל הקבצים שיועלו לשרת מרגע זה יהיו מוצפנים בשרת. ניתן יהיה לנטרל את ההצפנה בעתיד רק אם מודול ההצפנה תומך בפונקציה זו, וכל התנאים המוקדמים (דהיינו הגדרת מפתח השחזור) מתקיימים.",
-    "Be aware that encryption always increases the file size." : "תשומת לב לכך שהצפנה בהכרח מגדילה את גודל הקובץ.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "תמיד טוב ליצור גיבוי קבוע למידע , במקרה של הצפנה יש לוודא שגם מפתחות ההצפנה מגובים עם המידע שלך.",
-    "This is the final warning: Do you really want to enable encryption?" : "זו הזהרה אחרונה: האם באמת ברצונך להפעיל הצפנה?",
-    "Enable encryption" : "אפשר הצפנה",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "לא נמצא מודול הצפנה, יש לאפשר מודול הצפנה בתפריט היישומים.",
-    "Select default encryption module:" : "יש לבחור מודול הצפנת ברירת מחדל:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "יש להמיר את מפתחות ההצפנה שלך בממערכת ההצפנה הישנה (ownCloud <= 8.0) למערכת החדשה. יש לאפשר את \"מודול הצפנה ברירת מחדש\" ולהריץ 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "יש להמיר את מפתחות ההצפנה שלך בממערכת ההצפנה הישנה (ownCloud <= 8.0) למערכת החדשה.",
-    "Start migration" : "התחלת המרה",
-    "This is used for sending out notifications." : "משתמשים בזה כדי לשלוח הודעות.",
-    "Send mode" : "מצב שליחה",
-    "Encryption" : "הצפנה",
-    "From address" : "מכתובת",
-    "mail" : "mail",
-    "Authentication method" : "שיטת אימות",
-    "Authentication required" : "נדרש אימות",
-    "Server address" : "כתובת שרת",
-    "Port" : "שער",
-    "Credentials" : "פרטי גישה",
-    "SMTP Username" : "שם משתמש SMTP ",
-    "SMTP Password" : "סיסמת SMTP",
-    "Store credentials" : "שמירת אישורים",
-    "Test email settings" : "בדיקת הגדרות דואר אלקטרוני",
-    "Send email" : "שליחת דואר אלקטרוני",
-    "What to log" : "מה לנטר בלוג",
-    "Download logfile" : "הורדת קובץ לוג",
-    "More" : "יותר",
-    "Less" : "פחות",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "קובץ הלוג גדול מ- 100 מגה-בייט. הורדה עלולה לקחת זמן רב!",
+    "Tips & tricks" : "עצות ותחבולות",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "המערכת משתמשת ב- SQLite כמסד נתונים. להתקנות גדולות אנו ממליצים לעבור למסדי נתונים צד אחורי אחרים.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "במיוחד כאשר משתמשים במחשב שולחני לסנכרון קבצים השימוש ב SQLite אינו מומלץ.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "למעבר למסד נתונים אחר יש להשתמש בכלי שורת פקודה: 'occ db:convert-type', או לעיין ב- <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">תיעוד↗</a>.",
@@ -206,7 +203,6 @@
     "Improving the config.php" : "שיפור קובץ config.php",
     "Theming" : "ערכת נושא",
     "Hardening and security guidance" : "הדרכת הקשחה ואבטחה",
-    "Version" : "גרסה",
     "Developer documentation" : "תיעוד מפתח",
     "Experimental applications ahead" : "ישומים ניסיוניים לפנים",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "יישומים ניסיוניים לא נבדקו לבעיות אבטחה, חדשים או ידועים כלא יציבים ותחת פיתוח כבד. התקנה שלהם עלולה להוביל לאיבוד מידע או לפרצות אבטחה.",
@@ -260,16 +256,16 @@
     "Change password" : "שינוי סיסמא",
     "Language" : "שפה",
     "Help translate" : "עזרה בתרגום",
-    "Name" : "שם",
-    "App name" : "שם יישום",
-    "Create new app password" : "יצירת סיסמת יישום חדשה",
-    "Username" : "שם משתמש",
-    "Done" : "הסתיים",
     "Get the apps to sync your files" : "קבלת היישומים לסנכרון הקבצים שלך",
     "Desktop client" : "מחשב אישי",
     "Android app" : "יישום אנדרואיד",
     "iOS app" : "יישום אייפון",
     "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב",
+    "Name" : "שם",
+    "App name" : "שם יישום",
+    "Create new app password" : "יצירת סיסמת יישום חדשה",
+    "Username" : "שם משתמש",
+    "Done" : "הסתיים",
     "Show storage location" : "הצגת מיקום אחסון",
     "Show last log in" : "הצגת כניסה אחרונה",
     "Show user backend" : "הצגת צד אחורי למשתמש",
@@ -288,6 +284,10 @@
     "change full name" : "שינוי שם מלא",
     "set new password" : "הגדרת סיסמא חדשה",
     "change email address" : "שינוי כתובת דואר אלקטרוני",
-    "Default" : "ברירת מחדל"
+    "Default" : "ברירת מחדל",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "אחסון חיצוני",
+    "Updates" : "עדכונים"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index ab6b128304e..224824937ac 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "E-mail elmentve!",
     "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
     "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Biztonsági és telepítési figyelmeztetések",
-    "Sharing" : "Megosztás",
-    "Server-side encryption" : "Szerveroldali titkosítás",
-    "External Storage" : "Külső tárolási szolgáltatások becsatolása",
-    "Cron" : "Ütemezett feladatok",
-    "Email server" : "E-mail szerver",
-    "Log" : "Naplózás",
-    "Tips & tricks" : "Tippek és trükkök",
-    "Updates" : "Frissítések",
     "Couldn't remove app." : "Az alkalmazást nem sikerült eltávolítani.",
     "Language changed" : "A nyelv megváltozott",
     "Invalid request" : "Érvénytelen kérés",
@@ -119,17 +108,55 @@ OC.L10N.register(
     "Sessions" : "Munkamenetek",
     "App passwords" : "Applikáció jelszavak",
     "Sync clients" : "Szinkronizáló kliensek",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
-    "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
-    "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák",
-    "Errors and fatal issues" : "Hibák és végzetes hibák",
-    "Fatal issues only" : "Csak a végzetes hibák",
     "None" : "Egyik sem",
     "Login" : "Login",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-mail szerver",
+    "Open documentation" : "Dokumentáció megnyitása",
+    "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
+    "Send mode" : "Küldési mód",
+    "Encryption" : "Titkosítás",
+    "From address" : "A feladó címe",
+    "mail" : "mail",
+    "Authentication method" : "A felhasználóazonosítás módszere",
+    "Authentication required" : "Felhasználóazonosítás szükséges",
+    "Server address" : "A kiszolgáló címe",
+    "Port" : "Port",
+    "Credentials" : "Azonosítók",
+    "SMTP Username" : "SMTP felhasználónév",
+    "SMTP Password" : "SMTP jelszó",
+    "Store credentials" : "Azonosítók eltárolása",
+    "Test email settings" : "Az e-mail beállítások ellenőrzése",
+    "Send email" : "E-mail küldése",
+    "Server-side encryption" : "Szerveroldali titkosítás",
+    "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
+    "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később csak akkor lehet visszafordítani, ha azt az aktív titkosítási modul támogatja és minden elő-követelmény (például helyreállító kulcs) teljesül.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "A titkosítás önmagában nem garantálja a rendszer biztonságát. Kérem olvassa el a dokumentációt, hogy további információkat szerezzen a titkosítási applikáció működéséről, és a támogatott lehetőségekről.",
+    "Be aware that encryption always increases the file size." : "Ügyeljen arra, hogy a titkosítás mindig megnöveli a fájl méretét!",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Mindig jó ötlet rendszeres biztonsági mentést készíteni az adatokról. Titkosítás esetén a titkosító kulcsok biztonsági mentését elkülönítve tárolja az adatoktól!",
+    "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
+    "Enable encryption" : "Titkosítás engedélyezése",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
+    "Select default encryption module:" : "Alapértelmezett titkosítási modul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba. Kérjük, engedélyezd az „Alapértelmezett titkosítási modul”-t és futtasd ezt: occ encryption:migrate",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba.",
+    "Start migration" : "Migrálás indítása",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
+    "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
+    "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák",
+    "Errors and fatal issues" : "Hibák és végzetes hibák",
+    "Fatal issues only" : "Csak a végzetes hibák",
+    "Log" : "Naplózás",
+    "What to log" : "Mit naplózzon",
+    "Download logfile" : "Naplófájl letöltése",
+    "More" : "Több",
+    "Less" : "Kevesebb",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "A naplófájl 100MB-nál nagyobb. A letöltése hosszabb időt vehet igénybe.",
+    "Security & setup warnings" : "Biztonsági és telepítési figyelmeztetések",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Úgy tűnik, hogy a PHP nem tudja olvasni a rendszer környezeti változóit. A getenv(\"PATH\") teszt visszatérési értéke üres.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Kérjük, ellenőrizze a <a target=\"_blank\" rel=\"noreferrer\"  href=\"%s\">telepítési dokumentációt ↗</a> a PHP konfigurációs beállításaival kapcsolatban, főleg ha PHP-FPM-et használ.",
     "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." : "Csak olvasható beállítófájl engedélyezve. Ez meggátolja a beállítások módosítását a webes felületről. Továbbá, a fájlt kézzel kell írhatóvá tenni minden frissítés alkalmával.",
@@ -145,7 +172,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Az ütemezett feladat (cronjob) nem futott le parancssorból. A következő hibák tűntek fel:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Kérjük, ellenőrizze a <a target=\"_blank\" rel=\"noreferrer\"  href=\"%s\">telepítési dokumentációt ↗</a> és ellenőrizze a <a href=\"#log-section\">naplófájlt</a>, hogy tartalmaz-e bármilyen hibát vagy figyelmeztetést.",
     "All checks passed." : "Minden ellenőrzés sikeres.",
-    "Open documentation" : "Dokumentáció megnyitása",
+    "Cron" : "Ütemezett feladatok",
+    "Last cron job execution: %s." : "Az utolsó cron feladat ekkor futott le: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Valami nincs rendben.",
+    "Cron was not executed yet!" : "A cron feladat még nem futott le!",
+    "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
+    "Version" : "Verzió",
+    "Sharing" : "Megosztás",
     "Allow apps to use the Share API" : "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
     "Allow users to share via link" : "Engedjük meg az állományok linkekkel történő megosztását",
     "Allow public uploads" : "Nyilvános feltöltés engedélyezése",
@@ -162,45 +197,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Csoportok megosztási jogának tiltása",
     "These groups will still be able to receive shares, but not to initiate them." : "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Felhasználónév automatikus befejezése engedélyezése a megosztás ablakban. Ha le van tiltva, akkor a teljes felhasználónevet kell beírni.",
-    "Last cron job execution: %s." : "Az utolsó cron feladat ekkor futott le: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Valami nincs rendben.",
-    "Cron was not executed yet!" : "A cron feladat még nem futott le!",
-    "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
-    "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
-    "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később csak akkor lehet visszafordítani, ha azt az aktív titkosítási modul támogatja és minden elő-követelmény (például helyreállító kulcs) teljesül.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "A titkosítás önmagában nem garantálja a rendszer biztonságát. Kérem olvassa el a dokumentációt, hogy további információkat szerezzen a titkosítási applikáció működéséről, és a támogatott lehetőségekről.",
-    "Be aware that encryption always increases the file size." : "Ügyeljen arra, hogy a titkosítás mindig megnöveli a fájl méretét!",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Mindig jó ötlet rendszeres biztonsági mentést készíteni az adatokról. Titkosítás esetén a titkosító kulcsok biztonsági mentését elkülönítve tárolja az adatoktól!",
-    "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
-    "Enable encryption" : "Titkosítás engedélyezése",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
-    "Select default encryption module:" : "Alapértelmezett titkosítási modul:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba. Kérjük, engedélyezd az „Alapértelmezett titkosítási modul”-t és futtasd ezt: occ encryption:migrate",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba.",
-    "Start migration" : "Migrálás indítása",
-    "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
-    "Send mode" : "Küldési mód",
-    "Encryption" : "Titkosítás",
-    "From address" : "A feladó címe",
-    "mail" : "mail",
-    "Authentication method" : "A felhasználóazonosítás módszere",
-    "Authentication required" : "Felhasználóazonosítás szükséges",
-    "Server address" : "A kiszolgáló címe",
-    "Port" : "Port",
-    "Credentials" : "Azonosítók",
-    "SMTP Username" : "SMTP felhasználónév",
-    "SMTP Password" : "SMTP jelszó",
-    "Store credentials" : "Azonosítók eltárolása",
-    "Test email settings" : "Az e-mail beállítások ellenőrzése",
-    "Send email" : "E-mail küldése",
-    "What to log" : "Mit naplózzon",
-    "Download logfile" : "Naplófájl letöltése",
-    "More" : "Több",
-    "Less" : "Kevesebb",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "A naplófájl 100MB-nál nagyobb. A letöltése hosszabb időt vehet igénybe.",
+    "Tips & tricks" : "Tippek és trükkök",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy váltson másik adatbázis háttérkiszolgálóra",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Amikor az asztali klienset használja fálj szinkronizációra, akkor az SQLite használata nem ajánlott.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Más adatbázisról való áttéréshez használja a parancssort: 'occ db:convert-type', vagy keresse fel a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentációt ↗</a>.",
@@ -210,7 +207,6 @@ OC.L10N.register(
     "Improving the config.php" : "config.php javítása",
     "Theming" : "Témázás",
     "Hardening and security guidance" : "Erősítési és biztonsági útmutató",
-    "Version" : "Verzió",
     "Developer documentation" : "Fejlesztői dokumentáció",
     "Experimental applications ahead" : "Kísérleti alkalmazások előre",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "A kísérleti applikációk nincsenek biztonsági ellenőrizve, ismert vagy ismeretlen hibák lehetnek bennük és aktív fejlesztés alatt állnak. A telepítésük adatvesztéshez vezethet, vagy biztonsági kockázata lehet.",
@@ -266,18 +262,17 @@ OC.L10N.register(
     "Change password" : "A jelszó megváltoztatása",
     "Language" : "Nyelv",
     "Help translate" : "Segítsen a fordításban!",
+    "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",
+    "Android app" : "Android applikáció",
+    "iOS app" : "IOS applikáció",
+    "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
     "Name" : "Név",
     "App name" : "Alkalmazás név",
     "Create new app password" : "Új alkalmazás jelszó létrehozása",
     "Use the credentials below to configure your app or device." : "Használja a lenti hitelesítő adatokat hogy beállítsa az applikációját vagy eszközét.",
     "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",
-    "Android app" : "Android applikáció",
-    "iOS app" : "IOS applikáció",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha támogatni szeretnéd a projektet \n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hírdesd</a>!",
-    "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
     "Show storage location" : "Háttértároló helyének mutatása",
     "Show last log in" : "Utolsó bejelentkezés megjelenítése",
     "Show user backend" : "Felhasználói háttér mutatása",
@@ -296,6 +291,10 @@ OC.L10N.register(
     "change full name" : "a teljes név megváltoztatása",
     "set new password" : "új jelszó beállítása",
     "change email address" : "e-mail cím megváltoztatása",
-    "Default" : "Alapértelmezett"
+    "Default" : "Alapértelmezett",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Külső tárolási szolgáltatások becsatolása",
+    "Updates" : "Frissítések"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index c8880024a04..ddceab5648e 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -33,17 +33,6 @@
     "Email saved" : "E-mail elmentve!",
     "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
     "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Biztonsági és telepítési figyelmeztetések",
-    "Sharing" : "Megosztás",
-    "Server-side encryption" : "Szerveroldali titkosítás",
-    "External Storage" : "Külső tárolási szolgáltatások becsatolása",
-    "Cron" : "Ütemezett feladatok",
-    "Email server" : "E-mail szerver",
-    "Log" : "Naplózás",
-    "Tips & tricks" : "Tippek és trükkök",
-    "Updates" : "Frissítések",
     "Couldn't remove app." : "Az alkalmazást nem sikerült eltávolítani.",
     "Language changed" : "A nyelv megváltozott",
     "Invalid request" : "Érvénytelen kérés",
@@ -117,17 +106,55 @@
     "Sessions" : "Munkamenetek",
     "App passwords" : "Applikáció jelszavak",
     "Sync clients" : "Szinkronizáló kliensek",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
-    "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
-    "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák",
-    "Errors and fatal issues" : "Hibák és végzetes hibák",
-    "Fatal issues only" : "Csak a végzetes hibák",
     "None" : "Egyik sem",
     "Login" : "Login",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-mail szerver",
+    "Open documentation" : "Dokumentáció megnyitása",
+    "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
+    "Send mode" : "Küldési mód",
+    "Encryption" : "Titkosítás",
+    "From address" : "A feladó címe",
+    "mail" : "mail",
+    "Authentication method" : "A felhasználóazonosítás módszere",
+    "Authentication required" : "Felhasználóazonosítás szükséges",
+    "Server address" : "A kiszolgáló címe",
+    "Port" : "Port",
+    "Credentials" : "Azonosítók",
+    "SMTP Username" : "SMTP felhasználónév",
+    "SMTP Password" : "SMTP jelszó",
+    "Store credentials" : "Azonosítók eltárolása",
+    "Test email settings" : "Az e-mail beállítások ellenőrzése",
+    "Send email" : "E-mail küldése",
+    "Server-side encryption" : "Szerveroldali titkosítás",
+    "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
+    "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később csak akkor lehet visszafordítani, ha azt az aktív titkosítási modul támogatja és minden elő-követelmény (például helyreállító kulcs) teljesül.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "A titkosítás önmagában nem garantálja a rendszer biztonságát. Kérem olvassa el a dokumentációt, hogy további információkat szerezzen a titkosítási applikáció működéséről, és a támogatott lehetőségekről.",
+    "Be aware that encryption always increases the file size." : "Ügyeljen arra, hogy a titkosítás mindig megnöveli a fájl méretét!",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Mindig jó ötlet rendszeres biztonsági mentést készíteni az adatokról. Titkosítás esetén a titkosító kulcsok biztonsági mentését elkülönítve tárolja az adatoktól!",
+    "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
+    "Enable encryption" : "Titkosítás engedélyezése",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
+    "Select default encryption module:" : "Alapértelmezett titkosítási modul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba. Kérjük, engedélyezd az „Alapértelmezett titkosítási modul”-t és futtasd ezt: occ encryption:migrate",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba.",
+    "Start migration" : "Migrálás indítása",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
+    "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
+    "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák",
+    "Errors and fatal issues" : "Hibák és végzetes hibák",
+    "Fatal issues only" : "Csak a végzetes hibák",
+    "Log" : "Naplózás",
+    "What to log" : "Mit naplózzon",
+    "Download logfile" : "Naplófájl letöltése",
+    "More" : "Több",
+    "Less" : "Kevesebb",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "A naplófájl 100MB-nál nagyobb. A letöltése hosszabb időt vehet igénybe.",
+    "Security & setup warnings" : "Biztonsági és telepítési figyelmeztetések",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Úgy tűnik, hogy a PHP nem tudja olvasni a rendszer környezeti változóit. A getenv(\"PATH\") teszt visszatérési értéke üres.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Kérjük, ellenőrizze a <a target=\"_blank\" rel=\"noreferrer\"  href=\"%s\">telepítési dokumentációt ↗</a> a PHP konfigurációs beállításaival kapcsolatban, főleg ha PHP-FPM-et használ.",
     "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." : "Csak olvasható beállítófájl engedélyezve. Ez meggátolja a beállítások módosítását a webes felületről. Továbbá, a fájlt kézzel kell írhatóvá tenni minden frissítés alkalmával.",
@@ -143,7 +170,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Az ütemezett feladat (cronjob) nem futott le parancssorból. A következő hibák tűntek fel:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Kérjük, ellenőrizze a <a target=\"_blank\" rel=\"noreferrer\"  href=\"%s\">telepítési dokumentációt ↗</a> és ellenőrizze a <a href=\"#log-section\">naplófájlt</a>, hogy tartalmaz-e bármilyen hibát vagy figyelmeztetést.",
     "All checks passed." : "Minden ellenőrzés sikeres.",
-    "Open documentation" : "Dokumentáció megnyitása",
+    "Cron" : "Ütemezett feladatok",
+    "Last cron job execution: %s." : "Az utolsó cron feladat ekkor futott le: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Valami nincs rendben.",
+    "Cron was not executed yet!" : "A cron feladat még nem futott le!",
+    "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
+    "Version" : "Verzió",
+    "Sharing" : "Megosztás",
     "Allow apps to use the Share API" : "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
     "Allow users to share via link" : "Engedjük meg az állományok linkekkel történő megosztását",
     "Allow public uploads" : "Nyilvános feltöltés engedélyezése",
@@ -160,45 +195,7 @@
     "Exclude groups from sharing" : "Csoportok megosztási jogának tiltása",
     "These groups will still be able to receive shares, but not to initiate them." : "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Felhasználónév automatikus befejezése engedélyezése a megosztás ablakban. Ha le van tiltva, akkor a teljes felhasználónevet kell beírni.",
-    "Last cron job execution: %s." : "Az utolsó cron feladat ekkor futott le: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Valami nincs rendben.",
-    "Cron was not executed yet!" : "A cron feladat még nem futott le!",
-    "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
-    "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
-    "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később csak akkor lehet visszafordítani, ha azt az aktív titkosítási modul támogatja és minden elő-követelmény (például helyreállító kulcs) teljesül.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "A titkosítás önmagában nem garantálja a rendszer biztonságát. Kérem olvassa el a dokumentációt, hogy további információkat szerezzen a titkosítási applikáció működéséről, és a támogatott lehetőségekről.",
-    "Be aware that encryption always increases the file size." : "Ügyeljen arra, hogy a titkosítás mindig megnöveli a fájl méretét!",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Mindig jó ötlet rendszeres biztonsági mentést készíteni az adatokról. Titkosítás esetén a titkosító kulcsok biztonsági mentését elkülönítve tárolja az adatoktól!",
-    "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
-    "Enable encryption" : "Titkosítás engedélyezése",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
-    "Select default encryption module:" : "Alapértelmezett titkosítási modul:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba. Kérjük, engedélyezd az „Alapértelmezett titkosítási modul”-t és futtasd ezt: occ encryption:migrate",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba.",
-    "Start migration" : "Migrálás indítása",
-    "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
-    "Send mode" : "Küldési mód",
-    "Encryption" : "Titkosítás",
-    "From address" : "A feladó címe",
-    "mail" : "mail",
-    "Authentication method" : "A felhasználóazonosítás módszere",
-    "Authentication required" : "Felhasználóazonosítás szükséges",
-    "Server address" : "A kiszolgáló címe",
-    "Port" : "Port",
-    "Credentials" : "Azonosítók",
-    "SMTP Username" : "SMTP felhasználónév",
-    "SMTP Password" : "SMTP jelszó",
-    "Store credentials" : "Azonosítók eltárolása",
-    "Test email settings" : "Az e-mail beállítások ellenőrzése",
-    "Send email" : "E-mail küldése",
-    "What to log" : "Mit naplózzon",
-    "Download logfile" : "Naplófájl letöltése",
-    "More" : "Több",
-    "Less" : "Kevesebb",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "A naplófájl 100MB-nál nagyobb. A letöltése hosszabb időt vehet igénybe.",
+    "Tips & tricks" : "Tippek és trükkök",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy váltson másik adatbázis háttérkiszolgálóra",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Amikor az asztali klienset használja fálj szinkronizációra, akkor az SQLite használata nem ajánlott.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Más adatbázisról való áttéréshez használja a parancssort: 'occ db:convert-type', vagy keresse fel a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentációt ↗</a>.",
@@ -208,7 +205,6 @@
     "Improving the config.php" : "config.php javítása",
     "Theming" : "Témázás",
     "Hardening and security guidance" : "Erősítési és biztonsági útmutató",
-    "Version" : "Verzió",
     "Developer documentation" : "Fejlesztői dokumentáció",
     "Experimental applications ahead" : "Kísérleti alkalmazások előre",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "A kísérleti applikációk nincsenek biztonsági ellenőrizve, ismert vagy ismeretlen hibák lehetnek bennük és aktív fejlesztés alatt állnak. A telepítésük adatvesztéshez vezethet, vagy biztonsági kockázata lehet.",
@@ -264,18 +260,17 @@
     "Change password" : "A jelszó megváltoztatása",
     "Language" : "Nyelv",
     "Help translate" : "Segítsen a fordításban!",
+    "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",
+    "Android app" : "Android applikáció",
+    "iOS app" : "IOS applikáció",
+    "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
     "Name" : "Név",
     "App name" : "Alkalmazás név",
     "Create new app password" : "Új alkalmazás jelszó létrehozása",
     "Use the credentials below to configure your app or device." : "Használja a lenti hitelesítő adatokat hogy beállítsa az applikációját vagy eszközét.",
     "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",
-    "Android app" : "Android applikáció",
-    "iOS app" : "IOS applikáció",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha támogatni szeretnéd a projektet \n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hírdesd</a>!",
-    "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
     "Show storage location" : "Háttértároló helyének mutatása",
     "Show last log in" : "Utolsó bejelentkezés megjelenítése",
     "Show user backend" : "Felhasználói háttér mutatása",
@@ -294,6 +289,10 @@
     "change full name" : "a teljes név megváltoztatása",
     "set new password" : "új jelszó beállítása",
     "change email address" : "e-mail cím megváltoztatása",
-    "Default" : "Alapértelmezett"
+    "Default" : "Alapértelmezett",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Külső tárolási szolgáltatások becsatolása",
+    "Updates" : "Frissítések"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index c3d69e660b6..7587ca39cc5 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "Email disimpan",
     "Your full name has been changed." : "Nama lengkap Anda telah diubah",
     "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Peringatan Keamanan & Pengaturan",
-    "Sharing" : "Berbagi",
-    "Server-side encryption" : "Enkripsi sisi-server",
-    "External Storage" : "Penyimpanan Eksternal",
-    "Cron" : "Cron",
-    "Email server" : "Server email",
-    "Log" : "Log",
-    "Tips & tricks" : "Tips & trik",
-    "Updates" : "Pembaruan",
     "Couldn't remove app." : "Tidak dapat menghapus aplikasi.",
     "Language changed" : "Bahasa telah diubah",
     "Invalid request" : "Permintaan tidak valid",
@@ -137,17 +126,55 @@ OC.L10N.register(
     "Sessions" : "Sesi",
     "App passwords" : "Sandi aplikasi",
     "Sync clients" : "Klien sync",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, kesalahan, peringatan, info, debug)",
-    "Info, warnings, errors and fatal issues" : "Info, peringatan, kesalahan dan masalah fatal",
-    "Warnings, errors and fatal issues" : "Peringatan, kesalahan dan masalah fatal",
-    "Errors and fatal issues" : "Kesalahan dan masalah fatal",
-    "Fatal issues only" : "Hanya masalah fatal",
     "None" : "Tidak ada",
     "Login" : "Masuk",
     "Plain" : "Biasa",
     "NT LAN Manager" : "Manajer NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Server email",
+    "Open documentation" : "Buka dokumentasi",
+    "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
+    "Send mode" : "Modus kirim",
+    "Encryption" : "Enkripsi",
+    "From address" : "Dari alamat",
+    "mail" : "email",
+    "Authentication method" : "Metode otentikasi",
+    "Authentication required" : "Diperlukan otentikasi",
+    "Server address" : "Alamat server",
+    "Port" : "Port",
+    "Credentials" : "Kredensial",
+    "SMTP Username" : "Nama pengguna SMTP",
+    "SMTP Password" : "Sandi SMTP",
+    "Store credentials" : "Simpan kredensial",
+    "Test email settings" : "Pengaturan email percobaan",
+    "Send email" : "Kirim email",
+    "Server-side encryption" : "Enkripsi sisi-server",
+    "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
+    "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Setelah enkripsi diaktifkan, semua berkas yang diunggah pada server mulai saat ini akan dienkripsi saat singgah pada server. Penonaktifan enkripsi hanya mungkin berhasil jika modul enkripsi yang aktif mendukung fungsi ini dan semua prasyarat (misalnya pengaturan kunci pemulihan) sudah terpenuhi.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak dapat menjamin keamanan sistem. Silakan lihat dokumentasi untuk informasi lebih lanjut dalam bagaimana aplikasi enkripsi bekerja, dan kasus pendukung.",
+    "Be aware that encryption always increases the file size." : "Ingat bahwa enkripsi selalu menambah ukuran berkas.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Alangkah baiknya untuk membuat cadangan data secara rutin, dalam kasus enkripsi, pastikan untuk mencadangkan kunci enkripsi bersama dengan data Anda.",
+    "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
+    "Enable encryption" : "Aktifkan enkripsi",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
+    "Select default encryption module:" : "Pilih modul enkripsi baku:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Anda perlu mengganti kunci enkrispi Anda dari enkripsi lama (ownCloud <= 8.0) ke yang baru. Mohon aktifkan \"Modul enkripsi standar\" dan jalankan 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Anda perlu untuk mengubah kunci enkripsi dari enkripsi lama (ownCloud <= 8.0) ke yang baru.",
+    "Start migration" : "Mulai migrasi",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, kesalahan, peringatan, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, peringatan, kesalahan dan masalah fatal",
+    "Warnings, errors and fatal issues" : "Peringatan, kesalahan dan masalah fatal",
+    "Errors and fatal issues" : "Kesalahan dan masalah fatal",
+    "Fatal issues only" : "Hanya masalah fatal",
+    "Log" : "Log",
+    "What to log" : "Apa yang akan di log",
+    "Download logfile" : "Unduh berkas log",
+    "More" : "Lainnya",
+    "Less" : "Ciutkan",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
+    "Security & setup warnings" : "Peringatan Keamanan & Pengaturan",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon cek <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentasi instalasi↗</a> untuk catatan konfigurasi php dan konfigurasi PHP server Anda, khususnya saat menggunakan php-fpm.",
     "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." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
@@ -164,7 +191,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon cek <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">petunjuk instalasi ↗</a>, dan cek masalah atau peringatan di <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Semua pemeriksaan lulus.",
-    "Open documentation" : "Buka dokumentasi",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Eksekusi penjadwalan cron terakhir: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Eksekusi penjadwalan cron terakhir: %s. Kelihatannya ada yang salah.",
+    "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
+    "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
+    "Version" : "Versi",
+    "Sharing" : "Berbagi",
     "Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
     "Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
     "Allow public uploads" : "Izinkan unggahan publik",
@@ -181,45 +216,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
     "These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Izinkan penyelesai otomatis pada nama pengguna di jendela dialog berbagi. Jika ini dinonaktifkan, nama pengguna utuh perlu dimasukkan.",
-    "Last cron job execution: %s." : "Eksekusi penjadwalan cron terakhir: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Eksekusi penjadwalan cron terakhir: %s. Kelihatannya ada yang salah.",
-    "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
-    "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
-    "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
-    "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Setelah enkripsi diaktifkan, semua berkas yang diunggah pada server mulai saat ini akan dienkripsi saat singgah pada server. Penonaktifan enkripsi hanya mungkin berhasil jika modul enkripsi yang aktif mendukung fungsi ini dan semua prasyarat (misalnya pengaturan kunci pemulihan) sudah terpenuhi.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak dapat menjamin keamanan sistem. Silakan lihat dokumentasi untuk informasi lebih lanjut dalam bagaimana aplikasi enkripsi bekerja, dan kasus pendukung.",
-    "Be aware that encryption always increases the file size." : "Ingat bahwa enkripsi selalu menambah ukuran berkas.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Alangkah baiknya untuk membuat cadangan data secara rutin, dalam kasus enkripsi, pastikan untuk mencadangkan kunci enkripsi bersama dengan data Anda.",
-    "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
-    "Enable encryption" : "Aktifkan enkripsi",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
-    "Select default encryption module:" : "Pilih modul enkripsi baku:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Anda perlu mengganti kunci enkrispi Anda dari enkripsi lama (ownCloud <= 8.0) ke yang baru. Mohon aktifkan \"Modul enkripsi standar\" dan jalankan 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Anda perlu untuk mengubah kunci enkripsi dari enkripsi lama (ownCloud <= 8.0) ke yang baru.",
-    "Start migration" : "Mulai migrasi",
-    "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
-    "Send mode" : "Modus kirim",
-    "Encryption" : "Enkripsi",
-    "From address" : "Dari alamat",
-    "mail" : "email",
-    "Authentication method" : "Metode otentikasi",
-    "Authentication required" : "Diperlukan otentikasi",
-    "Server address" : "Alamat server",
-    "Port" : "Port",
-    "Credentials" : "Kredensial",
-    "SMTP Username" : "Nama pengguna SMTP",
-    "SMTP Password" : "Sandi SMTP",
-    "Store credentials" : "Simpan kredensial",
-    "Test email settings" : "Pengaturan email percobaan",
-    "Send email" : "Kirim email",
-    "What to log" : "Apa yang akan di log",
-    "Download logfile" : "Unduh berkas log",
-    "More" : "Lainnya",
-    "Less" : "Ciutkan",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
+    "Tips & tricks" : "Tips & trik",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami menyarankan untuk beralih ke backend basis data yang berbeda.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke database lain, gunakan alat command line: 'occ db:convert-type', atau lihat <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentasi ↗</a>.",
@@ -229,7 +226,6 @@ OC.L10N.register(
     "Improving the config.php" : "Memperbaiki config.php",
     "Theming" : "Tema",
     "Hardening and security guidance" : "Panduan Keselamatan dan Keamanan",
-    "Version" : "Versi",
     "Developer documentation" : "Dokumentasi pengembang",
     "Experimental applications ahead" : "Aplikasi percobaan terdepan",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplikasi percobaan belum diperiksa untuk masalah keamanan, baru atau dikenal tidak stabil dan dalam proses pengembangan. Menginstalnya dapat menyebabkan kehilangan data atau penerobosan keamanan.",
@@ -285,6 +281,11 @@ OC.L10N.register(
     "Change password" : "Ubah sandi",
     "Language" : "Bahasa",
     "Help translate" : "Bantu menerjemahkan",
+    "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+    "Desktop client" : "Klien desktop",
+    "Android app" : "Aplikasi Android",
+    "iOS app" : "Aplikasi iOS",
+    "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
     "Web, desktop and mobile clients currently logged in to your account." : "Klien web, desktop dan mobile yang sedang login di akun Anda.",
     "Device" : "Perangkat",
     "Last activity" : "Aktivitas terakhir",
@@ -296,12 +297,6 @@ OC.L10N.register(
     "For security reasons this password will only be shown once." : "Untuk alasan keamanan sandi ini akan ditunjukkan hanya sekali.",
     "Username" : "Nama pengguna",
     "Done" : "Selesai",
-    "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
-    "Desktop client" : "Klien desktop",
-    "Android app" : "Aplikasi Android",
-    "iOS app" : "Aplikasi iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Apabila Anda ingin mendukung proyek ini\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ikuti pengembangannya</a>\n\t\tatau\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">sebarkan</a>!",
-    "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Dikembangkan oleh {commmunityopen}komunitas Nextcloud{linkclose}, {githubopen}sumber kode{linkclose} dilisensikan dibawah {licenseopen}AGPL{linkclose}.",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
@@ -327,6 +322,10 @@ OC.L10N.register(
     "set new password" : "setel sandi baru",
     "change email address" : "ubah alamat email",
     "Default" : "Default",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Penyimpanan Eksternal",
+    "Updates" : "Pembaruan",
     "no group" : "tanpa grup",
     "add group" : "tambah grup",
     "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Database Anda tidak dijalankan dengan isolasi transaksi level \"READ COMMITED\". Ini dapat menyebabkan masalah saat banyak tindakan dilakukan secara paralel.",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 4680ffdfbd8..fb6fc558a39 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -33,17 +33,6 @@
     "Email saved" : "Email disimpan",
     "Your full name has been changed." : "Nama lengkap Anda telah diubah",
     "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Peringatan Keamanan & Pengaturan",
-    "Sharing" : "Berbagi",
-    "Server-side encryption" : "Enkripsi sisi-server",
-    "External Storage" : "Penyimpanan Eksternal",
-    "Cron" : "Cron",
-    "Email server" : "Server email",
-    "Log" : "Log",
-    "Tips & tricks" : "Tips & trik",
-    "Updates" : "Pembaruan",
     "Couldn't remove app." : "Tidak dapat menghapus aplikasi.",
     "Language changed" : "Bahasa telah diubah",
     "Invalid request" : "Permintaan tidak valid",
@@ -135,17 +124,55 @@
     "Sessions" : "Sesi",
     "App passwords" : "Sandi aplikasi",
     "Sync clients" : "Klien sync",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, kesalahan, peringatan, info, debug)",
-    "Info, warnings, errors and fatal issues" : "Info, peringatan, kesalahan dan masalah fatal",
-    "Warnings, errors and fatal issues" : "Peringatan, kesalahan dan masalah fatal",
-    "Errors and fatal issues" : "Kesalahan dan masalah fatal",
-    "Fatal issues only" : "Hanya masalah fatal",
     "None" : "Tidak ada",
     "Login" : "Masuk",
     "Plain" : "Biasa",
     "NT LAN Manager" : "Manajer NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Server email",
+    "Open documentation" : "Buka dokumentasi",
+    "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
+    "Send mode" : "Modus kirim",
+    "Encryption" : "Enkripsi",
+    "From address" : "Dari alamat",
+    "mail" : "email",
+    "Authentication method" : "Metode otentikasi",
+    "Authentication required" : "Diperlukan otentikasi",
+    "Server address" : "Alamat server",
+    "Port" : "Port",
+    "Credentials" : "Kredensial",
+    "SMTP Username" : "Nama pengguna SMTP",
+    "SMTP Password" : "Sandi SMTP",
+    "Store credentials" : "Simpan kredensial",
+    "Test email settings" : "Pengaturan email percobaan",
+    "Send email" : "Kirim email",
+    "Server-side encryption" : "Enkripsi sisi-server",
+    "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
+    "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Setelah enkripsi diaktifkan, semua berkas yang diunggah pada server mulai saat ini akan dienkripsi saat singgah pada server. Penonaktifan enkripsi hanya mungkin berhasil jika modul enkripsi yang aktif mendukung fungsi ini dan semua prasyarat (misalnya pengaturan kunci pemulihan) sudah terpenuhi.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak dapat menjamin keamanan sistem. Silakan lihat dokumentasi untuk informasi lebih lanjut dalam bagaimana aplikasi enkripsi bekerja, dan kasus pendukung.",
+    "Be aware that encryption always increases the file size." : "Ingat bahwa enkripsi selalu menambah ukuran berkas.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Alangkah baiknya untuk membuat cadangan data secara rutin, dalam kasus enkripsi, pastikan untuk mencadangkan kunci enkripsi bersama dengan data Anda.",
+    "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
+    "Enable encryption" : "Aktifkan enkripsi",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
+    "Select default encryption module:" : "Pilih modul enkripsi baku:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Anda perlu mengganti kunci enkrispi Anda dari enkripsi lama (ownCloud <= 8.0) ke yang baru. Mohon aktifkan \"Modul enkripsi standar\" dan jalankan 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Anda perlu untuk mengubah kunci enkripsi dari enkripsi lama (ownCloud <= 8.0) ke yang baru.",
+    "Start migration" : "Mulai migrasi",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, kesalahan, peringatan, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, peringatan, kesalahan dan masalah fatal",
+    "Warnings, errors and fatal issues" : "Peringatan, kesalahan dan masalah fatal",
+    "Errors and fatal issues" : "Kesalahan dan masalah fatal",
+    "Fatal issues only" : "Hanya masalah fatal",
+    "Log" : "Log",
+    "What to log" : "Apa yang akan di log",
+    "Download logfile" : "Unduh berkas log",
+    "More" : "Lainnya",
+    "Less" : "Ciutkan",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
+    "Security & setup warnings" : "Peringatan Keamanan & Pengaturan",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon cek <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentasi instalasi↗</a> untuk catatan konfigurasi php dan konfigurasi PHP server Anda, khususnya saat menggunakan php-fpm.",
     "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." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
@@ -162,7 +189,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon cek <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">petunjuk instalasi ↗</a>, dan cek masalah atau peringatan di <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Semua pemeriksaan lulus.",
-    "Open documentation" : "Buka dokumentasi",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Eksekusi penjadwalan cron terakhir: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Eksekusi penjadwalan cron terakhir: %s. Kelihatannya ada yang salah.",
+    "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
+    "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
+    "Version" : "Versi",
+    "Sharing" : "Berbagi",
     "Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
     "Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
     "Allow public uploads" : "Izinkan unggahan publik",
@@ -179,45 +214,7 @@
     "Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
     "These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Izinkan penyelesai otomatis pada nama pengguna di jendela dialog berbagi. Jika ini dinonaktifkan, nama pengguna utuh perlu dimasukkan.",
-    "Last cron job execution: %s." : "Eksekusi penjadwalan cron terakhir: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Eksekusi penjadwalan cron terakhir: %s. Kelihatannya ada yang salah.",
-    "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
-    "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
-    "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
-    "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Setelah enkripsi diaktifkan, semua berkas yang diunggah pada server mulai saat ini akan dienkripsi saat singgah pada server. Penonaktifan enkripsi hanya mungkin berhasil jika modul enkripsi yang aktif mendukung fungsi ini dan semua prasyarat (misalnya pengaturan kunci pemulihan) sudah terpenuhi.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak dapat menjamin keamanan sistem. Silakan lihat dokumentasi untuk informasi lebih lanjut dalam bagaimana aplikasi enkripsi bekerja, dan kasus pendukung.",
-    "Be aware that encryption always increases the file size." : "Ingat bahwa enkripsi selalu menambah ukuran berkas.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Alangkah baiknya untuk membuat cadangan data secara rutin, dalam kasus enkripsi, pastikan untuk mencadangkan kunci enkripsi bersama dengan data Anda.",
-    "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
-    "Enable encryption" : "Aktifkan enkripsi",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
-    "Select default encryption module:" : "Pilih modul enkripsi baku:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Anda perlu mengganti kunci enkrispi Anda dari enkripsi lama (ownCloud <= 8.0) ke yang baru. Mohon aktifkan \"Modul enkripsi standar\" dan jalankan 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Anda perlu untuk mengubah kunci enkripsi dari enkripsi lama (ownCloud <= 8.0) ke yang baru.",
-    "Start migration" : "Mulai migrasi",
-    "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
-    "Send mode" : "Modus kirim",
-    "Encryption" : "Enkripsi",
-    "From address" : "Dari alamat",
-    "mail" : "email",
-    "Authentication method" : "Metode otentikasi",
-    "Authentication required" : "Diperlukan otentikasi",
-    "Server address" : "Alamat server",
-    "Port" : "Port",
-    "Credentials" : "Kredensial",
-    "SMTP Username" : "Nama pengguna SMTP",
-    "SMTP Password" : "Sandi SMTP",
-    "Store credentials" : "Simpan kredensial",
-    "Test email settings" : "Pengaturan email percobaan",
-    "Send email" : "Kirim email",
-    "What to log" : "Apa yang akan di log",
-    "Download logfile" : "Unduh berkas log",
-    "More" : "Lainnya",
-    "Less" : "Ciutkan",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
+    "Tips & tricks" : "Tips & trik",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami menyarankan untuk beralih ke backend basis data yang berbeda.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke database lain, gunakan alat command line: 'occ db:convert-type', atau lihat <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentasi ↗</a>.",
@@ -227,7 +224,6 @@
     "Improving the config.php" : "Memperbaiki config.php",
     "Theming" : "Tema",
     "Hardening and security guidance" : "Panduan Keselamatan dan Keamanan",
-    "Version" : "Versi",
     "Developer documentation" : "Dokumentasi pengembang",
     "Experimental applications ahead" : "Aplikasi percobaan terdepan",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplikasi percobaan belum diperiksa untuk masalah keamanan, baru atau dikenal tidak stabil dan dalam proses pengembangan. Menginstalnya dapat menyebabkan kehilangan data atau penerobosan keamanan.",
@@ -283,6 +279,11 @@
     "Change password" : "Ubah sandi",
     "Language" : "Bahasa",
     "Help translate" : "Bantu menerjemahkan",
+    "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+    "Desktop client" : "Klien desktop",
+    "Android app" : "Aplikasi Android",
+    "iOS app" : "Aplikasi iOS",
+    "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
     "Web, desktop and mobile clients currently logged in to your account." : "Klien web, desktop dan mobile yang sedang login di akun Anda.",
     "Device" : "Perangkat",
     "Last activity" : "Aktivitas terakhir",
@@ -294,12 +295,6 @@
     "For security reasons this password will only be shown once." : "Untuk alasan keamanan sandi ini akan ditunjukkan hanya sekali.",
     "Username" : "Nama pengguna",
     "Done" : "Selesai",
-    "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
-    "Desktop client" : "Klien desktop",
-    "Android app" : "Aplikasi Android",
-    "iOS app" : "Aplikasi iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Apabila Anda ingin mendukung proyek ini\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ikuti pengembangannya</a>\n\t\tatau\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">sebarkan</a>!",
-    "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Dikembangkan oleh {commmunityopen}komunitas Nextcloud{linkclose}, {githubopen}sumber kode{linkclose} dilisensikan dibawah {licenseopen}AGPL{linkclose}.",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
@@ -325,6 +320,10 @@
     "set new password" : "setel sandi baru",
     "change email address" : "ubah alamat email",
     "Default" : "Default",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Penyimpanan Eksternal",
+    "Updates" : "Pembaruan",
     "no group" : "tanpa grup",
     "add group" : "tambah grup",
     "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Database Anda tidak dijalankan dengan isolasi transaksi level \"READ COMMITED\". Ini dapat menyebabkan masalah saat banyak tindakan dilakukan secara paralel.",
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
index bb112dcc7f0..2c3a2b297b4 100644
--- a/settings/l10n/is.js
+++ b/settings/l10n/is.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "Tölvupóstfang vistað",
     "Your full name has been changed." : "Fullu nafni þínu hefur verið breytt.",
     "Unable to change full name" : "Get ekki breytt fullu nafni",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Öryggi og aðvaranir vegna uppsetningar",
-    "Sharing" : "Deiling",
-    "Server-side encryption" : "Dulritun á þjóni",
-    "External Storage" : "Ytri gagnageymsla",
-    "Cron" : "CRON",
-    "Email server" : "Póstþjónn",
-    "Log" : "Annáll",
-    "Tips & tricks" : "Ábendingar og góð ráð",
-    "Updates" : "Uppfærslur",
     "Couldn't remove app." : "Gat ekki fjarlægt forrit.",
     "Language changed" : "Tungumáli breytt",
     "Invalid request" : "Ógild fyrirspurn",
@@ -135,54 +124,14 @@ OC.L10N.register(
     "Sessions" : "Setur",
     "App passwords" : "Lykilorð forrita",
     "Sync clients" : "Samstilla biðlara",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Allt (aflúsun, upplýsingar, viðvaranir, villur og alvarlegar aðvaranir)",
-    "Info, warnings, errors and fatal issues" : "Upplýsingar, viðvaranir, villur og alvarlegar aðvaranir",
-    "Warnings, errors and fatal issues" : "Viðvaranir, villur og alvarlegar aðvaranir",
-    "Errors and fatal issues" : "Villur og alvarlegar aðvaranir",
-    "Fatal issues only" : "Einungis alvarlegar aðvaranir",
     "None" : "Ekkert",
     "Login" : "Innskráning",
     "Plain" : "Einfalt",
     "NT LAN Manager" : "NT LAN stjórnun",
     "SSL" : "SSL",
     "TLS" : "TLS",
-    "System locale can not be set to a one which supports UTF-8." : "Ekki var hægt að setja staðfærslu kerfisins á neina sem styður UTF-8.",
-    "All checks passed." : "Stóðst allar prófanir.",
+    "Email server" : "Póstþjónn",
     "Open documentation" : "Opna hjálparskjöl",
-    "Allow apps to use the Share API" : "Leyfa forritum að nota Share API",
-    "Allow users to share via link" : "Leyfa notendum að deila með tengli",
-    "Allow public uploads" : "Leyfa opinberar innsendingar",
-    "Enforce password protection" : "Krefjast verndunar með aðgangsorði",
-    "Set default expiration date" : "Setja sjálfgefinn gildistíma",
-    "Allow users to send mail notification for shared files" : "Leyfa notendum að senda tilkynningar í tölvupósti vegna deildra skráa",
-    "Expire after " : "Rennur út eftir ",
-    "days" : "daga",
-    "Enforce expiration date" : "Krefjast dagsetningar á gildistíma",
-    "Allow resharing" : "Leyfa endurdeilingu",
-    "Allow sharing with groups" : "Leyfa deilingu með hópum",
-    "Restrict users to only share with users in their groups" : "Takmarka notendur við að deila með notendum í þeirra eigin hópum",
-    "Allow users to send mail notification for shared files to other users" : "Leyfa notendum að senda tilkynningar til annarra notenda í tölvupósti vegna deildra skráa",
-    "Exclude groups from sharing" : "Undanskilja hópa frá því að deila",
-    "These groups will still be able to receive shares, but not to initiate them." : "Þessir hópar munu samt geta tekið við deildum sameignum, en ekki geta útbúið þær.",
-    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Leyfa sjálfklárun notandanafns í deilingarglugga. Ef þetta er óvirkt þarf að setja inn fullt nafn notanda.",
-    "Last cron job execution: %s." : "Síðasta keyrsla cron-verks: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Síðasta keyrsla cron-verks: %s. Eitthvað er ekki eins og það á að sér að vera.",
-    "Cron was not executed yet!" : "Cron hefur ekki ennþá verið keyrt!",
-    "Execute one task with each page loaded" : "Framkvæma eitt verk með hverri innhlaðinni síðu",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er skráð á webcron-þjónustu til að kalla á cron.php á 15 mínútna fresti yfir http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Nota cron-þjónustu kerfisins til að kalla á cron.php skrána á 15 mínútna fresti.",
-    "Enable server-side encryption" : "Virkja dulritun á þjóni",
-    "Please read carefully before activating server-side encryption: " : "Lestu eftirfarandi gaumgæfilega áður en þú virkjar dulritun á þjóni: ",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölin um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.",
-    "Be aware that encryption always increases the file size." : "Hafðu í huga að dulritun eykur alltaf skráastærð.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Það er góður siður að taka regluleg öryggisafrit af gögnunum þínum; ef um dulrituð gögn er að ræða, gakktu úr skugga um að einnig sé tekið öryggisafrit af dulritunarlyklum ásamt gögnunum.",
-    "This is the final warning: Do you really want to enable encryption?" : "Þetta er lokaaðvörun: Viltu örugglega virkja dulritun?",
-    "Enable encryption" : "Virkja dulritun",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Engin dulritunareining hlaðin inn, virkjaðu dulritunareiningu í valmynd forritsins.",
-    "Select default encryption module:" : "Veldu sjálfgefna dulritunareiningu:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju. Virkjaðu \"Sjálfgefna dulritunareiningu\" og keyrðu 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju.",
-    "Start migration" : "Hefja yfirfærslu",
     "This is used for sending out notifications." : "Þetta er notað til að senda út tilkynningar.",
     "Send mode" : "Sendihamur",
     "Encryption" : "Dulritun",
@@ -198,11 +147,59 @@ OC.L10N.register(
     "Store credentials" : "Geyma auðkenni",
     "Test email settings" : "Prófa tölvupóststillingar",
     "Send email" : "Senda tölvupóst",
+    "Server-side encryption" : "Dulritun á þjóni",
+    "Enable server-side encryption" : "Virkja dulritun á þjóni",
+    "Please read carefully before activating server-side encryption: " : "Lestu eftirfarandi gaumgæfilega áður en þú virkjar dulritun á þjóni: ",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölin um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.",
+    "Be aware that encryption always increases the file size." : "Hafðu í huga að dulritun eykur alltaf skráastærð.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Það er góður siður að taka regluleg öryggisafrit af gögnunum þínum; ef um dulrituð gögn er að ræða, gakktu úr skugga um að einnig sé tekið öryggisafrit af dulritunarlyklum ásamt gögnunum.",
+    "This is the final warning: Do you really want to enable encryption?" : "Þetta er lokaaðvörun: Viltu örugglega virkja dulritun?",
+    "Enable encryption" : "Virkja dulritun",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Engin dulritunareining hlaðin inn, virkjaðu dulritunareiningu í valmynd forritsins.",
+    "Select default encryption module:" : "Veldu sjálfgefna dulritunareiningu:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju. Virkjaðu \"Sjálfgefna dulritunareiningu\" og keyrðu 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju.",
+    "Start migration" : "Hefja yfirfærslu",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Allt (aflúsun, upplýsingar, viðvaranir, villur og alvarlegar aðvaranir)",
+    "Info, warnings, errors and fatal issues" : "Upplýsingar, viðvaranir, villur og alvarlegar aðvaranir",
+    "Warnings, errors and fatal issues" : "Viðvaranir, villur og alvarlegar aðvaranir",
+    "Errors and fatal issues" : "Villur og alvarlegar aðvaranir",
+    "Fatal issues only" : "Einungis alvarlegar aðvaranir",
+    "Log" : "Annáll",
     "What to log" : "Hvað á að skrá í annál",
     "Download logfile" : "Sækja annál",
     "More" : "Meira",
     "Less" : "Minna",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Annállinn er stærri en 100 MB.Þetta gæti tekið nokkra stund!",
+    "Security & setup warnings" : "Öryggi og aðvaranir vegna uppsetningar",
+    "System locale can not be set to a one which supports UTF-8." : "Ekki var hægt að setja staðfærslu kerfisins á neina sem styður UTF-8.",
+    "All checks passed." : "Stóðst allar prófanir.",
+    "Cron" : "CRON",
+    "Last cron job execution: %s." : "Síðasta keyrsla cron-verks: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Síðasta keyrsla cron-verks: %s. Eitthvað er ekki eins og það á að sér að vera.",
+    "Cron was not executed yet!" : "Cron hefur ekki ennþá verið keyrt!",
+    "Execute one task with each page loaded" : "Framkvæma eitt verk með hverri innhlaðinni síðu",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er skráð á webcron-þjónustu til að kalla á cron.php á 15 mínútna fresti yfir http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Nota cron-þjónustu kerfisins til að kalla á cron.php skrána á 15 mínútna fresti.",
+    "Version" : "Útgáfa",
+    "Sharing" : "Deiling",
+    "Allow apps to use the Share API" : "Leyfa forritum að nota Share API",
+    "Allow users to share via link" : "Leyfa notendum að deila með tengli",
+    "Allow public uploads" : "Leyfa opinberar innsendingar",
+    "Enforce password protection" : "Krefjast verndunar með aðgangsorði",
+    "Set default expiration date" : "Setja sjálfgefinn gildistíma",
+    "Allow users to send mail notification for shared files" : "Leyfa notendum að senda tilkynningar í tölvupósti vegna deildra skráa",
+    "Expire after " : "Rennur út eftir ",
+    "days" : "daga",
+    "Enforce expiration date" : "Krefjast dagsetningar á gildistíma",
+    "Allow resharing" : "Leyfa endurdeilingu",
+    "Allow sharing with groups" : "Leyfa deilingu með hópum",
+    "Restrict users to only share with users in their groups" : "Takmarka notendur við að deila með notendum í þeirra eigin hópum",
+    "Allow users to send mail notification for shared files to other users" : "Leyfa notendum að senda tilkynningar til annarra notenda í tölvupósti vegna deildra skráa",
+    "Exclude groups from sharing" : "Undanskilja hópa frá því að deila",
+    "These groups will still be able to receive shares, but not to initiate them." : "Þessir hópar munu samt geta tekið við deildum sameignum, en ekki geta útbúið þær.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Leyfa sjálfklárun notandanafns í deilingarglugga. Ef þetta er óvirkt þarf að setja inn fullt nafn notanda.",
+    "Tips & tricks" : "Ábendingar og góð ráð",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er notað sem gagnagrunnur. Fyrir stærri uppsetningar mælum við með að velja annan gagnagrunnsbakenda.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Til að yfirfæra í annan gagnagrunn skaltu nota skipanalínutólið: 'occ db:convert-type', eða lesa <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">hjálparskjölin ↗</a>.",
@@ -212,7 +209,6 @@ OC.L10N.register(
     "Improving the config.php" : "Bæting á config.php skránni",
     "Theming" : "Þemu",
     "Hardening and security guidance" : "Brynjun og öryggisleiðbeiningar",
-    "Version" : "Útgáfa",
     "Developer documentation" : "Skjölun fyrir þróunaraðila",
     "Experimental applications ahead" : "Forrit á tilraunastigi fyrst",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Tilraunaforrit eru ekki yfirfarin með tilliti til öryggisvandamála, þau eru þekkt fyrir að vera óstöðug og þróast hratt. Uppsetning þeirra getur valdið gagnatapi og öryggisbrestum.",
@@ -268,6 +264,11 @@ OC.L10N.register(
     "Change password" : "Breyta lykilorði",
     "Language" : "Tungumál",
     "Help translate" : "Hjálpa við þýðingu",
+    "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",
+    "iOS app" : "iOS-forrit",
+    "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur",
     "Web, desktop and mobile clients currently logged in to your account." : "Veftól, tölvur og símar sem núna eru skráð inn á aðganginn þinn.",
     "Device" : "Tæki",
     "Last activity" : "Síðasta virkni",
@@ -277,12 +278,6 @@ OC.L10N.register(
     "For security reasons this password will only be shown once." : "Af öryggisástæðum er þetta lykilorð einungis birt einu sinni.",
     "Username" : "Notandanafn",
     "Done" : "Lokið",
-    "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",
-    "iOS app" : "iOS-forrit",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">láttu orð út ganga</a>!",
-    "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Þróað af {communityopen}Nextcloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}AGPL{linkclose} notkunarleyfinu.",
     "Show storage location" : "Birta staðsetningu gagnageymslu",
     "Show last log in" : "Birta síðustu innskráningu",
@@ -308,6 +303,10 @@ OC.L10N.register(
     "set new password" : "setja nýtt lykilorð",
     "change email address" : "breyta tölvupóstfangi",
     "Default" : "Sjálfgefið",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Ytri gagnageymsla",
+    "Updates" : "Uppfærslur",
     "no group" : "enginn hópur",
     "add group" : "bæta við hópi",
     "Add Group" : "Bæta við hópi",
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
index bdf61080f12..46e733303d4 100644
--- a/settings/l10n/is.json
+++ b/settings/l10n/is.json
@@ -33,17 +33,6 @@
     "Email saved" : "Tölvupóstfang vistað",
     "Your full name has been changed." : "Fullu nafni þínu hefur verið breytt.",
     "Unable to change full name" : "Get ekki breytt fullu nafni",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Öryggi og aðvaranir vegna uppsetningar",
-    "Sharing" : "Deiling",
-    "Server-side encryption" : "Dulritun á þjóni",
-    "External Storage" : "Ytri gagnageymsla",
-    "Cron" : "CRON",
-    "Email server" : "Póstþjónn",
-    "Log" : "Annáll",
-    "Tips & tricks" : "Ábendingar og góð ráð",
-    "Updates" : "Uppfærslur",
     "Couldn't remove app." : "Gat ekki fjarlægt forrit.",
     "Language changed" : "Tungumáli breytt",
     "Invalid request" : "Ógild fyrirspurn",
@@ -133,54 +122,14 @@
     "Sessions" : "Setur",
     "App passwords" : "Lykilorð forrita",
     "Sync clients" : "Samstilla biðlara",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Allt (aflúsun, upplýsingar, viðvaranir, villur og alvarlegar aðvaranir)",
-    "Info, warnings, errors and fatal issues" : "Upplýsingar, viðvaranir, villur og alvarlegar aðvaranir",
-    "Warnings, errors and fatal issues" : "Viðvaranir, villur og alvarlegar aðvaranir",
-    "Errors and fatal issues" : "Villur og alvarlegar aðvaranir",
-    "Fatal issues only" : "Einungis alvarlegar aðvaranir",
     "None" : "Ekkert",
     "Login" : "Innskráning",
     "Plain" : "Einfalt",
     "NT LAN Manager" : "NT LAN stjórnun",
     "SSL" : "SSL",
     "TLS" : "TLS",
-    "System locale can not be set to a one which supports UTF-8." : "Ekki var hægt að setja staðfærslu kerfisins á neina sem styður UTF-8.",
-    "All checks passed." : "Stóðst allar prófanir.",
+    "Email server" : "Póstþjónn",
     "Open documentation" : "Opna hjálparskjöl",
-    "Allow apps to use the Share API" : "Leyfa forritum að nota Share API",
-    "Allow users to share via link" : "Leyfa notendum að deila með tengli",
-    "Allow public uploads" : "Leyfa opinberar innsendingar",
-    "Enforce password protection" : "Krefjast verndunar með aðgangsorði",
-    "Set default expiration date" : "Setja sjálfgefinn gildistíma",
-    "Allow users to send mail notification for shared files" : "Leyfa notendum að senda tilkynningar í tölvupósti vegna deildra skráa",
-    "Expire after " : "Rennur út eftir ",
-    "days" : "daga",
-    "Enforce expiration date" : "Krefjast dagsetningar á gildistíma",
-    "Allow resharing" : "Leyfa endurdeilingu",
-    "Allow sharing with groups" : "Leyfa deilingu með hópum",
-    "Restrict users to only share with users in their groups" : "Takmarka notendur við að deila með notendum í þeirra eigin hópum",
-    "Allow users to send mail notification for shared files to other users" : "Leyfa notendum að senda tilkynningar til annarra notenda í tölvupósti vegna deildra skráa",
-    "Exclude groups from sharing" : "Undanskilja hópa frá því að deila",
-    "These groups will still be able to receive shares, but not to initiate them." : "Þessir hópar munu samt geta tekið við deildum sameignum, en ekki geta útbúið þær.",
-    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Leyfa sjálfklárun notandanafns í deilingarglugga. Ef þetta er óvirkt þarf að setja inn fullt nafn notanda.",
-    "Last cron job execution: %s." : "Síðasta keyrsla cron-verks: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Síðasta keyrsla cron-verks: %s. Eitthvað er ekki eins og það á að sér að vera.",
-    "Cron was not executed yet!" : "Cron hefur ekki ennþá verið keyrt!",
-    "Execute one task with each page loaded" : "Framkvæma eitt verk með hverri innhlaðinni síðu",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er skráð á webcron-þjónustu til að kalla á cron.php á 15 mínútna fresti yfir http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Nota cron-þjónustu kerfisins til að kalla á cron.php skrána á 15 mínútna fresti.",
-    "Enable server-side encryption" : "Virkja dulritun á þjóni",
-    "Please read carefully before activating server-side encryption: " : "Lestu eftirfarandi gaumgæfilega áður en þú virkjar dulritun á þjóni: ",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölin um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.",
-    "Be aware that encryption always increases the file size." : "Hafðu í huga að dulritun eykur alltaf skráastærð.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Það er góður siður að taka regluleg öryggisafrit af gögnunum þínum; ef um dulrituð gögn er að ræða, gakktu úr skugga um að einnig sé tekið öryggisafrit af dulritunarlyklum ásamt gögnunum.",
-    "This is the final warning: Do you really want to enable encryption?" : "Þetta er lokaaðvörun: Viltu örugglega virkja dulritun?",
-    "Enable encryption" : "Virkja dulritun",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Engin dulritunareining hlaðin inn, virkjaðu dulritunareiningu í valmynd forritsins.",
-    "Select default encryption module:" : "Veldu sjálfgefna dulritunareiningu:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju. Virkjaðu \"Sjálfgefna dulritunareiningu\" og keyrðu 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju.",
-    "Start migration" : "Hefja yfirfærslu",
     "This is used for sending out notifications." : "Þetta er notað til að senda út tilkynningar.",
     "Send mode" : "Sendihamur",
     "Encryption" : "Dulritun",
@@ -196,11 +145,59 @@
     "Store credentials" : "Geyma auðkenni",
     "Test email settings" : "Prófa tölvupóststillingar",
     "Send email" : "Senda tölvupóst",
+    "Server-side encryption" : "Dulritun á þjóni",
+    "Enable server-side encryption" : "Virkja dulritun á þjóni",
+    "Please read carefully before activating server-side encryption: " : "Lestu eftirfarandi gaumgæfilega áður en þú virkjar dulritun á þjóni: ",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölin um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.",
+    "Be aware that encryption always increases the file size." : "Hafðu í huga að dulritun eykur alltaf skráastærð.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Það er góður siður að taka regluleg öryggisafrit af gögnunum þínum; ef um dulrituð gögn er að ræða, gakktu úr skugga um að einnig sé tekið öryggisafrit af dulritunarlyklum ásamt gögnunum.",
+    "This is the final warning: Do you really want to enable encryption?" : "Þetta er lokaaðvörun: Viltu örugglega virkja dulritun?",
+    "Enable encryption" : "Virkja dulritun",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Engin dulritunareining hlaðin inn, virkjaðu dulritunareiningu í valmynd forritsins.",
+    "Select default encryption module:" : "Veldu sjálfgefna dulritunareiningu:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju. Virkjaðu \"Sjálfgefna dulritunareiningu\" og keyrðu 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju.",
+    "Start migration" : "Hefja yfirfærslu",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Allt (aflúsun, upplýsingar, viðvaranir, villur og alvarlegar aðvaranir)",
+    "Info, warnings, errors and fatal issues" : "Upplýsingar, viðvaranir, villur og alvarlegar aðvaranir",
+    "Warnings, errors and fatal issues" : "Viðvaranir, villur og alvarlegar aðvaranir",
+    "Errors and fatal issues" : "Villur og alvarlegar aðvaranir",
+    "Fatal issues only" : "Einungis alvarlegar aðvaranir",
+    "Log" : "Annáll",
     "What to log" : "Hvað á að skrá í annál",
     "Download logfile" : "Sækja annál",
     "More" : "Meira",
     "Less" : "Minna",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Annállinn er stærri en 100 MB.Þetta gæti tekið nokkra stund!",
+    "Security & setup warnings" : "Öryggi og aðvaranir vegna uppsetningar",
+    "System locale can not be set to a one which supports UTF-8." : "Ekki var hægt að setja staðfærslu kerfisins á neina sem styður UTF-8.",
+    "All checks passed." : "Stóðst allar prófanir.",
+    "Cron" : "CRON",
+    "Last cron job execution: %s." : "Síðasta keyrsla cron-verks: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Síðasta keyrsla cron-verks: %s. Eitthvað er ekki eins og það á að sér að vera.",
+    "Cron was not executed yet!" : "Cron hefur ekki ennþá verið keyrt!",
+    "Execute one task with each page loaded" : "Framkvæma eitt verk með hverri innhlaðinni síðu",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er skráð á webcron-þjónustu til að kalla á cron.php á 15 mínútna fresti yfir http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Nota cron-þjónustu kerfisins til að kalla á cron.php skrána á 15 mínútna fresti.",
+    "Version" : "Útgáfa",
+    "Sharing" : "Deiling",
+    "Allow apps to use the Share API" : "Leyfa forritum að nota Share API",
+    "Allow users to share via link" : "Leyfa notendum að deila með tengli",
+    "Allow public uploads" : "Leyfa opinberar innsendingar",
+    "Enforce password protection" : "Krefjast verndunar með aðgangsorði",
+    "Set default expiration date" : "Setja sjálfgefinn gildistíma",
+    "Allow users to send mail notification for shared files" : "Leyfa notendum að senda tilkynningar í tölvupósti vegna deildra skráa",
+    "Expire after " : "Rennur út eftir ",
+    "days" : "daga",
+    "Enforce expiration date" : "Krefjast dagsetningar á gildistíma",
+    "Allow resharing" : "Leyfa endurdeilingu",
+    "Allow sharing with groups" : "Leyfa deilingu með hópum",
+    "Restrict users to only share with users in their groups" : "Takmarka notendur við að deila með notendum í þeirra eigin hópum",
+    "Allow users to send mail notification for shared files to other users" : "Leyfa notendum að senda tilkynningar til annarra notenda í tölvupósti vegna deildra skráa",
+    "Exclude groups from sharing" : "Undanskilja hópa frá því að deila",
+    "These groups will still be able to receive shares, but not to initiate them." : "Þessir hópar munu samt geta tekið við deildum sameignum, en ekki geta útbúið þær.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Leyfa sjálfklárun notandanafns í deilingarglugga. Ef þetta er óvirkt þarf að setja inn fullt nafn notanda.",
+    "Tips & tricks" : "Ábendingar og góð ráð",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er notað sem gagnagrunnur. Fyrir stærri uppsetningar mælum við með að velja annan gagnagrunnsbakenda.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Til að yfirfæra í annan gagnagrunn skaltu nota skipanalínutólið: 'occ db:convert-type', eða lesa <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">hjálparskjölin ↗</a>.",
@@ -210,7 +207,6 @@
     "Improving the config.php" : "Bæting á config.php skránni",
     "Theming" : "Þemu",
     "Hardening and security guidance" : "Brynjun og öryggisleiðbeiningar",
-    "Version" : "Útgáfa",
     "Developer documentation" : "Skjölun fyrir þróunaraðila",
     "Experimental applications ahead" : "Forrit á tilraunastigi fyrst",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Tilraunaforrit eru ekki yfirfarin með tilliti til öryggisvandamála, þau eru þekkt fyrir að vera óstöðug og þróast hratt. Uppsetning þeirra getur valdið gagnatapi og öryggisbrestum.",
@@ -266,6 +262,11 @@
     "Change password" : "Breyta lykilorði",
     "Language" : "Tungumál",
     "Help translate" : "Hjálpa við þýðingu",
+    "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",
+    "iOS app" : "iOS-forrit",
+    "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur",
     "Web, desktop and mobile clients currently logged in to your account." : "Veftól, tölvur og símar sem núna eru skráð inn á aðganginn þinn.",
     "Device" : "Tæki",
     "Last activity" : "Síðasta virkni",
@@ -275,12 +276,6 @@
     "For security reasons this password will only be shown once." : "Af öryggisástæðum er þetta lykilorð einungis birt einu sinni.",
     "Username" : "Notandanafn",
     "Done" : "Lokið",
-    "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",
-    "iOS app" : "iOS-forrit",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">láttu orð út ganga</a>!",
-    "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Þróað af {communityopen}Nextcloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}AGPL{linkclose} notkunarleyfinu.",
     "Show storage location" : "Birta staðsetningu gagnageymslu",
     "Show last log in" : "Birta síðustu innskráningu",
@@ -306,6 +301,10 @@
     "set new password" : "setja nýtt lykilorð",
     "change email address" : "breyta tölvupóstfangi",
     "Default" : "Sjálfgefið",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Ytri gagnageymsla",
+    "Updates" : "Uppfærslur",
     "no group" : "enginn hópur",
     "add group" : "bæta við hópi",
     "Add Group" : "Bæta við hópi",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index c24e82c6e41..ef71a80a6f0 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "Email salvata",
     "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
     "Unable to change full name" : "Impossibile cambiare il nome completo",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Avvisi di sicurezza e di configurazione",
-    "Sharing" : "Condivisione",
-    "Server-side encryption" : "Cifratura lato server",
-    "External Storage" : "Archiviazione esterna",
-    "Cron" : "Cron",
-    "Email server" : "Server di posta",
-    "Log" : "Log",
-    "Tips & tricks" : "Suggerimenti e trucchi",
-    "Updates" : "Aggiornamenti",
     "Couldn't remove app." : "Impossibile rimuovere l'applicazione.",
     "Language changed" : "Lingua modificata",
     "Invalid request" : "Richiesta non valida",
@@ -98,6 +87,10 @@ OC.L10N.register(
     "Android Client" : "sistema Android",
     "Sync client - {os}" : "Client di sincronizzazione - {os}",
     "This session" : "Questa sessione",
+    "Copied!" : "Copiato!",
+    "Not supported!" : "Non supportato!",
+    "Press ⌘-C to copy." : "Premi ⌘-C per copiare.",
+    "Press Ctrl-C to copy." : "Premi Ctrl-C per copiare.",
     "Error while loading browser sessions and device tokens" : "Errore durante il caricamento delle sessioni del browser e dei token di dispositivo",
     "Error while creating device token" : "Errore durante la creazione del token di dispositivo",
     "Error while deleting the token" : "Errore durante l'eliminazione del token",
@@ -133,17 +126,55 @@ OC.L10N.register(
     "Sessions" : "Sessioni",
     "App passwords" : "Password di applicazione",
     "Sync clients" : "Client di sincronizzazione",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
-    "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
-    "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi",
-    "Errors and fatal issues" : "Errori e problemi gravi",
-    "Fatal issues only" : "Solo problemi gravi",
     "None" : "Nessuno",
     "Login" : "Accesso",
     "Plain" : "Semplice",
     "NT LAN Manager" : "Gestore NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Server di posta",
+    "Open documentation" : "Apri la documentazione",
+    "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
+    "Send mode" : "Modalità di invio",
+    "Encryption" : "Cifratura",
+    "From address" : "Indirizzo mittente",
+    "mail" : "posta",
+    "Authentication method" : "Metodo di autenticazione",
+    "Authentication required" : "Autenticazione richiesta",
+    "Server address" : "Indirizzo del server",
+    "Port" : "Porta",
+    "Credentials" : "Credenziali",
+    "SMTP Username" : "Nome utente SMTP",
+    "SMTP Password" : "Password SMTP",
+    "Store credentials" : "Memorizza le credenziali",
+    "Test email settings" : "Prova impostazioni email",
+    "Send email" : "Invia email",
+    "Server-side encryption" : "Cifratura lato server",
+    "Enable server-side encryption" : "Abilita cifratura lato server",
+    "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Quando la cifratura è abilitata, tutti i file caricati sul server da quel momento in poi saranno cifrati sul server. Sarà possibile solo disabilitare successivamente la cifratura se il modulo di cifratura attivo lo consente, e se tutti i prerequisiti (ad es. l'impostazione di una chiave di recupero) sono verificati.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Leggi la documentazione per ottenere ulteriori informazioni sul funzionamento dell'applicazione di cifratura.",
+    "Be aware that encryption always increases the file size." : "Considera che la cifratura incrementa sempre la dimensione dei file.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Ti consigliamo di creare copie di sicurezza dei tuoi dati con regolarità, in caso di utilizzo della cifratura, assicurati di creare una copia delle chiavi di cifratura insieme ai tuoi dati.",
+    "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
+    "Enable encryption" : "Abilita cifratura",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
+    "Select default encryption module:" : "Seleziona il modulo di cifratura predefinito:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Abilita il \"Modulo di cifratura predefinito\" ed esegui 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova.",
+    "Start migration" : "Avvia migrazione",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
+    "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
+    "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi",
+    "Errors and fatal issues" : "Errori e problemi gravi",
+    "Fatal issues only" : "Solo problemi gravi",
+    "Log" : "Log",
+    "What to log" : "Cosa registrare",
+    "Download logfile" : "Scarica file di log",
+    "More" : "Altro",
+    "Less" : "Meno",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!",
+    "Security & setup warnings" : "Avvisi di sicurezza e di configurazione",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php non sembra essere configurato correttamente per interrogare le variabili d'ambiente di sistema. Il test con getenv(\"PATH\") restituisce solo una risposta vuota.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentazione di installazione↗</a>  per le note di configurazione di php e la configurazione del tuo server, in particolare quando utilizzi php-fpm.",
     "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 configurazione di sola lettura è stata abilitata. Ciò impedisce l'impostazione di alcune configurazioni tramite l'interfaccia web. Inoltre, i file devono essere resi scrivibili manualmente per ogni aggiornamento.",
@@ -160,7 +191,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non è stato possibile eseguire il job di cron tramite CLI. Sono apparsi i seguenti errori tecnici:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Leggi attentamente le  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guide d'installazione ↗</a>, e controlla gli errori o gli avvisi nel <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Tutti i controlli passati.",
-    "Open documentation" : "Apri la documentazione",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
+    "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
+    "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
+    "Version" : "Versione",
+    "Sharing" : "Condivisione",
     "Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
     "Allow users to share via link" : "Consenti agli utenti di condividere tramite collegamento",
     "Allow public uploads" : "Consenti caricamenti pubblici",
@@ -177,45 +216,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Escludi gruppi dalla condivisione",
     "These groups will still be able to receive shares, but not to initiate them." : "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Consenti il completamento del nome utente nella finestra di condivisione. Se è disabilitata, è necessario digitare il nome utente completo.",
-    "Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
-    "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
-    "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-    "Enable server-side encryption" : "Abilita cifratura lato server",
-    "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Quando la cifratura è abilitata, tutti i file caricati sul server da quel momento in poi saranno cifrati sul server. Sarà possibile solo disabilitare successivamente la cifratura se il modulo di cifratura attivo lo consente, e se tutti i prerequisiti (ad es. l'impostazione di una chiave di recupero) sono verificati.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Leggi la documentazione per ottenere ulteriori informazioni sul funzionamento dell'applicazione di cifratura.",
-    "Be aware that encryption always increases the file size." : "Considera che la cifratura incrementa sempre la dimensione dei file.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Ti consigliamo di creare copie di sicurezza dei tuoi dati con regolarità, in caso di utilizzo della cifratura, assicurati di creare una copia delle chiavi di cifratura insieme ai tuoi dati.",
-    "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
-    "Enable encryption" : "Abilita cifratura",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
-    "Select default encryption module:" : "Seleziona il modulo di cifratura predefinito:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Abilita il \"Modulo di cifratura predefinito\" ed esegui 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova.",
-    "Start migration" : "Avvia migrazione",
-    "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
-    "Send mode" : "Modalità di invio",
-    "Encryption" : "Cifratura",
-    "From address" : "Indirizzo mittente",
-    "mail" : "posta",
-    "Authentication method" : "Metodo di autenticazione",
-    "Authentication required" : "Autenticazione richiesta",
-    "Server address" : "Indirizzo del server",
-    "Port" : "Porta",
-    "Credentials" : "Credenziali",
-    "SMTP Username" : "Nome utente SMTP",
-    "SMTP Password" : "Password SMTP",
-    "Store credentials" : "Memorizza le credenziali",
-    "Test email settings" : "Prova impostazioni email",
-    "Send email" : "Invia email",
-    "What to log" : "Cosa registrare",
-    "Download logfile" : "Scarica file di log",
-    "More" : "Altro",
-    "Less" : "Meno",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!",
+    "Tips & tricks" : "Suggerimenti e trucchi",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite è utilizzato come database. Per installazioni più grandi consigliamo di passare a un motore di database diverso.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Per migrare a un altro database, usa lo strumento da riga di comando: 'occ db:convert-type', o leggi la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentazione ↗</a>.",
@@ -225,7 +226,6 @@ OC.L10N.register(
     "Improving the config.php" : "Ottimizzare il config.php",
     "Theming" : "Temi",
     "Hardening and security guidance" : "Guida alla messa in sicurezza",
-    "Version" : "Versione",
     "Developer documentation" : "Documentazione dello sviluppatore",
     "Experimental applications ahead" : "Prima le applicazioni sperimentali",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Le applicazioni sperimentali non sono sottoposte a controlli di sicurezza, sono nuove o notoriamente instabili e sotto sviluppo intensivo. La loro installazione può causare perdite di dati o problemi di sicurezza.",
@@ -281,6 +281,11 @@ OC.L10N.register(
     "Change password" : "Modifica password",
     "Language" : "Lingua",
     "Help translate" : "Migliora la traduzione",
+    "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
+    "Desktop client" : "Client desktop",
+    "Android app" : "Applicazione Android",
+    "iOS app" : "Applicazione iOS",
+    "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
     "Web, desktop and mobile clients currently logged in to your account." : "Client web, desktop e mobile attualmente connessi al tuo account.",
     "Device" : "Dispositivo",
     "Last activity" : "Ultima attività",
@@ -291,13 +296,10 @@ OC.L10N.register(
     "Use the credentials below to configure your app or device." : "Utilizza le credenziali in basso per configurare la tua applicazione o 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",
-    "Android app" : "Applicazione Android",
-    "iOS app" : "Applicazione iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se desideri supportare il progetto\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">contribuisci allo sviluppo</a>\n\t\to\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!",
-    "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Sviluppato dalla {communityopen}comunità di Nextcloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}AGPL{linkclose}.",
+    "Follow us on Google Plus!" : "Seguici su Google Plus!",
+    "Subscribe to our twitter channel!" : "Iscriviti al nostro canale twitter!",
+    "Subscribe to our newsletter!" : "Iscriviti alla nostra newsletter!",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
     "Show user backend" : "Mostra il motore utente",
@@ -321,6 +323,18 @@ OC.L10N.register(
     "change full name" : "modica nome completo",
     "set new password" : "imposta una nuova password",
     "change email address" : "cambia l'indirizzo email",
-    "Default" : "Predefinito"
+    "Default" : "Predefinito",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Archiviazione esterna",
+    "Updates" : "Aggiornamenti",
+    "no group" : "nessun gruppo",
+    "add group" : "aggiungi gruppo",
+    "Add Group" : "Aggiungi gruppo",
+    "Default Quota" : "Quota predefinita",
+    "Full Name" : "Nome completo",
+    "Group Admin for" : "Gruppo di amministrazione per",
+    "Storage Location" : "Posizione di archiviazione",
+    "Last Login" : "Ultimo accesso"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index cc5e18a7236..e6e2deb32e8 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -33,17 +33,6 @@
     "Email saved" : "Email salvata",
     "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
     "Unable to change full name" : "Impossibile cambiare il nome completo",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Avvisi di sicurezza e di configurazione",
-    "Sharing" : "Condivisione",
-    "Server-side encryption" : "Cifratura lato server",
-    "External Storage" : "Archiviazione esterna",
-    "Cron" : "Cron",
-    "Email server" : "Server di posta",
-    "Log" : "Log",
-    "Tips & tricks" : "Suggerimenti e trucchi",
-    "Updates" : "Aggiornamenti",
     "Couldn't remove app." : "Impossibile rimuovere l'applicazione.",
     "Language changed" : "Lingua modificata",
     "Invalid request" : "Richiesta non valida",
@@ -96,6 +85,10 @@
     "Android Client" : "sistema Android",
     "Sync client - {os}" : "Client di sincronizzazione - {os}",
     "This session" : "Questa sessione",
+    "Copied!" : "Copiato!",
+    "Not supported!" : "Non supportato!",
+    "Press ⌘-C to copy." : "Premi ⌘-C per copiare.",
+    "Press Ctrl-C to copy." : "Premi Ctrl-C per copiare.",
     "Error while loading browser sessions and device tokens" : "Errore durante il caricamento delle sessioni del browser e dei token di dispositivo",
     "Error while creating device token" : "Errore durante la creazione del token di dispositivo",
     "Error while deleting the token" : "Errore durante l'eliminazione del token",
@@ -131,17 +124,55 @@
     "Sessions" : "Sessioni",
     "App passwords" : "Password di applicazione",
     "Sync clients" : "Client di sincronizzazione",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
-    "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
-    "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi",
-    "Errors and fatal issues" : "Errori e problemi gravi",
-    "Fatal issues only" : "Solo problemi gravi",
     "None" : "Nessuno",
     "Login" : "Accesso",
     "Plain" : "Semplice",
     "NT LAN Manager" : "Gestore NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Server di posta",
+    "Open documentation" : "Apri la documentazione",
+    "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
+    "Send mode" : "Modalità di invio",
+    "Encryption" : "Cifratura",
+    "From address" : "Indirizzo mittente",
+    "mail" : "posta",
+    "Authentication method" : "Metodo di autenticazione",
+    "Authentication required" : "Autenticazione richiesta",
+    "Server address" : "Indirizzo del server",
+    "Port" : "Porta",
+    "Credentials" : "Credenziali",
+    "SMTP Username" : "Nome utente SMTP",
+    "SMTP Password" : "Password SMTP",
+    "Store credentials" : "Memorizza le credenziali",
+    "Test email settings" : "Prova impostazioni email",
+    "Send email" : "Invia email",
+    "Server-side encryption" : "Cifratura lato server",
+    "Enable server-side encryption" : "Abilita cifratura lato server",
+    "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Quando la cifratura è abilitata, tutti i file caricati sul server da quel momento in poi saranno cifrati sul server. Sarà possibile solo disabilitare successivamente la cifratura se il modulo di cifratura attivo lo consente, e se tutti i prerequisiti (ad es. l'impostazione di una chiave di recupero) sono verificati.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Leggi la documentazione per ottenere ulteriori informazioni sul funzionamento dell'applicazione di cifratura.",
+    "Be aware that encryption always increases the file size." : "Considera che la cifratura incrementa sempre la dimensione dei file.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Ti consigliamo di creare copie di sicurezza dei tuoi dati con regolarità, in caso di utilizzo della cifratura, assicurati di creare una copia delle chiavi di cifratura insieme ai tuoi dati.",
+    "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
+    "Enable encryption" : "Abilita cifratura",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
+    "Select default encryption module:" : "Seleziona il modulo di cifratura predefinito:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Abilita il \"Modulo di cifratura predefinito\" ed esegui 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova.",
+    "Start migration" : "Avvia migrazione",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
+    "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
+    "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi",
+    "Errors and fatal issues" : "Errori e problemi gravi",
+    "Fatal issues only" : "Solo problemi gravi",
+    "Log" : "Log",
+    "What to log" : "Cosa registrare",
+    "Download logfile" : "Scarica file di log",
+    "More" : "Altro",
+    "Less" : "Meno",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!",
+    "Security & setup warnings" : "Avvisi di sicurezza e di configurazione",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php non sembra essere configurato correttamente per interrogare le variabili d'ambiente di sistema. Il test con getenv(\"PATH\") restituisce solo una risposta vuota.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentazione di installazione↗</a>  per le note di configurazione di php e la configurazione del tuo server, in particolare quando utilizzi php-fpm.",
     "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 configurazione di sola lettura è stata abilitata. Ciò impedisce l'impostazione di alcune configurazioni tramite l'interfaccia web. Inoltre, i file devono essere resi scrivibili manualmente per ogni aggiornamento.",
@@ -158,7 +189,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non è stato possibile eseguire il job di cron tramite CLI. Sono apparsi i seguenti errori tecnici:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Leggi attentamente le  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guide d'installazione ↗</a>, e controlla gli errori o gli avvisi nel <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Tutti i controlli passati.",
-    "Open documentation" : "Apri la documentazione",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
+    "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
+    "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
+    "Version" : "Versione",
+    "Sharing" : "Condivisione",
     "Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
     "Allow users to share via link" : "Consenti agli utenti di condividere tramite collegamento",
     "Allow public uploads" : "Consenti caricamenti pubblici",
@@ -175,45 +214,7 @@
     "Exclude groups from sharing" : "Escludi gruppi dalla condivisione",
     "These groups will still be able to receive shares, but not to initiate them." : "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Consenti il completamento del nome utente nella finestra di condivisione. Se è disabilitata, è necessario digitare il nome utente completo.",
-    "Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
-    "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
-    "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-    "Enable server-side encryption" : "Abilita cifratura lato server",
-    "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Quando la cifratura è abilitata, tutti i file caricati sul server da quel momento in poi saranno cifrati sul server. Sarà possibile solo disabilitare successivamente la cifratura se il modulo di cifratura attivo lo consente, e se tutti i prerequisiti (ad es. l'impostazione di una chiave di recupero) sono verificati.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Leggi la documentazione per ottenere ulteriori informazioni sul funzionamento dell'applicazione di cifratura.",
-    "Be aware that encryption always increases the file size." : "Considera che la cifratura incrementa sempre la dimensione dei file.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Ti consigliamo di creare copie di sicurezza dei tuoi dati con regolarità, in caso di utilizzo della cifratura, assicurati di creare una copia delle chiavi di cifratura insieme ai tuoi dati.",
-    "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
-    "Enable encryption" : "Abilita cifratura",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
-    "Select default encryption module:" : "Seleziona il modulo di cifratura predefinito:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Abilita il \"Modulo di cifratura predefinito\" ed esegui 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova.",
-    "Start migration" : "Avvia migrazione",
-    "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
-    "Send mode" : "Modalità di invio",
-    "Encryption" : "Cifratura",
-    "From address" : "Indirizzo mittente",
-    "mail" : "posta",
-    "Authentication method" : "Metodo di autenticazione",
-    "Authentication required" : "Autenticazione richiesta",
-    "Server address" : "Indirizzo del server",
-    "Port" : "Porta",
-    "Credentials" : "Credenziali",
-    "SMTP Username" : "Nome utente SMTP",
-    "SMTP Password" : "Password SMTP",
-    "Store credentials" : "Memorizza le credenziali",
-    "Test email settings" : "Prova impostazioni email",
-    "Send email" : "Invia email",
-    "What to log" : "Cosa registrare",
-    "Download logfile" : "Scarica file di log",
-    "More" : "Altro",
-    "Less" : "Meno",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!",
+    "Tips & tricks" : "Suggerimenti e trucchi",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite è utilizzato come database. Per installazioni più grandi consigliamo di passare a un motore di database diverso.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Per migrare a un altro database, usa lo strumento da riga di comando: 'occ db:convert-type', o leggi la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentazione ↗</a>.",
@@ -223,7 +224,6 @@
     "Improving the config.php" : "Ottimizzare il config.php",
     "Theming" : "Temi",
     "Hardening and security guidance" : "Guida alla messa in sicurezza",
-    "Version" : "Versione",
     "Developer documentation" : "Documentazione dello sviluppatore",
     "Experimental applications ahead" : "Prima le applicazioni sperimentali",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Le applicazioni sperimentali non sono sottoposte a controlli di sicurezza, sono nuove o notoriamente instabili e sotto sviluppo intensivo. La loro installazione può causare perdite di dati o problemi di sicurezza.",
@@ -279,6 +279,11 @@
     "Change password" : "Modifica password",
     "Language" : "Lingua",
     "Help translate" : "Migliora la traduzione",
+    "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
+    "Desktop client" : "Client desktop",
+    "Android app" : "Applicazione Android",
+    "iOS app" : "Applicazione iOS",
+    "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
     "Web, desktop and mobile clients currently logged in to your account." : "Client web, desktop e mobile attualmente connessi al tuo account.",
     "Device" : "Dispositivo",
     "Last activity" : "Ultima attività",
@@ -289,13 +294,10 @@
     "Use the credentials below to configure your app or device." : "Utilizza le credenziali in basso per configurare la tua applicazione o 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",
-    "Android app" : "Applicazione Android",
-    "iOS app" : "Applicazione iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se desideri supportare il progetto\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">contribuisci allo sviluppo</a>\n\t\to\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!",
-    "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Sviluppato dalla {communityopen}comunità di Nextcloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}AGPL{linkclose}.",
+    "Follow us on Google Plus!" : "Seguici su Google Plus!",
+    "Subscribe to our twitter channel!" : "Iscriviti al nostro canale twitter!",
+    "Subscribe to our newsletter!" : "Iscriviti alla nostra newsletter!",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
     "Show user backend" : "Mostra il motore utente",
@@ -319,6 +321,18 @@
     "change full name" : "modica nome completo",
     "set new password" : "imposta una nuova password",
     "change email address" : "cambia l'indirizzo email",
-    "Default" : "Predefinito"
+    "Default" : "Predefinito",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Archiviazione esterna",
+    "Updates" : "Aggiornamenti",
+    "no group" : "nessun gruppo",
+    "add group" : "aggiungi gruppo",
+    "Add Group" : "Aggiungi gruppo",
+    "Default Quota" : "Quota predefinita",
+    "Full Name" : "Nome completo",
+    "Group Admin for" : "Gruppo di amministrazione per",
+    "Storage Location" : "Posizione di archiviazione",
+    "Last Login" : "Ultimo accesso"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 3c7dbde76bf..83cff18f8db 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "メールアドレスを保存しました",
     "Your full name has been changed." : "名前を変更しました。",
     "Unable to change full name" : "名前を変更できません",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "セキュリティ＆セットアップ警告",
-    "Sharing" : "共有",
-    "Server-side encryption" : "サーバーサイド暗号化",
-    "External Storage" : "外部ストレージ",
-    "Cron" : "Cron",
-    "Email server" : "メールサーバー",
-    "Log" : "ログ",
-    "Tips & tricks" : "ヒントとコツ",
-    "Updates" : "アップデート",
     "Couldn't remove app." : "アプリが削除できませんでした。",
     "Language changed" : "言語が変更されました",
     "Invalid request" : "不正なリクエスト",
@@ -120,17 +109,55 @@ OC.L10N.register(
     "Sessions" : "セッション",
     "App passwords" : "アプリパスワード",
     "Sync clients" : "同期用クライアント",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
-    "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
-    "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題",
-    "Errors and fatal issues" : "エラー、致命的な問題",
-    "Fatal issues only" : "致命的な問題のみ",
     "None" : "なし",
     "Login" : "ログイン",
     "Plain" : "平文",
     "NT LAN Manager" : "NT LAN マネージャー",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "メールサーバー",
+    "Open documentation" : "ドキュメントを開く",
+    "This is used for sending out notifications." : "通知を送信する際に使用します。",
+    "Send mode" : "送信モード",
+    "Encryption" : "暗号化",
+    "From address" : "送信元アドレス",
+    "mail" : "mail",
+    "Authentication method" : "認証方法",
+    "Authentication required" : "認証を必要とする",
+    "Server address" : "サーバーアドレス",
+    "Port" : "ポート",
+    "Credentials" : "資格情報",
+    "SMTP Username" : "SMTPユーザー名",
+    "SMTP Password" : "SMTP パスワード",
+    "Store credentials" : "資格情報を保存",
+    "Test email settings" : "メール設定のテスト",
+    "Send email" : "メールを送信",
+    "Server-side encryption" : "サーバーサイド暗号化",
+    "Enable server-side encryption" : "サーバーサイド暗号化を有効にする",
+    "Please read carefully before activating server-side encryption: " : "サーバーサイド暗号化を有効にする前によくお読みください:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "暗号化を一度有効化すると、この時点からサーバーにアップロードされるファイルの全てが暗号化されサーバー上に入ります。有効化された暗号モジュールは復号化機能をサポートしますが、すべての前提条件が満たされている(例えば、回復キーが設定されている)場合にのみ、後日暗号化を無効にすることが可能です。",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "暗号化だけで、システムのセキュリティが保証されるものではありません。暗号化アプリがどのように動作するかの詳細について、およびサポートされているユースケースについてはownCloudのドキュメントを参照してください。",
+    "Be aware that encryption always increases the file size." : "暗号化は、常にファイルサイズが増加することに注意してください。",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "暗号化した場合には必ず、あなたのデータと共に暗号化キーをバックアップすることを確認し、定期的にデータをバックアップを作成することをお勧めします。",
+    "This is the final warning: Do you really want to enable encryption?" : "これが最後の警告です：本当に暗号化を有効にしますか？",
+    "Enable encryption" : "暗号化を有効に",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "暗号化モジュールがロードされていません。アプリのメニューから暗号化モジュールを有効化してください。",
+    "Select default encryption module:" : "デフォルトの暗号化モジュールを選択:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。\"デフォルトの暗号化モジュール\" を有効にして 'occ encryption:migrate' を実行してください。",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。",
+    "Start migration" : "移行を開始",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
+    "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
+    "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題",
+    "Errors and fatal issues" : "エラー、致命的な問題",
+    "Fatal issues only" : "致命的な問題のみ",
+    "Log" : "ログ",
+    "What to log" : "ログ出力対象",
+    "Download logfile" : "ログファイルのダウンロード",
+    "More" : "もっと見る",
+    "Less" : "閉じる",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ログファイルが100MB以上あります。ダウンロードに時間がかかります！",
+    "Security & setup warnings" : "セキュリティ＆セットアップ警告",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHPのシステム環境変数が正しく設定されていないようです。getenv(\"PATH\") コマンドでテストして何も値を返さないことを確認してください。",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "PHP設定の注意事項と php-fpmを利用する場合のサーバー向け設定を <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> インストールドキュメント ↗</a> で確認してください。",
     "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." : "\"config\"は読み取り専用になってます。そのためにWEBインターフェースで設定できません可能性があります。さらに、更新時に\"config\"ファイルを書き込み権限を与えることが必要",
@@ -146,7 +173,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI から cronジョブを実行することができませんでした。次の技術的なエラーが発生しています：",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">インストールガイド ↗</a>をもう一度チェックして、<a href=\"#log-section\">ログ</a> にあるエラーまたは警告について確認してください。",
     "All checks passed." : "すべてのチェックに合格しました。",
-    "Open documentation" : "ドキュメントを開く",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "最終cronジョブ実行: %s",
+    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s  何らかの問題があります。",
+    "Cron was not executed yet!" : "cronはまだ実行されていません！",
+    "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されます。",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行します。",
+    "Version" : "バージョン",
+    "Sharing" : "共有",
     "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
     "Allow users to share via link" : "URLリンクでの共有を許可する",
     "Allow public uploads" : "パブリックなアップロードを許可する",
@@ -163,45 +198,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "共有可能なグループから除外する",
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "共有ダイアログでのユーザー名の自動補完を有効にする。このチェックを無効にした場合は、完全なユーザー名を入力する必要があります。",
-    "Last cron job execution: %s." : "最終cronジョブ実行: %s",
-    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s  何らかの問題があります。",
-    "Cron was not executed yet!" : "cronはまだ実行されていません！",
-    "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されます。",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行します。",
-    "Enable server-side encryption" : "サーバーサイド暗号化を有効にする",
-    "Please read carefully before activating server-side encryption: " : "サーバーサイド暗号化を有効にする前によくお読みください:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "暗号化を一度有効化すると、この時点からサーバーにアップロードされるファイルの全てが暗号化されサーバー上に入ります。有効化された暗号モジュールは復号化機能をサポートしますが、すべての前提条件が満たされている(例えば、回復キーが設定されている)場合にのみ、後日暗号化を無効にすることが可能です。",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "暗号化だけで、システムのセキュリティが保証されるものではありません。暗号化アプリがどのように動作するかの詳細について、およびサポートされているユースケースについてはownCloudのドキュメントを参照してください。",
-    "Be aware that encryption always increases the file size." : "暗号化は、常にファイルサイズが増加することに注意してください。",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "暗号化した場合には必ず、あなたのデータと共に暗号化キーをバックアップすることを確認し、定期的にデータをバックアップを作成することをお勧めします。",
-    "This is the final warning: Do you really want to enable encryption?" : "これが最後の警告です：本当に暗号化を有効にしますか？",
-    "Enable encryption" : "暗号化を有効に",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "暗号化モジュールがロードされていません。アプリのメニューから暗号化モジュールを有効化してください。",
-    "Select default encryption module:" : "デフォルトの暗号化モジュールを選択:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。\"デフォルトの暗号化モジュール\" を有効にして 'occ encryption:migrate' を実行してください。",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。",
-    "Start migration" : "移行を開始",
-    "This is used for sending out notifications." : "通知を送信する際に使用します。",
-    "Send mode" : "送信モード",
-    "Encryption" : "暗号化",
-    "From address" : "送信元アドレス",
-    "mail" : "mail",
-    "Authentication method" : "認証方法",
-    "Authentication required" : "認証を必要とする",
-    "Server address" : "サーバーアドレス",
-    "Port" : "ポート",
-    "Credentials" : "資格情報",
-    "SMTP Username" : "SMTPユーザー名",
-    "SMTP Password" : "SMTP パスワード",
-    "Store credentials" : "資格情報を保存",
-    "Test email settings" : "メール設定のテスト",
-    "Send email" : "メールを送信",
-    "What to log" : "ログ出力対象",
-    "Download logfile" : "ログファイルのダウンロード",
-    "More" : "もっと見る",
-    "Less" : "閉じる",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ログファイルが100MB以上あります。ダウンロードに時間がかかります！",
+    "Tips & tricks" : "ヒントとコツ",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です．",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "他のデータベースに移行する場合はコマンドラインツール: 'occ db:convert-type' を使うか、<a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> ドキュメント ↗</a>を参照してください。",
@@ -211,7 +208,6 @@ OC.L10N.register(
     "Improving the config.php" : "config.phpの改善",
     "Theming" : "テーマ",
     "Hardening and security guidance" : "堅牢化とセキュリティガイダンス",
-    "Version" : "バージョン",
     "Developer documentation" : "開発者ドキュメント",
     "Experimental applications ahead" : "実験的なアプリケーションを試す",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "実験的なアプリは、脆弱性についてチェックされていませんし、不安定であったり、激しく開発中です。それらをインストールすると、データの損失やセキュリティ侵害を引き起こす可能性があります。",
@@ -267,18 +263,17 @@ OC.L10N.register(
     "Change password" : "パスワードを変更",
     "Language" : "言語",
     "Help translate" : "翻訳に協力する",
+    "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
+    "Desktop client" : "デスクトップクライアント",
+    "Android app" : "Androidアプリ",
+    "iOS app" : "iOSアプリ",
+    "Show First Run Wizard again" : "初回ウィザードを再表示する",
     "Name" : "名前",
     "App name" : "アプリ名",
     "Create new app password" : "新規アプリパスワードを作成",
     "Use the credentials below to configure your app or device." : "アプリや端末を設定するのに以下の認証情報を使用する。",
     "Username" : "ユーザーID",
     "Done" : "完了",
-    "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
-    "Desktop client" : "デスクトップクライアント",
-    "Android app" : "Androidアプリ",
-    "iOS app" : "iOSアプリ",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "このプロジェクトを応援するには、\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">開発に参加</a>\n\t\tもしくは、\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">世界に拡散</a>!\nしてください。",
-    "Show First Run Wizard again" : "初回ウィザードを再表示する",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
     "Show user backend" : "ユーザーバックエンドを表示",
@@ -297,6 +292,10 @@ OC.L10N.register(
     "change full name" : "名前を変更",
     "set new password" : "新しいパスワードを設定",
     "change email address" : "メールアドレスを変更",
-    "Default" : "デフォルト"
+    "Default" : "デフォルト",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "外部ストレージ",
+    "Updates" : "アップデート"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 37f5853f3ce..ca39ef064d0 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -33,17 +33,6 @@
     "Email saved" : "メールアドレスを保存しました",
     "Your full name has been changed." : "名前を変更しました。",
     "Unable to change full name" : "名前を変更できません",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "セキュリティ＆セットアップ警告",
-    "Sharing" : "共有",
-    "Server-side encryption" : "サーバーサイド暗号化",
-    "External Storage" : "外部ストレージ",
-    "Cron" : "Cron",
-    "Email server" : "メールサーバー",
-    "Log" : "ログ",
-    "Tips & tricks" : "ヒントとコツ",
-    "Updates" : "アップデート",
     "Couldn't remove app." : "アプリが削除できませんでした。",
     "Language changed" : "言語が変更されました",
     "Invalid request" : "不正なリクエスト",
@@ -118,17 +107,55 @@
     "Sessions" : "セッション",
     "App passwords" : "アプリパスワード",
     "Sync clients" : "同期用クライアント",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
-    "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
-    "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題",
-    "Errors and fatal issues" : "エラー、致命的な問題",
-    "Fatal issues only" : "致命的な問題のみ",
     "None" : "なし",
     "Login" : "ログイン",
     "Plain" : "平文",
     "NT LAN Manager" : "NT LAN マネージャー",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "メールサーバー",
+    "Open documentation" : "ドキュメントを開く",
+    "This is used for sending out notifications." : "通知を送信する際に使用します。",
+    "Send mode" : "送信モード",
+    "Encryption" : "暗号化",
+    "From address" : "送信元アドレス",
+    "mail" : "mail",
+    "Authentication method" : "認証方法",
+    "Authentication required" : "認証を必要とする",
+    "Server address" : "サーバーアドレス",
+    "Port" : "ポート",
+    "Credentials" : "資格情報",
+    "SMTP Username" : "SMTPユーザー名",
+    "SMTP Password" : "SMTP パスワード",
+    "Store credentials" : "資格情報を保存",
+    "Test email settings" : "メール設定のテスト",
+    "Send email" : "メールを送信",
+    "Server-side encryption" : "サーバーサイド暗号化",
+    "Enable server-side encryption" : "サーバーサイド暗号化を有効にする",
+    "Please read carefully before activating server-side encryption: " : "サーバーサイド暗号化を有効にする前によくお読みください:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "暗号化を一度有効化すると、この時点からサーバーにアップロードされるファイルの全てが暗号化されサーバー上に入ります。有効化された暗号モジュールは復号化機能をサポートしますが、すべての前提条件が満たされている(例えば、回復キーが設定されている)場合にのみ、後日暗号化を無効にすることが可能です。",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "暗号化だけで、システムのセキュリティが保証されるものではありません。暗号化アプリがどのように動作するかの詳細について、およびサポートされているユースケースについてはownCloudのドキュメントを参照してください。",
+    "Be aware that encryption always increases the file size." : "暗号化は、常にファイルサイズが増加することに注意してください。",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "暗号化した場合には必ず、あなたのデータと共に暗号化キーをバックアップすることを確認し、定期的にデータをバックアップを作成することをお勧めします。",
+    "This is the final warning: Do you really want to enable encryption?" : "これが最後の警告です：本当に暗号化を有効にしますか？",
+    "Enable encryption" : "暗号化を有効に",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "暗号化モジュールがロードされていません。アプリのメニューから暗号化モジュールを有効化してください。",
+    "Select default encryption module:" : "デフォルトの暗号化モジュールを選択:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。\"デフォルトの暗号化モジュール\" を有効にして 'occ encryption:migrate' を実行してください。",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。",
+    "Start migration" : "移行を開始",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
+    "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
+    "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題",
+    "Errors and fatal issues" : "エラー、致命的な問題",
+    "Fatal issues only" : "致命的な問題のみ",
+    "Log" : "ログ",
+    "What to log" : "ログ出力対象",
+    "Download logfile" : "ログファイルのダウンロード",
+    "More" : "もっと見る",
+    "Less" : "閉じる",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ログファイルが100MB以上あります。ダウンロードに時間がかかります！",
+    "Security & setup warnings" : "セキュリティ＆セットアップ警告",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHPのシステム環境変数が正しく設定されていないようです。getenv(\"PATH\") コマンドでテストして何も値を返さないことを確認してください。",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "PHP設定の注意事項と php-fpmを利用する場合のサーバー向け設定を <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> インストールドキュメント ↗</a> で確認してください。",
     "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." : "\"config\"は読み取り専用になってます。そのためにWEBインターフェースで設定できません可能性があります。さらに、更新時に\"config\"ファイルを書き込み権限を与えることが必要",
@@ -144,7 +171,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI から cronジョブを実行することができませんでした。次の技術的なエラーが発生しています：",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">インストールガイド ↗</a>をもう一度チェックして、<a href=\"#log-section\">ログ</a> にあるエラーまたは警告について確認してください。",
     "All checks passed." : "すべてのチェックに合格しました。",
-    "Open documentation" : "ドキュメントを開く",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "最終cronジョブ実行: %s",
+    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s  何らかの問題があります。",
+    "Cron was not executed yet!" : "cronはまだ実行されていません！",
+    "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されます。",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行します。",
+    "Version" : "バージョン",
+    "Sharing" : "共有",
     "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
     "Allow users to share via link" : "URLリンクでの共有を許可する",
     "Allow public uploads" : "パブリックなアップロードを許可する",
@@ -161,45 +196,7 @@
     "Exclude groups from sharing" : "共有可能なグループから除外する",
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "共有ダイアログでのユーザー名の自動補完を有効にする。このチェックを無効にした場合は、完全なユーザー名を入力する必要があります。",
-    "Last cron job execution: %s." : "最終cronジョブ実行: %s",
-    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s  何らかの問題があります。",
-    "Cron was not executed yet!" : "cronはまだ実行されていません！",
-    "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されます。",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行します。",
-    "Enable server-side encryption" : "サーバーサイド暗号化を有効にする",
-    "Please read carefully before activating server-side encryption: " : "サーバーサイド暗号化を有効にする前によくお読みください:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "暗号化を一度有効化すると、この時点からサーバーにアップロードされるファイルの全てが暗号化されサーバー上に入ります。有効化された暗号モジュールは復号化機能をサポートしますが、すべての前提条件が満たされている(例えば、回復キーが設定されている)場合にのみ、後日暗号化を無効にすることが可能です。",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "暗号化だけで、システムのセキュリティが保証されるものではありません。暗号化アプリがどのように動作するかの詳細について、およびサポートされているユースケースについてはownCloudのドキュメントを参照してください。",
-    "Be aware that encryption always increases the file size." : "暗号化は、常にファイルサイズが増加することに注意してください。",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "暗号化した場合には必ず、あなたのデータと共に暗号化キーをバックアップすることを確認し、定期的にデータをバックアップを作成することをお勧めします。",
-    "This is the final warning: Do you really want to enable encryption?" : "これが最後の警告です：本当に暗号化を有効にしますか？",
-    "Enable encryption" : "暗号化を有効に",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "暗号化モジュールがロードされていません。アプリのメニューから暗号化モジュールを有効化してください。",
-    "Select default encryption module:" : "デフォルトの暗号化モジュールを選択:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。\"デフォルトの暗号化モジュール\" を有効にして 'occ encryption:migrate' を実行してください。",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。",
-    "Start migration" : "移行を開始",
-    "This is used for sending out notifications." : "通知を送信する際に使用します。",
-    "Send mode" : "送信モード",
-    "Encryption" : "暗号化",
-    "From address" : "送信元アドレス",
-    "mail" : "mail",
-    "Authentication method" : "認証方法",
-    "Authentication required" : "認証を必要とする",
-    "Server address" : "サーバーアドレス",
-    "Port" : "ポート",
-    "Credentials" : "資格情報",
-    "SMTP Username" : "SMTPユーザー名",
-    "SMTP Password" : "SMTP パスワード",
-    "Store credentials" : "資格情報を保存",
-    "Test email settings" : "メール設定のテスト",
-    "Send email" : "メールを送信",
-    "What to log" : "ログ出力対象",
-    "Download logfile" : "ログファイルのダウンロード",
-    "More" : "もっと見る",
-    "Less" : "閉じる",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ログファイルが100MB以上あります。ダウンロードに時間がかかります！",
+    "Tips & tricks" : "ヒントとコツ",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です．",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "他のデータベースに移行する場合はコマンドラインツール: 'occ db:convert-type' を使うか、<a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> ドキュメント ↗</a>を参照してください。",
@@ -209,7 +206,6 @@
     "Improving the config.php" : "config.phpの改善",
     "Theming" : "テーマ",
     "Hardening and security guidance" : "堅牢化とセキュリティガイダンス",
-    "Version" : "バージョン",
     "Developer documentation" : "開発者ドキュメント",
     "Experimental applications ahead" : "実験的なアプリケーションを試す",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "実験的なアプリは、脆弱性についてチェックされていませんし、不安定であったり、激しく開発中です。それらをインストールすると、データの損失やセキュリティ侵害を引き起こす可能性があります。",
@@ -265,18 +261,17 @@
     "Change password" : "パスワードを変更",
     "Language" : "言語",
     "Help translate" : "翻訳に協力する",
+    "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
+    "Desktop client" : "デスクトップクライアント",
+    "Android app" : "Androidアプリ",
+    "iOS app" : "iOSアプリ",
+    "Show First Run Wizard again" : "初回ウィザードを再表示する",
     "Name" : "名前",
     "App name" : "アプリ名",
     "Create new app password" : "新規アプリパスワードを作成",
     "Use the credentials below to configure your app or device." : "アプリや端末を設定するのに以下の認証情報を使用する。",
     "Username" : "ユーザーID",
     "Done" : "完了",
-    "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
-    "Desktop client" : "デスクトップクライアント",
-    "Android app" : "Androidアプリ",
-    "iOS app" : "iOSアプリ",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "このプロジェクトを応援するには、\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">開発に参加</a>\n\t\tもしくは、\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">世界に拡散</a>!\nしてください。",
-    "Show First Run Wizard again" : "初回ウィザードを再表示する",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
     "Show user backend" : "ユーザーバックエンドを表示",
@@ -295,6 +290,10 @@
     "change full name" : "名前を変更",
     "set new password" : "新しいパスワードを設定",
     "change email address" : "メールアドレスを変更",
-    "Default" : "デフォルト"
+    "Default" : "デフォルト",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "外部ストレージ",
+    "Updates" : "アップデート"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 07354f29815..edbcc47a7fc 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "이메일 저장됨",
     "Your full name has been changed." : "전체 이름이 변경되었습니다.",
     "Unable to change full name" : "전체 이름을 변경할 수 없음",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "보안 및 설치 경고",
-    "Sharing" : "공유",
-    "Server-side encryption" : "서버 측 암호화",
-    "External Storage" : "외부 저장소",
-    "Cron" : "Cron",
-    "Email server" : "이메일 서버",
-    "Log" : "로그",
-    "Tips & tricks" : "팁과 추가 정보",
-    "Updates" : "업데이트",
     "Couldn't remove app." : "앱을 삭제할 수 없습니다.",
     "Language changed" : "언어가 변경됨",
     "Invalid request" : "잘못된 요청",
@@ -110,17 +99,54 @@ OC.L10N.register(
     "Unlimited" : "무제한",
     "Personal info" : "개인 정보",
     "Sync clients" : "동기화 클라이언트",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
-    "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제",
-    "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제",
-    "Errors and fatal issues" : "오류, 치명적 문제",
-    "Fatal issues only" : "치명적 문제만",
     "None" : "없음",
     "Login" : "로그인",
     "Plain" : "일반",
     "NT LAN Manager" : "NT LAN 관리자",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "이메일 서버",
+    "Open documentation" : "문서 열기",
+    "This is used for sending out notifications." : "알림을 보낼 때 사용됩니다.",
+    "Send mode" : "보내기 모드",
+    "Encryption" : "암호화",
+    "From address" : "보낸 사람 주소",
+    "mail" : "메일",
+    "Authentication method" : "인증 방법",
+    "Authentication required" : "인증 필요함",
+    "Server address" : "서버 주소",
+    "Port" : "포트",
+    "Credentials" : "자격 정보",
+    "SMTP Username" : "SMTP 사용자 이름",
+    "SMTP Password" : "SMTP 암호",
+    "Store credentials" : "인증 정보 저장",
+    "Test email settings" : "이메일 설정 시험",
+    "Send email" : "이메일 보내기",
+    "Server-side encryption" : "서버 측 암호화",
+    "Enable server-side encryption" : "서버 측 암호화 사용",
+    "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "암호화를 사용하면, 사용하기 시작한 시간 이후에 서버에 업로드된 모든 파일이 암호화됩니다. 나중에 암호화를 사용하지 않으려면 사용하고 있는 암호화 모듈에서 비활성화를 지원해야 하고 모든 사전 조건(예: 복구 키 설정)을 만족해야 합니다.",
+    "Be aware that encryption always increases the file size." : "암호화된 파일의 크기는 항상 커집니다.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "데이터를 주기적으로 백업하는 것을 추천하며, 암호화를 사용하고 있다면 데이터와 더불어 암호화 키도 백업하십시오.",
+    "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
+    "Enable encryption" : "암호화 사용",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
+    "Select default encryption module:" : "기본 암호화 모듈 선택:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "과거에 사용하였던(ownCloud <= 8.0) 암호화된 데이터에서 키를 이전해야 합니다. \"기본 암호화 모듈\"을 활성화한 다음 'occ encryption:migrate'를 실행하십시오",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "ownCloud 8.0 이하에서 사용한 이전 암호화 키를 새 키로 이전해야 합니다.",
+    "Start migration" : "이전 시작",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
+    "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제",
+    "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제",
+    "Errors and fatal issues" : "오류, 치명적 문제",
+    "Fatal issues only" : "치명적 문제만",
+    "Log" : "로그",
+    "What to log" : "남길 로그",
+    "Download logfile" : "로그 파일 다운로드",
+    "More" : "더 중요함",
+    "Less" : "덜 중요함",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!",
+    "Security & setup warnings" : "보안 및 설치 경고",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php가 시스템 환경 변수를 올바르게 조회할 수 있도록 설정되지 않았습니다. getenv(\"PATH\")의 값이 비어 있습니다.",
     "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." : "읽기 전용 설정이 활성화되었습니다. 이 상태에서는 웹 인터페이스를 통하여 일부 설정을 변경할 수 없습니다. 또한 매 업데이트마다 파일을 쓸 수 있는 상태로 변경해야 합니다.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
@@ -132,7 +158,15 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI로 cronjob을 실행할 수 없었습니다. 다음 기술적 오류가 발생했습니다:",
     "All checks passed." : "모든 검사를 통과했습니다.",
-    "Open documentation" : "문서 열기",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "마지막 cron 작업 실행: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "마지막 cron 작업 실행: %s. 문제가 발생한 것 같습니다.",
+    "Cron was not executed yet!" : "Cron이 실행되지 않았습니다!",
+    "Execute one task with each page loaded" : "개별 페이지를 불러올 때마다 실행",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
+    "Version" : "버전",
+    "Sharing" : "공유",
     "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
     "Allow users to share via link" : "사용자별 링크 공유 허용",
     "Allow public uploads" : "공개 업로드 허용",
@@ -148,44 +182,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "공유에서 그룹 제외",
     "These groups will still be able to receive shares, but not to initiate them." : "이 그룹의 사용자들은 다른 사용자가 공유한 파일을 받을 수는 있지만, 자기 파일을 공유할 수는 없습니다.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "공유 대화 상자에서 사용자 이름 자동 완성을 사용합니다. 이 설정을 사용하지 않으면 전체 사용자 이름을 입력해야 합니다.",
-    "Last cron job execution: %s." : "마지막 cron 작업 실행: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "마지막 cron 작업 실행: %s. 문제가 발생한 것 같습니다.",
-    "Cron was not executed yet!" : "Cron이 실행되지 않았습니다!",
-    "Execute one task with each page loaded" : "개별 페이지를 불러올 때마다 실행",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
-    "Enable server-side encryption" : "서버 측 암호화 사용",
-    "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "암호화를 사용하면, 사용하기 시작한 시간 이후에 서버에 업로드된 모든 파일이 암호화됩니다. 나중에 암호화를 사용하지 않으려면 사용하고 있는 암호화 모듈에서 비활성화를 지원해야 하고 모든 사전 조건(예: 복구 키 설정)을 만족해야 합니다.",
-    "Be aware that encryption always increases the file size." : "암호화된 파일의 크기는 항상 커집니다.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "데이터를 주기적으로 백업하는 것을 추천하며, 암호화를 사용하고 있다면 데이터와 더불어 암호화 키도 백업하십시오.",
-    "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
-    "Enable encryption" : "암호화 사용",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
-    "Select default encryption module:" : "기본 암호화 모듈 선택:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "과거에 사용하였던(ownCloud <= 8.0) 암호화된 데이터에서 키를 이전해야 합니다. \"기본 암호화 모듈\"을 활성화한 다음 'occ encryption:migrate'를 실행하십시오",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "ownCloud 8.0 이하에서 사용한 이전 암호화 키를 새 키로 이전해야 합니다.",
-    "Start migration" : "이전 시작",
-    "This is used for sending out notifications." : "알림을 보낼 때 사용됩니다.",
-    "Send mode" : "보내기 모드",
-    "Encryption" : "암호화",
-    "From address" : "보낸 사람 주소",
-    "mail" : "메일",
-    "Authentication method" : "인증 방법",
-    "Authentication required" : "인증 필요함",
-    "Server address" : "서버 주소",
-    "Port" : "포트",
-    "Credentials" : "자격 정보",
-    "SMTP Username" : "SMTP 사용자 이름",
-    "SMTP Password" : "SMTP 암호",
-    "Store credentials" : "인증 정보 저장",
-    "Test email settings" : "이메일 설정 시험",
-    "Send email" : "이메일 보내기",
-    "What to log" : "남길 로그",
-    "Download logfile" : "로그 파일 다운로드",
-    "More" : "더 중요함",
-    "Less" : "덜 중요함",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!",
+    "Tips & tricks" : "팁과 추가 정보",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.",
     "How to do backups" : "백업 방법",
@@ -194,7 +191,6 @@ OC.L10N.register(
     "Improving the config.php" : "config.php 개선",
     "Theming" : "테마 꾸미기",
     "Hardening and security guidance" : "보안 강화 지침",
-    "Version" : "버전",
     "Developer documentation" : "개발자 문서",
     "Experimental applications ahead" : "실험적인 앱 사용 예정",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "실험적인 앱은 보안 문제 검사를 통과하지 않았으며, 아직 새롭거나, 불안정하거나, 개발 중일 수도 있습니다. 이러한 앱을 설치하면 데이터 손실 및 보안 문제가 발생할 수도 있습니다.",
@@ -244,14 +240,14 @@ OC.L10N.register(
     "Change password" : "암호 변경",
     "Language" : "언어",
     "Help translate" : "번역 돕기",
-    "Name" : "이름",
-    "Username" : "사용자 이름",
-    "Done" : "완료",
     "Get the apps to sync your files" : "파일 동기화 앱 가져오기",
     "Desktop client" : "데스크톱 클라이언트",
     "Android app" : "Android 앱",
     "iOS app" : "iOS 앱",
     "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기",
+    "Name" : "이름",
+    "Username" : "사용자 이름",
+    "Done" : "완료",
     "Show storage location" : "저장소 위치 보이기",
     "Show last log in" : "마지막 로그인 시간 보이기",
     "Show user backend" : "사용자 백엔드 보이기",
@@ -270,6 +266,10 @@ OC.L10N.register(
     "change full name" : "전체 이름 변경",
     "set new password" : "새 암호 설정",
     "change email address" : "이메일 주소 변경",
-    "Default" : "기본값"
+    "Default" : "기본값",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "외부 저장소",
+    "Updates" : "업데이트"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 415afd7120f..17aea8ff845 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -33,17 +33,6 @@
     "Email saved" : "이메일 저장됨",
     "Your full name has been changed." : "전체 이름이 변경되었습니다.",
     "Unable to change full name" : "전체 이름을 변경할 수 없음",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "보안 및 설치 경고",
-    "Sharing" : "공유",
-    "Server-side encryption" : "서버 측 암호화",
-    "External Storage" : "외부 저장소",
-    "Cron" : "Cron",
-    "Email server" : "이메일 서버",
-    "Log" : "로그",
-    "Tips & tricks" : "팁과 추가 정보",
-    "Updates" : "업데이트",
     "Couldn't remove app." : "앱을 삭제할 수 없습니다.",
     "Language changed" : "언어가 변경됨",
     "Invalid request" : "잘못된 요청",
@@ -108,17 +97,54 @@
     "Unlimited" : "무제한",
     "Personal info" : "개인 정보",
     "Sync clients" : "동기화 클라이언트",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
-    "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제",
-    "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제",
-    "Errors and fatal issues" : "오류, 치명적 문제",
-    "Fatal issues only" : "치명적 문제만",
     "None" : "없음",
     "Login" : "로그인",
     "Plain" : "일반",
     "NT LAN Manager" : "NT LAN 관리자",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "이메일 서버",
+    "Open documentation" : "문서 열기",
+    "This is used for sending out notifications." : "알림을 보낼 때 사용됩니다.",
+    "Send mode" : "보내기 모드",
+    "Encryption" : "암호화",
+    "From address" : "보낸 사람 주소",
+    "mail" : "메일",
+    "Authentication method" : "인증 방법",
+    "Authentication required" : "인증 필요함",
+    "Server address" : "서버 주소",
+    "Port" : "포트",
+    "Credentials" : "자격 정보",
+    "SMTP Username" : "SMTP 사용자 이름",
+    "SMTP Password" : "SMTP 암호",
+    "Store credentials" : "인증 정보 저장",
+    "Test email settings" : "이메일 설정 시험",
+    "Send email" : "이메일 보내기",
+    "Server-side encryption" : "서버 측 암호화",
+    "Enable server-side encryption" : "서버 측 암호화 사용",
+    "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "암호화를 사용하면, 사용하기 시작한 시간 이후에 서버에 업로드된 모든 파일이 암호화됩니다. 나중에 암호화를 사용하지 않으려면 사용하고 있는 암호화 모듈에서 비활성화를 지원해야 하고 모든 사전 조건(예: 복구 키 설정)을 만족해야 합니다.",
+    "Be aware that encryption always increases the file size." : "암호화된 파일의 크기는 항상 커집니다.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "데이터를 주기적으로 백업하는 것을 추천하며, 암호화를 사용하고 있다면 데이터와 더불어 암호화 키도 백업하십시오.",
+    "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
+    "Enable encryption" : "암호화 사용",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
+    "Select default encryption module:" : "기본 암호화 모듈 선택:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "과거에 사용하였던(ownCloud <= 8.0) 암호화된 데이터에서 키를 이전해야 합니다. \"기본 암호화 모듈\"을 활성화한 다음 'occ encryption:migrate'를 실행하십시오",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "ownCloud 8.0 이하에서 사용한 이전 암호화 키를 새 키로 이전해야 합니다.",
+    "Start migration" : "이전 시작",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
+    "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제",
+    "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제",
+    "Errors and fatal issues" : "오류, 치명적 문제",
+    "Fatal issues only" : "치명적 문제만",
+    "Log" : "로그",
+    "What to log" : "남길 로그",
+    "Download logfile" : "로그 파일 다운로드",
+    "More" : "더 중요함",
+    "Less" : "덜 중요함",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!",
+    "Security & setup warnings" : "보안 및 설치 경고",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php가 시스템 환경 변수를 올바르게 조회할 수 있도록 설정되지 않았습니다. getenv(\"PATH\")의 값이 비어 있습니다.",
     "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." : "읽기 전용 설정이 활성화되었습니다. 이 상태에서는 웹 인터페이스를 통하여 일부 설정을 변경할 수 없습니다. 또한 매 업데이트마다 파일을 쓸 수 있는 상태로 변경해야 합니다.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
@@ -130,7 +156,15 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI로 cronjob을 실행할 수 없었습니다. 다음 기술적 오류가 발생했습니다:",
     "All checks passed." : "모든 검사를 통과했습니다.",
-    "Open documentation" : "문서 열기",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "마지막 cron 작업 실행: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "마지막 cron 작업 실행: %s. 문제가 발생한 것 같습니다.",
+    "Cron was not executed yet!" : "Cron이 실행되지 않았습니다!",
+    "Execute one task with each page loaded" : "개별 페이지를 불러올 때마다 실행",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
+    "Version" : "버전",
+    "Sharing" : "공유",
     "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
     "Allow users to share via link" : "사용자별 링크 공유 허용",
     "Allow public uploads" : "공개 업로드 허용",
@@ -146,44 +180,7 @@
     "Exclude groups from sharing" : "공유에서 그룹 제외",
     "These groups will still be able to receive shares, but not to initiate them." : "이 그룹의 사용자들은 다른 사용자가 공유한 파일을 받을 수는 있지만, 자기 파일을 공유할 수는 없습니다.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "공유 대화 상자에서 사용자 이름 자동 완성을 사용합니다. 이 설정을 사용하지 않으면 전체 사용자 이름을 입력해야 합니다.",
-    "Last cron job execution: %s." : "마지막 cron 작업 실행: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "마지막 cron 작업 실행: %s. 문제가 발생한 것 같습니다.",
-    "Cron was not executed yet!" : "Cron이 실행되지 않았습니다!",
-    "Execute one task with each page loaded" : "개별 페이지를 불러올 때마다 실행",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
-    "Enable server-side encryption" : "서버 측 암호화 사용",
-    "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "암호화를 사용하면, 사용하기 시작한 시간 이후에 서버에 업로드된 모든 파일이 암호화됩니다. 나중에 암호화를 사용하지 않으려면 사용하고 있는 암호화 모듈에서 비활성화를 지원해야 하고 모든 사전 조건(예: 복구 키 설정)을 만족해야 합니다.",
-    "Be aware that encryption always increases the file size." : "암호화된 파일의 크기는 항상 커집니다.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "데이터를 주기적으로 백업하는 것을 추천하며, 암호화를 사용하고 있다면 데이터와 더불어 암호화 키도 백업하십시오.",
-    "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
-    "Enable encryption" : "암호화 사용",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
-    "Select default encryption module:" : "기본 암호화 모듈 선택:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "과거에 사용하였던(ownCloud <= 8.0) 암호화된 데이터에서 키를 이전해야 합니다. \"기본 암호화 모듈\"을 활성화한 다음 'occ encryption:migrate'를 실행하십시오",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "ownCloud 8.0 이하에서 사용한 이전 암호화 키를 새 키로 이전해야 합니다.",
-    "Start migration" : "이전 시작",
-    "This is used for sending out notifications." : "알림을 보낼 때 사용됩니다.",
-    "Send mode" : "보내기 모드",
-    "Encryption" : "암호화",
-    "From address" : "보낸 사람 주소",
-    "mail" : "메일",
-    "Authentication method" : "인증 방법",
-    "Authentication required" : "인증 필요함",
-    "Server address" : "서버 주소",
-    "Port" : "포트",
-    "Credentials" : "자격 정보",
-    "SMTP Username" : "SMTP 사용자 이름",
-    "SMTP Password" : "SMTP 암호",
-    "Store credentials" : "인증 정보 저장",
-    "Test email settings" : "이메일 설정 시험",
-    "Send email" : "이메일 보내기",
-    "What to log" : "남길 로그",
-    "Download logfile" : "로그 파일 다운로드",
-    "More" : "더 중요함",
-    "Less" : "덜 중요함",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!",
+    "Tips & tricks" : "팁과 추가 정보",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.",
     "How to do backups" : "백업 방법",
@@ -192,7 +189,6 @@
     "Improving the config.php" : "config.php 개선",
     "Theming" : "테마 꾸미기",
     "Hardening and security guidance" : "보안 강화 지침",
-    "Version" : "버전",
     "Developer documentation" : "개발자 문서",
     "Experimental applications ahead" : "실험적인 앱 사용 예정",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "실험적인 앱은 보안 문제 검사를 통과하지 않았으며, 아직 새롭거나, 불안정하거나, 개발 중일 수도 있습니다. 이러한 앱을 설치하면 데이터 손실 및 보안 문제가 발생할 수도 있습니다.",
@@ -242,14 +238,14 @@
     "Change password" : "암호 변경",
     "Language" : "언어",
     "Help translate" : "번역 돕기",
-    "Name" : "이름",
-    "Username" : "사용자 이름",
-    "Done" : "완료",
     "Get the apps to sync your files" : "파일 동기화 앱 가져오기",
     "Desktop client" : "데스크톱 클라이언트",
     "Android app" : "Android 앱",
     "iOS app" : "iOS 앱",
     "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기",
+    "Name" : "이름",
+    "Username" : "사용자 이름",
+    "Done" : "완료",
     "Show storage location" : "저장소 위치 보이기",
     "Show last log in" : "마지막 로그인 시간 보이기",
     "Show user backend" : "사용자 백엔드 보이기",
@@ -268,6 +264,10 @@
     "change full name" : "전체 이름 변경",
     "set new password" : "새 암호 설정",
     "change email address" : "이메일 주소 변경",
-    "Default" : "기본값"
+    "Default" : "기본값",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "외부 저장소",
+    "Updates" : "업데이트"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 3978bc41e47..ceec6f5b244 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "Epost lagret",
     "Your full name has been changed." : "Ditt fulle navn er blitt endret.",
     "Unable to change full name" : "Klarte ikke å endre fullt navn",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Advarsler om sikkerhet og oppsett",
-    "Sharing" : "Deling",
-    "Server-side encryption" : "Serverkryptering",
-    "External Storage" : "Ekstern lagring",
-    "Cron" : "Cron",
-    "Email server" : "E-postserver",
-    "Log" : "Logg",
-    "Tips & tricks" : "Tips og triks",
-    "Updates" : "Oppdateringer",
     "Couldn't remove app." : "Klarte ikke å fjerne app.",
     "Language changed" : "Språk endret",
     "Invalid request" : "Ugyldig forespørsel",
@@ -111,17 +100,54 @@ OC.L10N.register(
     "Unlimited" : "Ubegrenset",
     "Personal info" : "Personlig informasjon",
     "Sync clients" : "Synkroniseringsklienter",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)",
-    "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer",
-    "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer",
-    "Errors and fatal issues" : "Feil og fatale problemer",
-    "Fatal issues only" : "Kun fatale problemer",
     "None" : "Ingen",
     "Login" : "Logg inn",
     "Plain" : "Enkel",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-postserver",
+    "Open documentation" : "Åpne dokumentasjonen",
+    "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
+    "Send mode" : "Sendemåte",
+    "Encryption" : "Kryptering",
+    "From address" : "Fra adresse",
+    "mail" : "e-post",
+    "Authentication method" : "Autentiseringsmetode",
+    "Authentication required" : "Autentisering kreves",
+    "Server address" : "Server-adresse",
+    "Port" : "Port",
+    "Credentials" : "Påloggingsdetaljer",
+    "SMTP Username" : "SMTP-brukernavn",
+    "SMTP Password" : "SMTP-passord",
+    "Store credentials" : "Lagre påloggingsdetaljer",
+    "Test email settings" : "Test innstillinger for e-post",
+    "Send email" : "Send e-post",
+    "Server-side encryption" : "Serverkryptering",
+    "Enable server-side encryption" : "Aktiver serverkryptering",
+    "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Når kryptering er blitt aktivert, vil alle filer som lastes opp til serveren fra det tidspunktet av bli lagret kryptert på serveren. Det vil kun være mulig å deaktivere kryptering senere dersom den aktive krypteringsmodulen støtter det og alle forutsetninger (f.eks. å sette en gjenopprettingsnøkkel) er til stede.",
+    "Be aware that encryption always increases the file size." : "Vær oppmerksom på at kryptering alltid øker filstørrelsen.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det er alltid bra å ta regelmessig sikkerhetskopi av dataene dine. Pass på å ta kopi av krypteringsnøklene sammen med dataene når kryptering er i bruk.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
+    "Enable encryption" : "Aktiver kryptering",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
+    "Select default encryption module:" : "Velg standard krypteringsmodul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye. Vennligst aktiver \"Standard krypteringsmodul\" og kjør 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye.",
+    "Start migration" : "Start migrering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer",
+    "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer",
+    "Errors and fatal issues" : "Feil og fatale problemer",
+    "Fatal issues only" : "Kun fatale problemer",
+    "Log" : "Logg",
+    "What to log" : "Hva som skal logges",
+    "Download logfile" : "Last ned loggfil",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
+    "Security & setup warnings" : "Advarsler om sikkerhet og oppsett",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP ser ikke ut til å være satt opp riktig for å lese systemets miljøvariabler. Testen med getenv(\"PATH\") returnerer bare et tomt svar.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Vennligst sjekk <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installasjonsdokumentasjonen ↗</a> etter php konfigurasjonsnotater og konfigurering av php på serveren din, særlig om du bruker php-fpm.",
     "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." : "Den skrivebeskyttede konfigurasjonen er blitt aktivert. Dette forhindrer setting av visse konfigureringer via web-grensesnittet. Videre må config-filen gjøres skrivbar manuelt for hver oppdatering.",
@@ -137,7 +163,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke mulig å kjøre cron-jobben vi CLI. Følgende tekniske feil oppstod:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Vennligst dobbeltsjekk <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installasjonsguidene ↗</a>, og se etter feil eller advarsler i <a href=\"#log-section\">loggen</a>.",
     "All checks passed." : "Alle sjekker bestått.",
-    "Open documentation" : "Åpne dokumentasjonen",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Siste kjøring av cron-jobb: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Siste kjøring av cron-jobb: %s. Noe ser ut til å være galt.",
+    "Cron was not executed yet!" : "Cron er ikke utført ennå!",
+    "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
+    "Version" : "Versjon",
+    "Sharing" : "Deling",
     "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
     "Allow users to share via link" : "Tillat brukere å dele via lenke",
     "Allow public uploads" : "Tillat offentlig opplasting",
@@ -154,44 +188,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Utelukk grupper fra deling",
     "These groups will still be able to receive shares, but not to initiate them." : "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Tillat automatisk fullføring av brukernavn i delingsdialogen. Uten dette valget må hele brukernavnet oppgis.",
-    "Last cron job execution: %s." : "Siste kjøring av cron-jobb: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Siste kjøring av cron-jobb: %s. Noe ser ut til å være galt.",
-    "Cron was not executed yet!" : "Cron er ikke utført ennå!",
-    "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
-    "Enable server-side encryption" : "Aktiver serverkryptering",
-    "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Når kryptering er blitt aktivert, vil alle filer som lastes opp til serveren fra det tidspunktet av bli lagret kryptert på serveren. Det vil kun være mulig å deaktivere kryptering senere dersom den aktive krypteringsmodulen støtter det og alle forutsetninger (f.eks. å sette en gjenopprettingsnøkkel) er til stede.",
-    "Be aware that encryption always increases the file size." : "Vær oppmerksom på at kryptering alltid øker filstørrelsen.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det er alltid bra å ta regelmessig sikkerhetskopi av dataene dine. Pass på å ta kopi av krypteringsnøklene sammen med dataene når kryptering er i bruk.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
-    "Enable encryption" : "Aktiver kryptering",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
-    "Select default encryption module:" : "Velg standard krypteringsmodul:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye. Vennligst aktiver \"Standard krypteringsmodul\" og kjør 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye.",
-    "Start migration" : "Start migrering",
-    "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
-    "Send mode" : "Sendemåte",
-    "Encryption" : "Kryptering",
-    "From address" : "Fra adresse",
-    "mail" : "e-post",
-    "Authentication method" : "Autentiseringsmetode",
-    "Authentication required" : "Autentisering kreves",
-    "Server address" : "Server-adresse",
-    "Port" : "Port",
-    "Credentials" : "Påloggingsdetaljer",
-    "SMTP Username" : "SMTP-brukernavn",
-    "SMTP Password" : "SMTP-passord",
-    "Store credentials" : "Lagre påloggingsdetaljer",
-    "Test email settings" : "Test innstillinger for e-post",
-    "Send email" : "Send e-post",
-    "What to log" : "Hva som skal logges",
-    "Download logfile" : "Last ned loggfil",
-    "More" : "Mer",
-    "Less" : "Mindre",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
+    "Tips & tricks" : "Tips og triks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.",
@@ -201,7 +198,6 @@ OC.L10N.register(
     "Improving the config.php" : "Tilpasninger i config.php",
     "Theming" : "Temaer",
     "Hardening and security guidance" : "Herding og sikkerhetsveiledning",
-    "Version" : "Versjon",
     "Developer documentation" : "Utviklerdokumentasjon",
     "Experimental applications ahead" : "Eksperimentelle applikasjoner forut",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Eksperimentelle apper er ikke sjekket for sikkerhetsproblemer. De er nye eller de anses som ustabile og under stadig utvikling. Å installere slike apper kan forårsake tap av data eller brudd på sikkerheten.",
@@ -253,14 +249,14 @@ OC.L10N.register(
     "Change password" : "Endre passord",
     "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",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
     "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt",
+    "Name" : "Navn",
+    "Username" : "Brukernavn",
+    "Done" : "Ferdig",
     "Show storage location" : "Vis lagringssted",
     "Show last log in" : "Vis site innlogging",
     "Show user backend" : "Vis bruker-server",
@@ -279,6 +275,10 @@ OC.L10N.register(
     "change full name" : "endre fullt navn",
     "set new password" : "sett nytt passord",
     "change email address" : "endre e-postadresse",
-    "Default" : "Standard"
+    "Default" : "Standard",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Ekstern lagring",
+    "Updates" : "Oppdateringer"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 917b7f49ad4..00943b93bee 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -33,17 +33,6 @@
     "Email saved" : "Epost lagret",
     "Your full name has been changed." : "Ditt fulle navn er blitt endret.",
     "Unable to change full name" : "Klarte ikke å endre fullt navn",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Advarsler om sikkerhet og oppsett",
-    "Sharing" : "Deling",
-    "Server-side encryption" : "Serverkryptering",
-    "External Storage" : "Ekstern lagring",
-    "Cron" : "Cron",
-    "Email server" : "E-postserver",
-    "Log" : "Logg",
-    "Tips & tricks" : "Tips og triks",
-    "Updates" : "Oppdateringer",
     "Couldn't remove app." : "Klarte ikke å fjerne app.",
     "Language changed" : "Språk endret",
     "Invalid request" : "Ugyldig forespørsel",
@@ -109,17 +98,54 @@
     "Unlimited" : "Ubegrenset",
     "Personal info" : "Personlig informasjon",
     "Sync clients" : "Synkroniseringsklienter",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)",
-    "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer",
-    "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer",
-    "Errors and fatal issues" : "Feil og fatale problemer",
-    "Fatal issues only" : "Kun fatale problemer",
     "None" : "Ingen",
     "Login" : "Logg inn",
     "Plain" : "Enkel",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-postserver",
+    "Open documentation" : "Åpne dokumentasjonen",
+    "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
+    "Send mode" : "Sendemåte",
+    "Encryption" : "Kryptering",
+    "From address" : "Fra adresse",
+    "mail" : "e-post",
+    "Authentication method" : "Autentiseringsmetode",
+    "Authentication required" : "Autentisering kreves",
+    "Server address" : "Server-adresse",
+    "Port" : "Port",
+    "Credentials" : "Påloggingsdetaljer",
+    "SMTP Username" : "SMTP-brukernavn",
+    "SMTP Password" : "SMTP-passord",
+    "Store credentials" : "Lagre påloggingsdetaljer",
+    "Test email settings" : "Test innstillinger for e-post",
+    "Send email" : "Send e-post",
+    "Server-side encryption" : "Serverkryptering",
+    "Enable server-side encryption" : "Aktiver serverkryptering",
+    "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Når kryptering er blitt aktivert, vil alle filer som lastes opp til serveren fra det tidspunktet av bli lagret kryptert på serveren. Det vil kun være mulig å deaktivere kryptering senere dersom den aktive krypteringsmodulen støtter det og alle forutsetninger (f.eks. å sette en gjenopprettingsnøkkel) er til stede.",
+    "Be aware that encryption always increases the file size." : "Vær oppmerksom på at kryptering alltid øker filstørrelsen.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det er alltid bra å ta regelmessig sikkerhetskopi av dataene dine. Pass på å ta kopi av krypteringsnøklene sammen med dataene når kryptering er i bruk.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
+    "Enable encryption" : "Aktiver kryptering",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
+    "Select default encryption module:" : "Velg standard krypteringsmodul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye. Vennligst aktiver \"Standard krypteringsmodul\" og kjør 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye.",
+    "Start migration" : "Start migrering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer",
+    "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer",
+    "Errors and fatal issues" : "Feil og fatale problemer",
+    "Fatal issues only" : "Kun fatale problemer",
+    "Log" : "Logg",
+    "What to log" : "Hva som skal logges",
+    "Download logfile" : "Last ned loggfil",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
+    "Security & setup warnings" : "Advarsler om sikkerhet og oppsett",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP ser ikke ut til å være satt opp riktig for å lese systemets miljøvariabler. Testen med getenv(\"PATH\") returnerer bare et tomt svar.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Vennligst sjekk <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installasjonsdokumentasjonen ↗</a> etter php konfigurasjonsnotater og konfigurering av php på serveren din, særlig om du bruker php-fpm.",
     "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." : "Den skrivebeskyttede konfigurasjonen er blitt aktivert. Dette forhindrer setting av visse konfigureringer via web-grensesnittet. Videre må config-filen gjøres skrivbar manuelt for hver oppdatering.",
@@ -135,7 +161,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke mulig å kjøre cron-jobben vi CLI. Følgende tekniske feil oppstod:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Vennligst dobbeltsjekk <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installasjonsguidene ↗</a>, og se etter feil eller advarsler i <a href=\"#log-section\">loggen</a>.",
     "All checks passed." : "Alle sjekker bestått.",
-    "Open documentation" : "Åpne dokumentasjonen",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Siste kjøring av cron-jobb: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Siste kjøring av cron-jobb: %s. Noe ser ut til å være galt.",
+    "Cron was not executed yet!" : "Cron er ikke utført ennå!",
+    "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
+    "Version" : "Versjon",
+    "Sharing" : "Deling",
     "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
     "Allow users to share via link" : "Tillat brukere å dele via lenke",
     "Allow public uploads" : "Tillat offentlig opplasting",
@@ -152,44 +186,7 @@
     "Exclude groups from sharing" : "Utelukk grupper fra deling",
     "These groups will still be able to receive shares, but not to initiate them." : "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Tillat automatisk fullføring av brukernavn i delingsdialogen. Uten dette valget må hele brukernavnet oppgis.",
-    "Last cron job execution: %s." : "Siste kjøring av cron-jobb: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Siste kjøring av cron-jobb: %s. Noe ser ut til å være galt.",
-    "Cron was not executed yet!" : "Cron er ikke utført ennå!",
-    "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
-    "Enable server-side encryption" : "Aktiver serverkryptering",
-    "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Når kryptering er blitt aktivert, vil alle filer som lastes opp til serveren fra det tidspunktet av bli lagret kryptert på serveren. Det vil kun være mulig å deaktivere kryptering senere dersom den aktive krypteringsmodulen støtter det og alle forutsetninger (f.eks. å sette en gjenopprettingsnøkkel) er til stede.",
-    "Be aware that encryption always increases the file size." : "Vær oppmerksom på at kryptering alltid øker filstørrelsen.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det er alltid bra å ta regelmessig sikkerhetskopi av dataene dine. Pass på å ta kopi av krypteringsnøklene sammen med dataene når kryptering er i bruk.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
-    "Enable encryption" : "Aktiver kryptering",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
-    "Select default encryption module:" : "Velg standard krypteringsmodul:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye. Vennligst aktiver \"Standard krypteringsmodul\" og kjør 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye.",
-    "Start migration" : "Start migrering",
-    "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
-    "Send mode" : "Sendemåte",
-    "Encryption" : "Kryptering",
-    "From address" : "Fra adresse",
-    "mail" : "e-post",
-    "Authentication method" : "Autentiseringsmetode",
-    "Authentication required" : "Autentisering kreves",
-    "Server address" : "Server-adresse",
-    "Port" : "Port",
-    "Credentials" : "Påloggingsdetaljer",
-    "SMTP Username" : "SMTP-brukernavn",
-    "SMTP Password" : "SMTP-passord",
-    "Store credentials" : "Lagre påloggingsdetaljer",
-    "Test email settings" : "Test innstillinger for e-post",
-    "Send email" : "Send e-post",
-    "What to log" : "Hva som skal logges",
-    "Download logfile" : "Last ned loggfil",
-    "More" : "Mer",
-    "Less" : "Mindre",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
+    "Tips & tricks" : "Tips og triks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.",
@@ -199,7 +196,6 @@
     "Improving the config.php" : "Tilpasninger i config.php",
     "Theming" : "Temaer",
     "Hardening and security guidance" : "Herding og sikkerhetsveiledning",
-    "Version" : "Versjon",
     "Developer documentation" : "Utviklerdokumentasjon",
     "Experimental applications ahead" : "Eksperimentelle applikasjoner forut",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Eksperimentelle apper er ikke sjekket for sikkerhetsproblemer. De er nye eller de anses som ustabile og under stadig utvikling. Å installere slike apper kan forårsake tap av data eller brudd på sikkerheten.",
@@ -251,14 +247,14 @@
     "Change password" : "Endre passord",
     "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",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
     "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt",
+    "Name" : "Navn",
+    "Username" : "Brukernavn",
+    "Done" : "Ferdig",
     "Show storage location" : "Vis lagringssted",
     "Show last log in" : "Vis site innlogging",
     "Show user backend" : "Vis bruker-server",
@@ -277,6 +273,10 @@
     "change full name" : "endre fullt navn",
     "set new password" : "sett nytt passord",
     "change email address" : "endre e-postadresse",
-    "Default" : "Standard"
+    "Default" : "Standard",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Ekstern lagring",
+    "Updates" : "Oppdateringer"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 22d829c1533..328156d8c57 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "E-mail bewaard",
     "Your full name has been changed." : "Je volledige naam is gewijzigd.",
     "Unable to change full name" : "Kan de volledige naam niet wijzigen",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen",
-    "Sharing" : "Delen",
-    "Server-side encryption" : "Server-side versleuteling",
-    "External Storage" : "Externe opslag",
-    "Cron" : "Cron",
-    "Email server" : "E-mailserver",
-    "Log" : "Log",
-    "Tips & tricks" : "Tips & trucs",
-    "Updates" : "Updates",
     "Couldn't remove app." : "Kon app niet verwijderen.",
     "Language changed" : "Taal aangepast",
     "Invalid request" : "Ongeldige aanvraag",
@@ -133,17 +122,55 @@ OC.L10N.register(
     "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",
-    "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen",
-    "Errors and fatal issues" : "Fouten en fatale problemen",
-    "Fatal issues only" : "Alleen fatale problemen",
     "None" : "Geen",
     "Login" : "Login",
     "Plain" : "Gewoon",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-mailserver",
+    "Open documentation" : "Open documentatie",
+    "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
+    "Send mode" : "Verstuurmodus",
+    "Encryption" : "Versleuteling",
+    "From address" : "Afzenderadres",
+    "mail" : "e-mail",
+    "Authentication method" : "Authenticatiemethode",
+    "Authentication required" : "Authenticatie vereist",
+    "Server address" : "Server adres",
+    "Port" : "Poort",
+    "Credentials" : "Inloggegevens",
+    "SMTP Username" : "SMTP gebruikersnaam",
+    "SMTP Password" : "SMTP wachtwoord",
+    "Store credentials" : "Opslaan inloggegevens",
+    "Test email settings" : "Test e-mailinstellingen",
+    "Send email" : "Versturen e-mail",
+    "Server-side encryption" : "Server-side versleuteling",
+    "Enable server-side encryption" : "Server-side versleuteling inschakelen",
+    "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Als versleuteling is ingeschakeld, worden alle geüploade bestanden vanaf dat moment versleuteld opgeslagen op de server.  Het is alleen mogelijk om de versleuteling later uit te schakelen als de actieve versleutelingsmodule dit ondersteunt en aan alle pré-condities (mn de ingestelde herstelsleutel) wordt voldaan.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Versleuteling alleen gerandeert geen beveiliging van het systeem. Lees de documentatie voor meer achtergrond over de werking van de crypto app an de relevante use cases.",
+    "Be aware that encryption always increases the file size." : "Let erop dat versleuteling de bestandsomvang altijd laat toenemen.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Het is altijd verstandig om regelmatig backups van je bestanden te maken. Zorg ervoor dat je in geval van versleuteling ook de cryptosleutel met je gegevens backupt.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wil je versleuteling echt inschakelen?",
+    "Enable encryption" : "Versleuteling inschakelen",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
+    "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Activeer de \"Standaard cryptomodule\" en start 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe.",
+    "Start migration" : "Start migratie",
+    "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",
+    "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen",
+    "Errors and fatal issues" : "Fouten en fatale problemen",
+    "Fatal issues only" : "Alleen fatale problemen",
+    "Log" : "Log",
+    "What to log" : "Wat loggen",
+    "Download logfile" : "Download logbestand",
+    "More" : "Meer",
+    "Less" : "Minder",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!",
+    "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lees de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratienotities en de php configuratie van je server, zeker bij gebruik van php-fpm.",
     "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." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
@@ -160,7 +187,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
     "All checks passed." : "Alle checks geslaagd",
-    "Open documentation" : "Open documentatie",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
+    "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
+    "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
+    "Version" : "Versie",
+    "Sharing" : "Delen",
     "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
     "Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
     "Allow public uploads" : "Sta publieke uploads toe",
@@ -177,45 +212,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Sluit groepen uit van delen",
     "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Sta auto-aanvullen van gebruikersnaam toe in de Delen-dialoog. Als dit is uitgeschakeld, moet de gebruikersnaam volledig worden ingevuld.",
-    "Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
-    "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
-    "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
-    "Enable server-side encryption" : "Server-side versleuteling inschakelen",
-    "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Als versleuteling is ingeschakeld, worden alle geüploade bestanden vanaf dat moment versleuteld opgeslagen op de server.  Het is alleen mogelijk om de versleuteling later uit te schakelen als de actieve versleutelingsmodule dit ondersteunt en aan alle pré-condities (mn de ingestelde herstelsleutel) wordt voldaan.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Versleuteling alleen gerandeert geen beveiliging van het systeem. Lees de documentatie voor meer achtergrond over de werking van de crypto app an de relevante use cases.",
-    "Be aware that encryption always increases the file size." : "Let erop dat versleuteling de bestandsomvang altijd laat toenemen.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Het is altijd verstandig om regelmatig backups van je bestanden te maken. Zorg ervoor dat je in geval van versleuteling ook de cryptosleutel met je gegevens backupt.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wil je versleuteling echt inschakelen?",
-    "Enable encryption" : "Versleuteling inschakelen",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
-    "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Activeer de \"Standaard cryptomodule\" en start 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe.",
-    "Start migration" : "Start migratie",
-    "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
-    "Send mode" : "Verstuurmodus",
-    "Encryption" : "Versleuteling",
-    "From address" : "Afzenderadres",
-    "mail" : "e-mail",
-    "Authentication method" : "Authenticatiemethode",
-    "Authentication required" : "Authenticatie vereist",
-    "Server address" : "Server adres",
-    "Port" : "Poort",
-    "Credentials" : "Inloggegevens",
-    "SMTP Username" : "SMTP gebruikersnaam",
-    "SMTP Password" : "SMTP wachtwoord",
-    "Store credentials" : "Opslaan inloggegevens",
-    "Test email settings" : "Test e-mailinstellingen",
-    "Send email" : "Versturen e-mail",
-    "What to log" : "Wat loggen",
-    "Download logfile" : "Download logbestand",
-    "More" : "Meer",
-    "Less" : "Minder",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!",
+    "Tips & tricks" : "Tips & trucs",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentatie ↗</a>.",
@@ -225,7 +222,6 @@ OC.L10N.register(
     "Improving the config.php" : "config.php verbeteren",
     "Theming" : "Thema's",
     "Hardening and security guidance" : "Hardening en security advies",
-    "Version" : "Versie",
     "Developer documentation" : "Ontwikkelaarsdocumentatie",
     "Experimental applications ahead" : "Experimentele applicaties vooraan",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentele apps zijn niet gecontroleerd op beveiligingsproblemen, zijn nieuw of staan bekend als instabiel en worden volop ontwikkeld. Installatie kan leiden tot gegevensverlies of beveiligingsincidenten.",
@@ -281,6 +277,11 @@ OC.L10N.register(
     "Change password" : "Wijzig wachtwoord",
     "Language" : "Taal",
     "Help translate" : "Help met vertalen",
+    "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
+    "Desktop client" : "Desktop client",
+    "Android app" : "Android app",
+    "iOS app" : "iOS app",
+    "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
     "Web, desktop and mobile clients currently logged in to your account." : "Web, desktop en mobiele clients zijn nu ingelogd op je account.",
     "Device" : "Apparaat",
     "Last activity" : "Laatste activiteit",
@@ -291,12 +292,6 @@ OC.L10N.register(
     "Use the credentials below to configure your app or device." : "Gebruik onderstaande inloggegevens om je 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",
-    "Android app" : "Android app",
-    "iOS app" : "iOS app",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ondersteun het project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel het mee</a>\n\t\tof\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het woord</a>!",
-    "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Ontwikkeld door de {communityopen}Nextcloud community{linkclose}, de {githubopen}broncode{linkclose} is gelicenseerd onder de {licenseopen}AGPL{linkclose}.",
     "Show storage location" : "Toon opslaglocatie",
     "Show last log in" : "Toon laatste inlog",
@@ -321,6 +316,10 @@ OC.L10N.register(
     "change full name" : "wijzigen volledige naam",
     "set new password" : "Instellen nieuw wachtwoord",
     "change email address" : "wijzig e-mailadres",
-    "Default" : "Standaard"
+    "Default" : "Standaard",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Externe opslag",
+    "Updates" : "Updates"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 48d438859a9..af464270dae 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -33,17 +33,6 @@
     "Email saved" : "E-mail bewaard",
     "Your full name has been changed." : "Je volledige naam is gewijzigd.",
     "Unable to change full name" : "Kan de volledige naam niet wijzigen",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen",
-    "Sharing" : "Delen",
-    "Server-side encryption" : "Server-side versleuteling",
-    "External Storage" : "Externe opslag",
-    "Cron" : "Cron",
-    "Email server" : "E-mailserver",
-    "Log" : "Log",
-    "Tips & tricks" : "Tips & trucs",
-    "Updates" : "Updates",
     "Couldn't remove app." : "Kon app niet verwijderen.",
     "Language changed" : "Taal aangepast",
     "Invalid request" : "Ongeldige aanvraag",
@@ -131,17 +120,55 @@
     "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",
-    "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen",
-    "Errors and fatal issues" : "Fouten en fatale problemen",
-    "Fatal issues only" : "Alleen fatale problemen",
     "None" : "Geen",
     "Login" : "Login",
     "Plain" : "Gewoon",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-mailserver",
+    "Open documentation" : "Open documentatie",
+    "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
+    "Send mode" : "Verstuurmodus",
+    "Encryption" : "Versleuteling",
+    "From address" : "Afzenderadres",
+    "mail" : "e-mail",
+    "Authentication method" : "Authenticatiemethode",
+    "Authentication required" : "Authenticatie vereist",
+    "Server address" : "Server adres",
+    "Port" : "Poort",
+    "Credentials" : "Inloggegevens",
+    "SMTP Username" : "SMTP gebruikersnaam",
+    "SMTP Password" : "SMTP wachtwoord",
+    "Store credentials" : "Opslaan inloggegevens",
+    "Test email settings" : "Test e-mailinstellingen",
+    "Send email" : "Versturen e-mail",
+    "Server-side encryption" : "Server-side versleuteling",
+    "Enable server-side encryption" : "Server-side versleuteling inschakelen",
+    "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Als versleuteling is ingeschakeld, worden alle geüploade bestanden vanaf dat moment versleuteld opgeslagen op de server.  Het is alleen mogelijk om de versleuteling later uit te schakelen als de actieve versleutelingsmodule dit ondersteunt en aan alle pré-condities (mn de ingestelde herstelsleutel) wordt voldaan.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Versleuteling alleen gerandeert geen beveiliging van het systeem. Lees de documentatie voor meer achtergrond over de werking van de crypto app an de relevante use cases.",
+    "Be aware that encryption always increases the file size." : "Let erop dat versleuteling de bestandsomvang altijd laat toenemen.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Het is altijd verstandig om regelmatig backups van je bestanden te maken. Zorg ervoor dat je in geval van versleuteling ook de cryptosleutel met je gegevens backupt.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wil je versleuteling echt inschakelen?",
+    "Enable encryption" : "Versleuteling inschakelen",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
+    "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Activeer de \"Standaard cryptomodule\" en start 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe.",
+    "Start migration" : "Start migratie",
+    "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",
+    "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen",
+    "Errors and fatal issues" : "Fouten en fatale problemen",
+    "Fatal issues only" : "Alleen fatale problemen",
+    "Log" : "Log",
+    "What to log" : "Wat loggen",
+    "Download logfile" : "Download logbestand",
+    "More" : "Meer",
+    "Less" : "Minder",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!",
+    "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lees de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratienotities en de php configuratie van je server, zeker bij gebruik van php-fpm.",
     "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." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
@@ -158,7 +185,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
     "All checks passed." : "Alle checks geslaagd",
-    "Open documentation" : "Open documentatie",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
+    "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
+    "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
+    "Version" : "Versie",
+    "Sharing" : "Delen",
     "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
     "Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
     "Allow public uploads" : "Sta publieke uploads toe",
@@ -175,45 +210,7 @@
     "Exclude groups from sharing" : "Sluit groepen uit van delen",
     "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Sta auto-aanvullen van gebruikersnaam toe in de Delen-dialoog. Als dit is uitgeschakeld, moet de gebruikersnaam volledig worden ingevuld.",
-    "Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
-    "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
-    "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
-    "Enable server-side encryption" : "Server-side versleuteling inschakelen",
-    "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Als versleuteling is ingeschakeld, worden alle geüploade bestanden vanaf dat moment versleuteld opgeslagen op de server.  Het is alleen mogelijk om de versleuteling later uit te schakelen als de actieve versleutelingsmodule dit ondersteunt en aan alle pré-condities (mn de ingestelde herstelsleutel) wordt voldaan.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Versleuteling alleen gerandeert geen beveiliging van het systeem. Lees de documentatie voor meer achtergrond over de werking van de crypto app an de relevante use cases.",
-    "Be aware that encryption always increases the file size." : "Let erop dat versleuteling de bestandsomvang altijd laat toenemen.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Het is altijd verstandig om regelmatig backups van je bestanden te maken. Zorg ervoor dat je in geval van versleuteling ook de cryptosleutel met je gegevens backupt.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wil je versleuteling echt inschakelen?",
-    "Enable encryption" : "Versleuteling inschakelen",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
-    "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Activeer de \"Standaard cryptomodule\" en start 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe.",
-    "Start migration" : "Start migratie",
-    "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
-    "Send mode" : "Verstuurmodus",
-    "Encryption" : "Versleuteling",
-    "From address" : "Afzenderadres",
-    "mail" : "e-mail",
-    "Authentication method" : "Authenticatiemethode",
-    "Authentication required" : "Authenticatie vereist",
-    "Server address" : "Server adres",
-    "Port" : "Poort",
-    "Credentials" : "Inloggegevens",
-    "SMTP Username" : "SMTP gebruikersnaam",
-    "SMTP Password" : "SMTP wachtwoord",
-    "Store credentials" : "Opslaan inloggegevens",
-    "Test email settings" : "Test e-mailinstellingen",
-    "Send email" : "Versturen e-mail",
-    "What to log" : "Wat loggen",
-    "Download logfile" : "Download logbestand",
-    "More" : "Meer",
-    "Less" : "Minder",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!",
+    "Tips & tricks" : "Tips & trucs",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentatie ↗</a>.",
@@ -223,7 +220,6 @@
     "Improving the config.php" : "config.php verbeteren",
     "Theming" : "Thema's",
     "Hardening and security guidance" : "Hardening en security advies",
-    "Version" : "Versie",
     "Developer documentation" : "Ontwikkelaarsdocumentatie",
     "Experimental applications ahead" : "Experimentele applicaties vooraan",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentele apps zijn niet gecontroleerd op beveiligingsproblemen, zijn nieuw of staan bekend als instabiel en worden volop ontwikkeld. Installatie kan leiden tot gegevensverlies of beveiligingsincidenten.",
@@ -279,6 +275,11 @@
     "Change password" : "Wijzig wachtwoord",
     "Language" : "Taal",
     "Help translate" : "Help met vertalen",
+    "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
+    "Desktop client" : "Desktop client",
+    "Android app" : "Android app",
+    "iOS app" : "iOS app",
+    "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
     "Web, desktop and mobile clients currently logged in to your account." : "Web, desktop en mobiele clients zijn nu ingelogd op je account.",
     "Device" : "Apparaat",
     "Last activity" : "Laatste activiteit",
@@ -289,12 +290,6 @@
     "Use the credentials below to configure your app or device." : "Gebruik onderstaande inloggegevens om je 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",
-    "Android app" : "Android app",
-    "iOS app" : "iOS app",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ondersteun het project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel het mee</a>\n\t\tof\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het woord</a>!",
-    "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Ontwikkeld door de {communityopen}Nextcloud community{linkclose}, de {githubopen}broncode{linkclose} is gelicenseerd onder de {licenseopen}AGPL{linkclose}.",
     "Show storage location" : "Toon opslaglocatie",
     "Show last log in" : "Toon laatste inlog",
@@ -319,6 +314,10 @@
     "change full name" : "wijzigen volledige naam",
     "set new password" : "Instellen nieuw wachtwoord",
     "change email address" : "wijzig e-mailadres",
-    "Default" : "Standaard"
+    "Default" : "Standaard",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Externe opslag",
+    "Updates" : "Updates"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 543066f6b4b..8b0e8f77709 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "E-mail salvo",
     "Your full name has been changed." : "Seu nome completo foi alterado.",
     "Unable to change full name" : "Não é possível alterar o nome completo",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Segurança & avisos de configuração",
-    "Sharing" : "Compartilhamento",
-    "Server-side encryption" : "Criptografia do lado do servidor",
-    "External Storage" : "Armazenamento externo",
-    "Cron" : "Cron",
-    "Email server" : "Servidor de e-mail",
-    "Log" : "Registro",
-    "Tips & tricks" : "Dicas & Truques",
-    "Updates" : "Atualizações",
     "Couldn't remove app." : "Não foi possível remover aplicativos.",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido inválido",
@@ -137,17 +126,55 @@ OC.L10N.register(
     "Sessions" : "Sessões",
     "App passwords" : "Senhas de aplicativos",
     "Sync clients" : "Clientes de Sincronização",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
-    "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
-    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
-    "Errors and fatal issues" : "Erros e problemas fatais",
-    "Fatal issues only" : "Somente questões fatais",
     "None" : "Nada",
     "Login" : "Login",
     "Plain" : "Plano",
     "NT LAN Manager" : "Gerenciador NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Servidor de e-mail",
+    "Open documentation" : "Abrir documentação",
+    "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
+    "Send mode" : "Modo enviar",
+    "Encryption" : "Criptografia",
+    "From address" : "Do Endereço",
+    "mail" : "email",
+    "Authentication method" : "Método de autenticação",
+    "Authentication required" : "Autenticação é requerida",
+    "Server address" : "Endereço do servidor",
+    "Port" : "Porta",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome do Usuário SMTP",
+    "SMTP Password" : "Senha SMTP",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Configurações de e-mail de teste",
+    "Send email" : "Enviar email",
+    "Server-side encryption" : "Criptografia do lado do servidor",
+    "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
+    "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez que a criptografia é ativada, todos os arquivos carregados para o servidor a partir desse ponto em diante serão criptografados e estarão disponíveis no servidor. Só será possível desativar a criptografia em uma data posterior, se o módulo de criptografia ativo suporta essa função, e todas as pré-condições sejam cumpridas(por exemplo, definindo uma chave de recuperação).",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encriptação, por si só, não garante segurança do sistema. Por favor, veja a documentação para mais informações sobe como o aplicativo de encriptação funciona e os casos de uso suportados.",
+    "Be aware that encryption always increases the file size." : "Esteja ciente de que a criptografia sempre aumenta o tamanho do arquivo.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar backups regulares dos seus dados, em caso de criptografia certifique-se de fazer backup das chaves de criptografia, juntamente com os seus dados.",
+    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
+    "Enable encryption" : "Ativar criptografia",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
+    "Select default encryption module:" : "Selecione o módulo de criptografia padrão:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Ative o \"módulo de criptografia padrão\" e execute 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova.",
+    "Start migration" : "Iniciar migração",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
+    "Errors and fatal issues" : "Erros e problemas fatais",
+    "Fatal issues only" : "Somente questões fatais",
+    "Log" : "Registro",
+    "What to log" : "O que colocar no log",
+    "Download logfile" : "Baixar o arquivo de log",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
+    "Security & setup warnings" : "Segurança & avisos de configuração",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação de instalação ↗</a> para notas configuração do PHP e a configuração do PHP do seu servidor, especialmente quando se utiliza php-fpm.",
     "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." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.",
@@ -164,7 +191,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique o <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Todas as verificações passaram.",
-    "Open documentation" : "Abrir documentação",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
+    "Cron was not executed yet!" : "Cron não foi executado ainda!",
+    "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
+    "Version" : "Versão",
+    "Sharing" : "Compartilhamento",
     "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
     "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
     "Allow public uploads" : "Permitir envio público",
@@ -181,45 +216,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Excluir grupos de compartilhamento",
     "These groups will still be able to receive shares, but not to initiate them." : "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir autocompletar nome de usuário no diálogo de compartilhamento. Se isto estiver desativado o nome de usuário completo precisa ser inserido.",
-    "Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
-    "Cron was not executed yet!" : "Cron não foi executado ainda!",
-    "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-    "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
-    "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez que a criptografia é ativada, todos os arquivos carregados para o servidor a partir desse ponto em diante serão criptografados e estarão disponíveis no servidor. Só será possível desativar a criptografia em uma data posterior, se o módulo de criptografia ativo suporta essa função, e todas as pré-condições sejam cumpridas(por exemplo, definindo uma chave de recuperação).",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encriptação, por si só, não garante segurança do sistema. Por favor, veja a documentação para mais informações sobe como o aplicativo de encriptação funciona e os casos de uso suportados.",
-    "Be aware that encryption always increases the file size." : "Esteja ciente de que a criptografia sempre aumenta o tamanho do arquivo.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar backups regulares dos seus dados, em caso de criptografia certifique-se de fazer backup das chaves de criptografia, juntamente com os seus dados.",
-    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
-    "Enable encryption" : "Ativar criptografia",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
-    "Select default encryption module:" : "Selecione o módulo de criptografia padrão:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Ative o \"módulo de criptografia padrão\" e execute 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova.",
-    "Start migration" : "Iniciar migração",
-    "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
-    "Send mode" : "Modo enviar",
-    "Encryption" : "Criptografia",
-    "From address" : "Do Endereço",
-    "mail" : "email",
-    "Authentication method" : "Método de autenticação",
-    "Authentication required" : "Autenticação é requerida",
-    "Server address" : "Endereço do servidor",
-    "Port" : "Porta",
-    "Credentials" : "Credenciais",
-    "SMTP Username" : "Nome do Usuário SMTP",
-    "SMTP Password" : "Senha SMTP",
-    "Store credentials" : "Armazenar credenciais",
-    "Test email settings" : "Configurações de e-mail de teste",
-    "Send email" : "Enviar email",
-    "What to log" : "O que colocar no log",
-    "Download logfile" : "Baixar o arquivo de log",
-    "More" : "Mais",
-    "Less" : "Menos",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
+    "Tips & tricks" : "Dicas & Truques",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db:convert-type', ou consulte a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação ↗</a>.",
@@ -229,7 +226,6 @@ OC.L10N.register(
     "Improving the config.php" : "Melhorando o config.php",
     "Theming" : "Elaborar um tema",
     "Hardening and security guidance" : "Orientações de proteção e segurança",
-    "Version" : "Versão",
     "Developer documentation" : "Documentação do desenvolvedor",
     "Experimental applications ahead" : "Aplicações experimentais à frente",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplicativos experimentais não são marcados por questões de segurança, por serem novos ou conhecidos como instáveis e sob forte desenvolvimento. Instalá-los pode causar perda de dados ou falhas de segurança.",
@@ -285,6 +281,11 @@ OC.L10N.register(
     "Change password" : "Alterar senha",
     "Language" : "Idioma",
     "Help translate" : "Ajude a traduzir",
+    "Get the apps to sync your files" : "Obtenha apps para sincronizar seus arquivos",
+    "Desktop client" : "Cliente Desktop",
+    "Android app" : "App Android",
+    "iOS app" : "App iOS",
+    "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
     "Web, desktop and mobile clients currently logged in to your account." : "Clientes Web, desktop e móvel estão conectados à sua conta.",
     "Device" : "Dispositivo",
     "Last activity" : "Última atividade",
@@ -296,12 +297,6 @@ OC.L10N.register(
     "For security reasons this password will only be shown once." : "Por motivo de segurança, esta senha só será exibida uma vez.",
     "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",
-    "Android app" : "App Android",
-    "iOS app" : "App iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você deseja apoiar o projeto,\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">juntar-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">contar para todo mundo</a>!",
-    "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Desenvolvido pela {communityopen}comunidade Nextcloud{linkclose}, o {githubopen}código-fonte{linkclose} é licenciado sob a {licenseopen}AGPL{linkclose}.",
     "Follow us on Google Plus!" : "Siga-nos no Google Plus!",
     "Like our facebook page!" : "Curta nossa página no Facebook!",
@@ -331,6 +326,10 @@ OC.L10N.register(
     "set new password" : "definir nova senha",
     "change email address" : "Trocar o endereço de email",
     "Default" : "Padrão",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Armazenamento externo",
+    "Updates" : "Atualizações",
     "no group" : "nenhum grupo",
     "add group" : "adicionar grupo",
     "Add Group" : "Adicionar grupo",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index d8c0e38da08..c844fc83a6c 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -33,17 +33,6 @@
     "Email saved" : "E-mail salvo",
     "Your full name has been changed." : "Seu nome completo foi alterado.",
     "Unable to change full name" : "Não é possível alterar o nome completo",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Segurança & avisos de configuração",
-    "Sharing" : "Compartilhamento",
-    "Server-side encryption" : "Criptografia do lado do servidor",
-    "External Storage" : "Armazenamento externo",
-    "Cron" : "Cron",
-    "Email server" : "Servidor de e-mail",
-    "Log" : "Registro",
-    "Tips & tricks" : "Dicas & Truques",
-    "Updates" : "Atualizações",
     "Couldn't remove app." : "Não foi possível remover aplicativos.",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido inválido",
@@ -135,17 +124,55 @@
     "Sessions" : "Sessões",
     "App passwords" : "Senhas de aplicativos",
     "Sync clients" : "Clientes de Sincronização",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
-    "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
-    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
-    "Errors and fatal issues" : "Erros e problemas fatais",
-    "Fatal issues only" : "Somente questões fatais",
     "None" : "Nada",
     "Login" : "Login",
     "Plain" : "Plano",
     "NT LAN Manager" : "Gerenciador NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Servidor de e-mail",
+    "Open documentation" : "Abrir documentação",
+    "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
+    "Send mode" : "Modo enviar",
+    "Encryption" : "Criptografia",
+    "From address" : "Do Endereço",
+    "mail" : "email",
+    "Authentication method" : "Método de autenticação",
+    "Authentication required" : "Autenticação é requerida",
+    "Server address" : "Endereço do servidor",
+    "Port" : "Porta",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome do Usuário SMTP",
+    "SMTP Password" : "Senha SMTP",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Configurações de e-mail de teste",
+    "Send email" : "Enviar email",
+    "Server-side encryption" : "Criptografia do lado do servidor",
+    "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
+    "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez que a criptografia é ativada, todos os arquivos carregados para o servidor a partir desse ponto em diante serão criptografados e estarão disponíveis no servidor. Só será possível desativar a criptografia em uma data posterior, se o módulo de criptografia ativo suporta essa função, e todas as pré-condições sejam cumpridas(por exemplo, definindo uma chave de recuperação).",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encriptação, por si só, não garante segurança do sistema. Por favor, veja a documentação para mais informações sobe como o aplicativo de encriptação funciona e os casos de uso suportados.",
+    "Be aware that encryption always increases the file size." : "Esteja ciente de que a criptografia sempre aumenta o tamanho do arquivo.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar backups regulares dos seus dados, em caso de criptografia certifique-se de fazer backup das chaves de criptografia, juntamente com os seus dados.",
+    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
+    "Enable encryption" : "Ativar criptografia",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
+    "Select default encryption module:" : "Selecione o módulo de criptografia padrão:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Ative o \"módulo de criptografia padrão\" e execute 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova.",
+    "Start migration" : "Iniciar migração",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
+    "Errors and fatal issues" : "Erros e problemas fatais",
+    "Fatal issues only" : "Somente questões fatais",
+    "Log" : "Registro",
+    "What to log" : "O que colocar no log",
+    "Download logfile" : "Baixar o arquivo de log",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
+    "Security & setup warnings" : "Segurança & avisos de configuração",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação de instalação ↗</a> para notas configuração do PHP e a configuração do PHP do seu servidor, especialmente quando se utiliza php-fpm.",
     "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." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.",
@@ -162,7 +189,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique o <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Todas as verificações passaram.",
-    "Open documentation" : "Abrir documentação",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
+    "Cron was not executed yet!" : "Cron não foi executado ainda!",
+    "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
+    "Version" : "Versão",
+    "Sharing" : "Compartilhamento",
     "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
     "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
     "Allow public uploads" : "Permitir envio público",
@@ -179,45 +214,7 @@
     "Exclude groups from sharing" : "Excluir grupos de compartilhamento",
     "These groups will still be able to receive shares, but not to initiate them." : "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir autocompletar nome de usuário no diálogo de compartilhamento. Se isto estiver desativado o nome de usuário completo precisa ser inserido.",
-    "Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
-    "Cron was not executed yet!" : "Cron não foi executado ainda!",
-    "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-    "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
-    "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez que a criptografia é ativada, todos os arquivos carregados para o servidor a partir desse ponto em diante serão criptografados e estarão disponíveis no servidor. Só será possível desativar a criptografia em uma data posterior, se o módulo de criptografia ativo suporta essa função, e todas as pré-condições sejam cumpridas(por exemplo, definindo uma chave de recuperação).",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encriptação, por si só, não garante segurança do sistema. Por favor, veja a documentação para mais informações sobe como o aplicativo de encriptação funciona e os casos de uso suportados.",
-    "Be aware that encryption always increases the file size." : "Esteja ciente de que a criptografia sempre aumenta o tamanho do arquivo.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar backups regulares dos seus dados, em caso de criptografia certifique-se de fazer backup das chaves de criptografia, juntamente com os seus dados.",
-    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
-    "Enable encryption" : "Ativar criptografia",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
-    "Select default encryption module:" : "Selecione o módulo de criptografia padrão:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Ative o \"módulo de criptografia padrão\" e execute 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova.",
-    "Start migration" : "Iniciar migração",
-    "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
-    "Send mode" : "Modo enviar",
-    "Encryption" : "Criptografia",
-    "From address" : "Do Endereço",
-    "mail" : "email",
-    "Authentication method" : "Método de autenticação",
-    "Authentication required" : "Autenticação é requerida",
-    "Server address" : "Endereço do servidor",
-    "Port" : "Porta",
-    "Credentials" : "Credenciais",
-    "SMTP Username" : "Nome do Usuário SMTP",
-    "SMTP Password" : "Senha SMTP",
-    "Store credentials" : "Armazenar credenciais",
-    "Test email settings" : "Configurações de e-mail de teste",
-    "Send email" : "Enviar email",
-    "What to log" : "O que colocar no log",
-    "Download logfile" : "Baixar o arquivo de log",
-    "More" : "Mais",
-    "Less" : "Menos",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
+    "Tips & tricks" : "Dicas & Truques",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db:convert-type', ou consulte a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação ↗</a>.",
@@ -227,7 +224,6 @@
     "Improving the config.php" : "Melhorando o config.php",
     "Theming" : "Elaborar um tema",
     "Hardening and security guidance" : "Orientações de proteção e segurança",
-    "Version" : "Versão",
     "Developer documentation" : "Documentação do desenvolvedor",
     "Experimental applications ahead" : "Aplicações experimentais à frente",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplicativos experimentais não são marcados por questões de segurança, por serem novos ou conhecidos como instáveis e sob forte desenvolvimento. Instalá-los pode causar perda de dados ou falhas de segurança.",
@@ -283,6 +279,11 @@
     "Change password" : "Alterar senha",
     "Language" : "Idioma",
     "Help translate" : "Ajude a traduzir",
+    "Get the apps to sync your files" : "Obtenha apps para sincronizar seus arquivos",
+    "Desktop client" : "Cliente Desktop",
+    "Android app" : "App Android",
+    "iOS app" : "App iOS",
+    "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
     "Web, desktop and mobile clients currently logged in to your account." : "Clientes Web, desktop e móvel estão conectados à sua conta.",
     "Device" : "Dispositivo",
     "Last activity" : "Última atividade",
@@ -294,12 +295,6 @@
     "For security reasons this password will only be shown once." : "Por motivo de segurança, esta senha só será exibida uma vez.",
     "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",
-    "Android app" : "App Android",
-    "iOS app" : "App iOS",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você deseja apoiar o projeto,\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">juntar-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">contar para todo mundo</a>!",
-    "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Desenvolvido pela {communityopen}comunidade Nextcloud{linkclose}, o {githubopen}código-fonte{linkclose} é licenciado sob a {licenseopen}AGPL{linkclose}.",
     "Follow us on Google Plus!" : "Siga-nos no Google Plus!",
     "Like our facebook page!" : "Curta nossa página no Facebook!",
@@ -329,6 +324,10 @@
     "set new password" : "definir nova senha",
     "change email address" : "Trocar o endereço de email",
     "Default" : "Padrão",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Armazenamento externo",
+    "Updates" : "Atualizações",
     "no group" : "nenhum grupo",
     "add group" : "adicionar grupo",
     "Add Group" : "Adicionar grupo",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 9d430082365..8f244119a04 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "E-mail guardado",
     "Your full name has been changed." : "O seu nome completo foi alterado.",
     "Unable to change full name" : "Não foi possível alterar o seu nome completo",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Avisos de configuração e segurança",
-    "Sharing" : "Partilha",
-    "Server-side encryption" : "Atualizar App",
-    "External Storage" : "Armazenamento Externo",
-    "Cron" : "Cron",
-    "Email server" : "Servidor de Correio Eletrónico",
-    "Log" : "Registo",
-    "Tips & tricks" : "Dicas e truques",
-    "Updates" : "Atualizações",
     "Couldn't remove app." : "Não foi possível remover a aplicação.",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido Inválido",
@@ -117,17 +106,54 @@ OC.L10N.register(
     "Personal info" : "Informação pessoal",
     "Sessions" : "Sessões",
     "Sync clients" : "Clientes de sync",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
-    "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
-    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
-    "Errors and fatal issues" : "Erros e problemas fatais",
-    "Fatal issues only" : "Apenas problemas fatais",
     "None" : "Nenhum",
     "Login" : "Iniciar Sessão",
     "Plain" : "Plano",
     "NT LAN Manager" : "Gestor de REDE NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Servidor de Correio Eletrónico",
+    "Open documentation" : "Abrir documentação",
+    "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
+    "Send mode" : "Modo de Envio",
+    "Encryption" : "Encriptação",
+    "From address" : "Do endereço",
+    "mail" : "Correio",
+    "Authentication method" : "Método de Autenticação",
+    "Authentication required" : "Autenticação necessária",
+    "Server address" : "Endereço do Servidor",
+    "Port" : "Porta",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome de utilizador SMTP",
+    "SMTP Password" : "Palavra-passe SMTP",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Testar definições de e-mail",
+    "Send email" : "Enviar email",
+    "Server-side encryption" : "Atualizar App",
+    "Enable server-side encryption" : "Ativar encriptação do lado do servidor",
+    "Please read carefully before activating server-side encryption: " : "Por favor, leia cuidadosamente antes de ativar a encriptação do lado do servidor:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez ativada a encriptação, todos os ficheiros carregados para o servidor a partir deste ponto serão encriptados pelo servidor. Só será possível desativar a encriptação numa data mais tarde se o módulo de encriptação ativo suportar essa função, assim como todas as pré-condições (e.g. definir chave de recuperação) sejam cumpridas.",
+    "Be aware that encryption always increases the file size." : "Tenha em conta que a encriptação aumenta sempre o tamanho do ficheiro.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar cópias de segurança regulares dos seus dados, em caso de encriptação tenha a certeza de que faz cópia das chaves de encriptação em conjunto com os seus dados.",
+    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: quer mesmo ativar a encriptação?",
+    "Enable encryption" : "Ative a encriptação",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de encriptação carregador, por favor ative um módulo de encriptação no menu das aplicações.",
+    "Select default encryption module:" : "Selecionar o módulo de encriptação predefinido:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova. Por favor, ative o \"Módulo de encriptação padrão\" e execute 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova.",
+    "Start migration" : "Iniciar migração",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
+    "Errors and fatal issues" : "Erros e problemas fatais",
+    "Fatal issues only" : "Apenas problemas fatais",
+    "Log" : "Registo",
+    "What to log" : "Fazer log do quê?",
+    "Download logfile" : "Descarregar logfile",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O logfile é maior que 100MB. O download do mesmo poderá demorar algum tempo!",
+    "Security & setup warnings" : "Avisos de configuração e segurança",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php não parece estar bem instalado para consultar variáveis de ambiente do sistema. O teste com getenv(\"PATH\") apenas devolveu uma resposta em branco.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação de instalação ↗</a> para notas de configuração do php e configuração php do seu servidor, especialmente quando utiliza php-fpm.",
     "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." : "A configuração Só-de-Leitura foi ativada. Isto evita definir algumas configurações através da interface da Web. Além disso, o ficheiro precisa de ser definido gravável manualmente para cada atualização.",
@@ -143,7 +169,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cronjob via CLI. Os seguintes erros técnicos apareceram:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guias de instalação ↗</a>, e verifique se existe algum erro ou aviso no <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Todas as verificações passaram.",
-    "Open documentation" : "Abrir documentação",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Última execução de cron job: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
+    "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
+    "Version" : "Versão",
+    "Sharing" : "Partilha",
     "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
     "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
     "Allow public uploads" : "Permitir Envios Públicos",
@@ -160,44 +194,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Excluir grupos das partilhas",
     "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir o auto-completar de nome de utilizador no diálogo da partilha. Se isto for desativado, será necessário preencher o nome de utilizador completo.",
-    "Last cron job execution: %s." : "Última execução de cron job: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
-    "Cron was not executed yet!" : "Cron ainda não foi executado!",
-    "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
-    "Enable server-side encryption" : "Ativar encriptação do lado do servidor",
-    "Please read carefully before activating server-side encryption: " : "Por favor, leia cuidadosamente antes de ativar a encriptação do lado do servidor:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez ativada a encriptação, todos os ficheiros carregados para o servidor a partir deste ponto serão encriptados pelo servidor. Só será possível desativar a encriptação numa data mais tarde se o módulo de encriptação ativo suportar essa função, assim como todas as pré-condições (e.g. definir chave de recuperação) sejam cumpridas.",
-    "Be aware that encryption always increases the file size." : "Tenha em conta que a encriptação aumenta sempre o tamanho do ficheiro.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar cópias de segurança regulares dos seus dados, em caso de encriptação tenha a certeza de que faz cópia das chaves de encriptação em conjunto com os seus dados.",
-    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: quer mesmo ativar a encriptação?",
-    "Enable encryption" : "Ative a encriptação",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de encriptação carregador, por favor ative um módulo de encriptação no menu das aplicações.",
-    "Select default encryption module:" : "Selecionar o módulo de encriptação predefinido:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova. Por favor, ative o \"Módulo de encriptação padrão\" e execute 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova.",
-    "Start migration" : "Iniciar migração",
-    "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
-    "Send mode" : "Modo de Envio",
-    "Encryption" : "Encriptação",
-    "From address" : "Do endereço",
-    "mail" : "Correio",
-    "Authentication method" : "Método de Autenticação",
-    "Authentication required" : "Autenticação necessária",
-    "Server address" : "Endereço do Servidor",
-    "Port" : "Porta",
-    "Credentials" : "Credenciais",
-    "SMTP Username" : "Nome de utilizador SMTP",
-    "SMTP Password" : "Palavra-passe SMTP",
-    "Store credentials" : "Armazenar credenciais",
-    "Test email settings" : "Testar definições de e-mail",
-    "Send email" : "Enviar email",
-    "What to log" : "Fazer log do quê?",
-    "Download logfile" : "Descarregar logfile",
-    "More" : "Mais",
-    "Less" : "Menos",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O logfile é maior que 100MB. O download do mesmo poderá demorar algum tempo!",
+    "Tips & tricks" : "Dicas e truques",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é utilizado como uma base de dados. Para instalações maiores nós recomendamos que mude para uma interface de base de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "O uso de SQLite é desencorajado especialmente se estiver a pensar em dar uso ao cliente desktop para sincronizar os seus ficheiros no seu computador.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro tipo de base de dados, use a ferramenta de comando de linha: 'occ db:convert-type', ou veja a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação↗</a>.",
@@ -207,7 +204,6 @@ OC.L10N.register(
     "Improving the config.php" : "Melhorar o config.php",
     "Theming" : "Temas",
     "Hardening and security guidance" : "Orientações de proteção e segurança",
-    "Version" : "Versão",
     "Developer documentation" : "Documentação de Programador",
     "Experimental applications ahead" : "Aplicações experimentais de futuro",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "As apps experimentais não estão selecionadas para problemas de segurança, nova ou conhecida como instável e em forte desenvolvimento. Ao instalá-las pode causar a perda de dados ou quebra de segurança.",
@@ -260,14 +256,14 @@ OC.L10N.register(
     "Change password" : "Alterar palavra-passe",
     "Language" : "Idioma",
     "Help translate" : "Ajude a traduzir",
-    "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",
     "Android app" : "Aplicação Android",
     "iOS app" : "Aplicação iOS",
     "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
+    "Name" : "Nome",
+    "Username" : "Nome de utilizador",
+    "Done" : "Concluído",
     "Show storage location" : "Mostrar a localização do armazenamento",
     "Show last log in" : "Mostrar ultimo acesso de entrada",
     "Show user backend" : "Mostrar interface do utilizador",
@@ -286,6 +282,10 @@ OC.L10N.register(
     "change full name" : "alterar nome completo",
     "set new password" : "definir nova palavra-passe",
     "change email address" : "alterar endereço do correio eletrónico",
-    "Default" : "Padrão"
+    "Default" : "Padrão",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Armazenamento Externo",
+    "Updates" : "Atualizações"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 7a0acaf80da..f8df4d9493c 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -33,17 +33,6 @@
     "Email saved" : "E-mail guardado",
     "Your full name has been changed." : "O seu nome completo foi alterado.",
     "Unable to change full name" : "Não foi possível alterar o seu nome completo",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Avisos de configuração e segurança",
-    "Sharing" : "Partilha",
-    "Server-side encryption" : "Atualizar App",
-    "External Storage" : "Armazenamento Externo",
-    "Cron" : "Cron",
-    "Email server" : "Servidor de Correio Eletrónico",
-    "Log" : "Registo",
-    "Tips & tricks" : "Dicas e truques",
-    "Updates" : "Atualizações",
     "Couldn't remove app." : "Não foi possível remover a aplicação.",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido Inválido",
@@ -115,17 +104,54 @@
     "Personal info" : "Informação pessoal",
     "Sessions" : "Sessões",
     "Sync clients" : "Clientes de sync",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
-    "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
-    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
-    "Errors and fatal issues" : "Erros e problemas fatais",
-    "Fatal issues only" : "Apenas problemas fatais",
     "None" : "Nenhum",
     "Login" : "Iniciar Sessão",
     "Plain" : "Plano",
     "NT LAN Manager" : "Gestor de REDE NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Servidor de Correio Eletrónico",
+    "Open documentation" : "Abrir documentação",
+    "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
+    "Send mode" : "Modo de Envio",
+    "Encryption" : "Encriptação",
+    "From address" : "Do endereço",
+    "mail" : "Correio",
+    "Authentication method" : "Método de Autenticação",
+    "Authentication required" : "Autenticação necessária",
+    "Server address" : "Endereço do Servidor",
+    "Port" : "Porta",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome de utilizador SMTP",
+    "SMTP Password" : "Palavra-passe SMTP",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Testar definições de e-mail",
+    "Send email" : "Enviar email",
+    "Server-side encryption" : "Atualizar App",
+    "Enable server-side encryption" : "Ativar encriptação do lado do servidor",
+    "Please read carefully before activating server-side encryption: " : "Por favor, leia cuidadosamente antes de ativar a encriptação do lado do servidor:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez ativada a encriptação, todos os ficheiros carregados para o servidor a partir deste ponto serão encriptados pelo servidor. Só será possível desativar a encriptação numa data mais tarde se o módulo de encriptação ativo suportar essa função, assim como todas as pré-condições (e.g. definir chave de recuperação) sejam cumpridas.",
+    "Be aware that encryption always increases the file size." : "Tenha em conta que a encriptação aumenta sempre o tamanho do ficheiro.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar cópias de segurança regulares dos seus dados, em caso de encriptação tenha a certeza de que faz cópia das chaves de encriptação em conjunto com os seus dados.",
+    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: quer mesmo ativar a encriptação?",
+    "Enable encryption" : "Ative a encriptação",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de encriptação carregador, por favor ative um módulo de encriptação no menu das aplicações.",
+    "Select default encryption module:" : "Selecionar o módulo de encriptação predefinido:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova. Por favor, ative o \"Módulo de encriptação padrão\" e execute 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova.",
+    "Start migration" : "Iniciar migração",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
+    "Errors and fatal issues" : "Erros e problemas fatais",
+    "Fatal issues only" : "Apenas problemas fatais",
+    "Log" : "Registo",
+    "What to log" : "Fazer log do quê?",
+    "Download logfile" : "Descarregar logfile",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O logfile é maior que 100MB. O download do mesmo poderá demorar algum tempo!",
+    "Security & setup warnings" : "Avisos de configuração e segurança",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php não parece estar bem instalado para consultar variáveis de ambiente do sistema. O teste com getenv(\"PATH\") apenas devolveu uma resposta em branco.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação de instalação ↗</a> para notas de configuração do php e configuração php do seu servidor, especialmente quando utiliza php-fpm.",
     "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." : "A configuração Só-de-Leitura foi ativada. Isto evita definir algumas configurações através da interface da Web. Além disso, o ficheiro precisa de ser definido gravável manualmente para cada atualização.",
@@ -141,7 +167,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cronjob via CLI. Os seguintes erros técnicos apareceram:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guias de instalação ↗</a>, e verifique se existe algum erro ou aviso no <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Todas as verificações passaram.",
-    "Open documentation" : "Abrir documentação",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Última execução de cron job: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
+    "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
+    "Version" : "Versão",
+    "Sharing" : "Partilha",
     "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
     "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
     "Allow public uploads" : "Permitir Envios Públicos",
@@ -158,44 +192,7 @@
     "Exclude groups from sharing" : "Excluir grupos das partilhas",
     "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir o auto-completar de nome de utilizador no diálogo da partilha. Se isto for desativado, será necessário preencher o nome de utilizador completo.",
-    "Last cron job execution: %s." : "Última execução de cron job: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
-    "Cron was not executed yet!" : "Cron ainda não foi executado!",
-    "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
-    "Enable server-side encryption" : "Ativar encriptação do lado do servidor",
-    "Please read carefully before activating server-side encryption: " : "Por favor, leia cuidadosamente antes de ativar a encriptação do lado do servidor:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez ativada a encriptação, todos os ficheiros carregados para o servidor a partir deste ponto serão encriptados pelo servidor. Só será possível desativar a encriptação numa data mais tarde se o módulo de encriptação ativo suportar essa função, assim como todas as pré-condições (e.g. definir chave de recuperação) sejam cumpridas.",
-    "Be aware that encryption always increases the file size." : "Tenha em conta que a encriptação aumenta sempre o tamanho do ficheiro.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar cópias de segurança regulares dos seus dados, em caso de encriptação tenha a certeza de que faz cópia das chaves de encriptação em conjunto com os seus dados.",
-    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: quer mesmo ativar a encriptação?",
-    "Enable encryption" : "Ative a encriptação",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de encriptação carregador, por favor ative um módulo de encriptação no menu das aplicações.",
-    "Select default encryption module:" : "Selecionar o módulo de encriptação predefinido:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova. Por favor, ative o \"Módulo de encriptação padrão\" e execute 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova.",
-    "Start migration" : "Iniciar migração",
-    "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
-    "Send mode" : "Modo de Envio",
-    "Encryption" : "Encriptação",
-    "From address" : "Do endereço",
-    "mail" : "Correio",
-    "Authentication method" : "Método de Autenticação",
-    "Authentication required" : "Autenticação necessária",
-    "Server address" : "Endereço do Servidor",
-    "Port" : "Porta",
-    "Credentials" : "Credenciais",
-    "SMTP Username" : "Nome de utilizador SMTP",
-    "SMTP Password" : "Palavra-passe SMTP",
-    "Store credentials" : "Armazenar credenciais",
-    "Test email settings" : "Testar definições de e-mail",
-    "Send email" : "Enviar email",
-    "What to log" : "Fazer log do quê?",
-    "Download logfile" : "Descarregar logfile",
-    "More" : "Mais",
-    "Less" : "Menos",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O logfile é maior que 100MB. O download do mesmo poderá demorar algum tempo!",
+    "Tips & tricks" : "Dicas e truques",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é utilizado como uma base de dados. Para instalações maiores nós recomendamos que mude para uma interface de base de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "O uso de SQLite é desencorajado especialmente se estiver a pensar em dar uso ao cliente desktop para sincronizar os seus ficheiros no seu computador.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro tipo de base de dados, use a ferramenta de comando de linha: 'occ db:convert-type', ou veja a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação↗</a>.",
@@ -205,7 +202,6 @@
     "Improving the config.php" : "Melhorar o config.php",
     "Theming" : "Temas",
     "Hardening and security guidance" : "Orientações de proteção e segurança",
-    "Version" : "Versão",
     "Developer documentation" : "Documentação de Programador",
     "Experimental applications ahead" : "Aplicações experimentais de futuro",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "As apps experimentais não estão selecionadas para problemas de segurança, nova ou conhecida como instável e em forte desenvolvimento. Ao instalá-las pode causar a perda de dados ou quebra de segurança.",
@@ -258,14 +254,14 @@
     "Change password" : "Alterar palavra-passe",
     "Language" : "Idioma",
     "Help translate" : "Ajude a traduzir",
-    "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",
     "Android app" : "Aplicação Android",
     "iOS app" : "Aplicação iOS",
     "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
+    "Name" : "Nome",
+    "Username" : "Nome de utilizador",
+    "Done" : "Concluído",
     "Show storage location" : "Mostrar a localização do armazenamento",
     "Show last log in" : "Mostrar ultimo acesso de entrada",
     "Show user backend" : "Mostrar interface do utilizador",
@@ -284,6 +280,10 @@
     "change full name" : "alterar nome completo",
     "set new password" : "definir nova palavra-passe",
     "change email address" : "alterar endereço do correio eletrónico",
-    "Default" : "Padrão"
+    "Default" : "Padrão",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Armazenamento Externo",
+    "Updates" : "Atualizações"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index eda968ee584..9846f2b6644 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "Адрес сохранен",
     "Your full name has been changed." : "Ваше полное имя было изменено.",
     "Unable to change full name" : "Невозможно изменить полное имя",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Предупреждения безопасности и установки",
-    "Sharing" : "Общий доступ",
-    "Server-side encryption" : "Шифрование на стороне сервера",
-    "External Storage" : "Внешнее хранилище",
-    "Cron" : "Cron (планировщик задач)",
-    "Email server" : "Почтовый сервер",
-    "Log" : "Журнал",
-    "Tips & tricks" : "Советы и трюки",
-    "Updates" : "Обновления",
     "Couldn't remove app." : "Не удалось удалить приложение.",
     "Language changed" : "Язык изменён",
     "Invalid request" : "Неправильный запрос",
@@ -133,17 +122,55 @@ OC.L10N.register(
     "Sessions" : "Сессии",
     "App passwords" : "Пароль приложения",
     "Sync clients" : "Синхронизирующиеся клиенты",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
-    "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы",
-    "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы",
-    "Errors and fatal issues" : "Ошибки и критические проблемы",
-    "Fatal issues only" : "Только критические проблемы",
     "None" : "Отсутствует",
     "Login" : "Логин",
     "Plain" : "Простой",
     "NT LAN Manager" : "Менеджер NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Почтовый сервер",
+    "Open documentation" : "Открыть документацию",
+    "This is used for sending out notifications." : "Используется для отправки уведомлений.",
+    "Send mode" : "Способ отправки",
+    "Encryption" : "Шифрование",
+    "From address" : "Адрес отправителя",
+    "mail" : "почта",
+    "Authentication method" : "Метод проверки подлинности",
+    "Authentication required" : "Требуется аутентификация ",
+    "Server address" : "Адрес сервера",
+    "Port" : "Порт",
+    "Credentials" : "Учётные данные",
+    "SMTP Username" : "Пользователь SMTP",
+    "SMTP Password" : "Пароль SMTP",
+    "Store credentials" : "Сохранить учётные данные",
+    "Test email settings" : "Проверить настройки почты",
+    "Send email" : "Отправить email",
+    "Server-side encryption" : "Шифрование на стороне сервера",
+    "Enable server-side encryption" : "Включить шифрование на стороне сервера",
+    "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Когда вы включите шифрование, все файлы, загруженные с этого момента на сервер, будут храниться в зашифрованном виде. Отключить шифрование в более позднее время возможно только в случае, если выбранный модуль шифрования поддерживает эту функцию, и все дополнительные условия соблюдены (например настроен ключ восстановления).",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Шифрование само по себе не гарантирует безопасность системы. Пожалуйста ознакомтесь с документацией для получения более подробной информации о том, как работают приложения шифрования и соответствующие примеры.",
+    "Be aware that encryption always increases the file size." : "Будьте в курсе, что шифрование всегда увеличивает размер файла.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Хорошая практика делать регулярные резервные копии ваших данных. При использовании шифрования сохраняйте не только данные, но и ключи.",
+    "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
+    "Enable encryption" : "Включить шифрование",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
+    "Select default encryption module:" : "Выберите модуль шифрования по умолчанию:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый. Пожалуйста включите \"Модуль шифрования по умолчанию\" и запустите команду 'occ encryption:migrate'.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый.",
+    "Start migration" : "Запустить миграцию",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
+    "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы",
+    "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы",
+    "Errors and fatal issues" : "Ошибки и критические проблемы",
+    "Fatal issues only" : "Только критические проблемы",
+    "Log" : "Журнал",
+    "What to log" : "Что записывать в журнал",
+    "Download logfile" : "Скачать журнал",
+    "More" : "Больше",
+    "Less" : "Меньше",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!",
+    "Security & setup warnings" : "Предупреждения безопасности и установки",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP был установлен неверно. Запрос getenv(\"PATH\") возвращает пустые результаты.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Пожалуйста обратитесь к <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документации по установке ↗</a> для получения информации по настройке php на вашем сервере, особенно это касается php-fpm.",
     "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." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
@@ -160,7 +187,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не удается запустить задачу планировщика через CLI. Произошли следующие технические ошибки:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Пожалуйста еще раз обратитесь к <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документации по установке ↗</a> и проверьте <a href=\"#log-section\">журнал</a>на наличие ошибок",
     "All checks passed." : "Все проверки пройдены.",
-    "Open documentation" : "Открыть документацию",
+    "Cron" : "Cron (планировщик задач)",
+    "Last cron job execution: %s." : "Последнее выполненное задание планировщика: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Последнее выполненное задание планировщика: %s. Похоже, что-то не в порядке.",
+    "Cron was not executed yet!" : "Задачи cron ещё не запускались!",
+    "Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
+    "Version" : "Версия",
+    "Sharing" : "Общий доступ",
     "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
     "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
     "Allow public uploads" : "Разрешить открытые/публичные загрузки",
@@ -177,45 +212,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Исключить группы из общего доступа",
     "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие ресурсы, но не могут их создавать.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Включить автоматическое завершение имен пользователей в окне общего доступа. Если отключено, то необходимо вводить полное имя вручную.",
-    "Last cron job execution: %s." : "Последнее выполненное задание планировщика: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Последнее выполненное задание планировщика: %s. Похоже, что-то не в порядке.",
-    "Cron was not executed yet!" : "Задачи cron ещё не запускались!",
-    "Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
-    "Enable server-side encryption" : "Включить шифрование на стороне сервера",
-    "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Когда вы включите шифрование, все файлы, загруженные с этого момента на сервер, будут храниться в зашифрованном виде. Отключить шифрование в более позднее время возможно только в случае, если выбранный модуль шифрования поддерживает эту функцию, и все дополнительные условия соблюдены (например настроен ключ восстановления).",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Шифрование само по себе не гарантирует безопасность системы. Пожалуйста ознакомтесь с документацией для получения более подробной информации о том, как работают приложения шифрования и соответствующие примеры.",
-    "Be aware that encryption always increases the file size." : "Будьте в курсе, что шифрование всегда увеличивает размер файла.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Хорошая практика делать регулярные резервные копии ваших данных. При использовании шифрования сохраняйте не только данные, но и ключи.",
-    "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
-    "Enable encryption" : "Включить шифрование",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
-    "Select default encryption module:" : "Выберите модуль шифрования по умолчанию:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый. Пожалуйста включите \"Модуль шифрования по умолчанию\" и запустите команду 'occ encryption:migrate'.",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый.",
-    "Start migration" : "Запустить миграцию",
-    "This is used for sending out notifications." : "Используется для отправки уведомлений.",
-    "Send mode" : "Способ отправки",
-    "Encryption" : "Шифрование",
-    "From address" : "Адрес отправителя",
-    "mail" : "почта",
-    "Authentication method" : "Метод проверки подлинности",
-    "Authentication required" : "Требуется аутентификация ",
-    "Server address" : "Адрес сервера",
-    "Port" : "Порт",
-    "Credentials" : "Учётные данные",
-    "SMTP Username" : "Пользователь SMTP",
-    "SMTP Password" : "Пароль SMTP",
-    "Store credentials" : "Сохранить учётные данные",
-    "Test email settings" : "Проверить настройки почты",
-    "Send email" : "Отправить email",
-    "What to log" : "Что записывать в журнал",
-    "Download logfile" : "Скачать журнал",
-    "More" : "Больше",
-    "Less" : "Меньше",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!",
+    "Tips & tricks" : "Советы и трюки",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использованием клиента для ПК.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Для миграции на другую базу данных используйте команду: 'occ db:convert-type' или обратитесь к a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документации ↗</a>.",
@@ -225,7 +222,6 @@ OC.L10N.register(
     "Improving the config.php" : "Улучшение config.php",
     "Theming" : "Темы оформления",
     "Hardening and security guidance" : "Руководство по безопасности и защите",
-    "Version" : "Версия",
     "Developer documentation" : "Документация для разработчиков",
     "Experimental applications ahead" : "Экспериментальные приложения",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Экспериментальные приложения не проверялись на наличие уязвимостей безопасности, они также могут быть нестабильны, т.к. находятся в активной разработке. Их установка может повлечь потерю информации или нарушение безопасности.",
@@ -281,6 +277,11 @@ OC.L10N.register(
     "Change password" : "Сменить пароль",
     "Language" : "Язык",
     "Help translate" : "Помочь с переводом",
+    "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
+    "Desktop client" : "Клиент для ПК",
+    "Android app" : "Android приложение",
+    "iOS app" : "iOS приложение",
+    "Show First Run Wizard again" : "Показать помощник настройки снова",
     "Web, desktop and mobile clients currently logged in to your account." : "Веб, настольные и мобильные клиенты, которые в настоящий момент авторизованы вашей учётной записью.",
     "Device" : "Устройство",
     "Last activity" : "Последние действия",
@@ -291,12 +292,6 @@ OC.L10N.register(
     "Use the credentials below to configure your app or device." : "Используйте учётные данные ниже для настройки вашего приложения или устройства.",
     "Username" : "Имя пользователя",
     "Done" : "Выполнено",
-    "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
-    "Desktop client" : "Клиент для ПК",
-    "Android app" : "Android приложение",
-    "iOS app" : "iOS приложение",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Если Вы хотите поддержать проект\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">присоединяйтесь к разработке</a>\n\t\tили\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">расскажите о нас</a>!",
-    "Show First Run Wizard again" : "Показать помощник настройки снова",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Разработано {communityopen}сообществом Nextcloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с {licenseopen}AGPL{linkclose}.",
     "Show storage location" : "Показать местонахождение хранилища",
     "Show last log in" : "Показать последний вход в систему",
@@ -321,6 +316,10 @@ OC.L10N.register(
     "change full name" : "изменить полное имя",
     "set new password" : "установить новый пароль",
     "change email address" : "изменить адрес почты",
-    "Default" : "По умолчанию"
+    "Default" : "По умолчанию",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Внешнее хранилище",
+    "Updates" : "Обновления"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 69419920d6c..e5b0d878bae 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -33,17 +33,6 @@
     "Email saved" : "Адрес сохранен",
     "Your full name has been changed." : "Ваше полное имя было изменено.",
     "Unable to change full name" : "Невозможно изменить полное имя",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Предупреждения безопасности и установки",
-    "Sharing" : "Общий доступ",
-    "Server-side encryption" : "Шифрование на стороне сервера",
-    "External Storage" : "Внешнее хранилище",
-    "Cron" : "Cron (планировщик задач)",
-    "Email server" : "Почтовый сервер",
-    "Log" : "Журнал",
-    "Tips & tricks" : "Советы и трюки",
-    "Updates" : "Обновления",
     "Couldn't remove app." : "Не удалось удалить приложение.",
     "Language changed" : "Язык изменён",
     "Invalid request" : "Неправильный запрос",
@@ -131,17 +120,55 @@
     "Sessions" : "Сессии",
     "App passwords" : "Пароль приложения",
     "Sync clients" : "Синхронизирующиеся клиенты",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
-    "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы",
-    "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы",
-    "Errors and fatal issues" : "Ошибки и критические проблемы",
-    "Fatal issues only" : "Только критические проблемы",
     "None" : "Отсутствует",
     "Login" : "Логин",
     "Plain" : "Простой",
     "NT LAN Manager" : "Менеджер NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Почтовый сервер",
+    "Open documentation" : "Открыть документацию",
+    "This is used for sending out notifications." : "Используется для отправки уведомлений.",
+    "Send mode" : "Способ отправки",
+    "Encryption" : "Шифрование",
+    "From address" : "Адрес отправителя",
+    "mail" : "почта",
+    "Authentication method" : "Метод проверки подлинности",
+    "Authentication required" : "Требуется аутентификация ",
+    "Server address" : "Адрес сервера",
+    "Port" : "Порт",
+    "Credentials" : "Учётные данные",
+    "SMTP Username" : "Пользователь SMTP",
+    "SMTP Password" : "Пароль SMTP",
+    "Store credentials" : "Сохранить учётные данные",
+    "Test email settings" : "Проверить настройки почты",
+    "Send email" : "Отправить email",
+    "Server-side encryption" : "Шифрование на стороне сервера",
+    "Enable server-side encryption" : "Включить шифрование на стороне сервера",
+    "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Когда вы включите шифрование, все файлы, загруженные с этого момента на сервер, будут храниться в зашифрованном виде. Отключить шифрование в более позднее время возможно только в случае, если выбранный модуль шифрования поддерживает эту функцию, и все дополнительные условия соблюдены (например настроен ключ восстановления).",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Шифрование само по себе не гарантирует безопасность системы. Пожалуйста ознакомтесь с документацией для получения более подробной информации о том, как работают приложения шифрования и соответствующие примеры.",
+    "Be aware that encryption always increases the file size." : "Будьте в курсе, что шифрование всегда увеличивает размер файла.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Хорошая практика делать регулярные резервные копии ваших данных. При использовании шифрования сохраняйте не только данные, но и ключи.",
+    "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
+    "Enable encryption" : "Включить шифрование",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
+    "Select default encryption module:" : "Выберите модуль шифрования по умолчанию:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый. Пожалуйста включите \"Модуль шифрования по умолчанию\" и запустите команду 'occ encryption:migrate'.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый.",
+    "Start migration" : "Запустить миграцию",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
+    "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы",
+    "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы",
+    "Errors and fatal issues" : "Ошибки и критические проблемы",
+    "Fatal issues only" : "Только критические проблемы",
+    "Log" : "Журнал",
+    "What to log" : "Что записывать в журнал",
+    "Download logfile" : "Скачать журнал",
+    "More" : "Больше",
+    "Less" : "Меньше",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!",
+    "Security & setup warnings" : "Предупреждения безопасности и установки",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP был установлен неверно. Запрос getenv(\"PATH\") возвращает пустые результаты.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Пожалуйста обратитесь к <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документации по установке ↗</a> для получения информации по настройке php на вашем сервере, особенно это касается php-fpm.",
     "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." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
@@ -158,7 +185,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не удается запустить задачу планировщика через CLI. Произошли следующие технические ошибки:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Пожалуйста еще раз обратитесь к <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документации по установке ↗</a> и проверьте <a href=\"#log-section\">журнал</a>на наличие ошибок",
     "All checks passed." : "Все проверки пройдены.",
-    "Open documentation" : "Открыть документацию",
+    "Cron" : "Cron (планировщик задач)",
+    "Last cron job execution: %s." : "Последнее выполненное задание планировщика: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Последнее выполненное задание планировщика: %s. Похоже, что-то не в порядке.",
+    "Cron was not executed yet!" : "Задачи cron ещё не запускались!",
+    "Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
+    "Version" : "Версия",
+    "Sharing" : "Общий доступ",
     "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
     "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
     "Allow public uploads" : "Разрешить открытые/публичные загрузки",
@@ -175,45 +210,7 @@
     "Exclude groups from sharing" : "Исключить группы из общего доступа",
     "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие ресурсы, но не могут их создавать.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Включить автоматическое завершение имен пользователей в окне общего доступа. Если отключено, то необходимо вводить полное имя вручную.",
-    "Last cron job execution: %s." : "Последнее выполненное задание планировщика: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Последнее выполненное задание планировщика: %s. Похоже, что-то не в порядке.",
-    "Cron was not executed yet!" : "Задачи cron ещё не запускались!",
-    "Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
-    "Enable server-side encryption" : "Включить шифрование на стороне сервера",
-    "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Когда вы включите шифрование, все файлы, загруженные с этого момента на сервер, будут храниться в зашифрованном виде. Отключить шифрование в более позднее время возможно только в случае, если выбранный модуль шифрования поддерживает эту функцию, и все дополнительные условия соблюдены (например настроен ключ восстановления).",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Шифрование само по себе не гарантирует безопасность системы. Пожалуйста ознакомтесь с документацией для получения более подробной информации о том, как работают приложения шифрования и соответствующие примеры.",
-    "Be aware that encryption always increases the file size." : "Будьте в курсе, что шифрование всегда увеличивает размер файла.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Хорошая практика делать регулярные резервные копии ваших данных. При использовании шифрования сохраняйте не только данные, но и ключи.",
-    "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
-    "Enable encryption" : "Включить шифрование",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
-    "Select default encryption module:" : "Выберите модуль шифрования по умолчанию:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый. Пожалуйста включите \"Модуль шифрования по умолчанию\" и запустите команду 'occ encryption:migrate'.",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый.",
-    "Start migration" : "Запустить миграцию",
-    "This is used for sending out notifications." : "Используется для отправки уведомлений.",
-    "Send mode" : "Способ отправки",
-    "Encryption" : "Шифрование",
-    "From address" : "Адрес отправителя",
-    "mail" : "почта",
-    "Authentication method" : "Метод проверки подлинности",
-    "Authentication required" : "Требуется аутентификация ",
-    "Server address" : "Адрес сервера",
-    "Port" : "Порт",
-    "Credentials" : "Учётные данные",
-    "SMTP Username" : "Пользователь SMTP",
-    "SMTP Password" : "Пароль SMTP",
-    "Store credentials" : "Сохранить учётные данные",
-    "Test email settings" : "Проверить настройки почты",
-    "Send email" : "Отправить email",
-    "What to log" : "Что записывать в журнал",
-    "Download logfile" : "Скачать журнал",
-    "More" : "Больше",
-    "Less" : "Меньше",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!",
+    "Tips & tricks" : "Советы и трюки",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использованием клиента для ПК.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Для миграции на другую базу данных используйте команду: 'occ db:convert-type' или обратитесь к a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документации ↗</a>.",
@@ -223,7 +220,6 @@
     "Improving the config.php" : "Улучшение config.php",
     "Theming" : "Темы оформления",
     "Hardening and security guidance" : "Руководство по безопасности и защите",
-    "Version" : "Версия",
     "Developer documentation" : "Документация для разработчиков",
     "Experimental applications ahead" : "Экспериментальные приложения",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Экспериментальные приложения не проверялись на наличие уязвимостей безопасности, они также могут быть нестабильны, т.к. находятся в активной разработке. Их установка может повлечь потерю информации или нарушение безопасности.",
@@ -279,6 +275,11 @@
     "Change password" : "Сменить пароль",
     "Language" : "Язык",
     "Help translate" : "Помочь с переводом",
+    "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
+    "Desktop client" : "Клиент для ПК",
+    "Android app" : "Android приложение",
+    "iOS app" : "iOS приложение",
+    "Show First Run Wizard again" : "Показать помощник настройки снова",
     "Web, desktop and mobile clients currently logged in to your account." : "Веб, настольные и мобильные клиенты, которые в настоящий момент авторизованы вашей учётной записью.",
     "Device" : "Устройство",
     "Last activity" : "Последние действия",
@@ -289,12 +290,6 @@
     "Use the credentials below to configure your app or device." : "Используйте учётные данные ниже для настройки вашего приложения или устройства.",
     "Username" : "Имя пользователя",
     "Done" : "Выполнено",
-    "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
-    "Desktop client" : "Клиент для ПК",
-    "Android app" : "Android приложение",
-    "iOS app" : "iOS приложение",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Если Вы хотите поддержать проект\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">присоединяйтесь к разработке</a>\n\t\tили\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">расскажите о нас</a>!",
-    "Show First Run Wizard again" : "Показать помощник настройки снова",
     "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Разработано {communityopen}сообществом Nextcloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с {licenseopen}AGPL{linkclose}.",
     "Show storage location" : "Показать местонахождение хранилища",
     "Show last log in" : "Показать последний вход в систему",
@@ -319,6 +314,10 @@
     "change full name" : "изменить полное имя",
     "set new password" : "установить новый пароль",
     "change email address" : "изменить адрес почты",
-    "Default" : "По умолчанию"
+    "Default" : "По умолчанию",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Внешнее хранилище",
+    "Updates" : "Обновления"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index 6de06e3b64f..d52b1898726 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -34,17 +34,6 @@ OC.L10N.register(
     "Email saved" : "Elektronski naslov je shranjen",
     "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
     "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Varnost in namestitvena opozorila",
-    "Sharing" : "Souporaba",
-    "Server-side encryption" : "Šifriranje na strežniku",
-    "External Storage" : "Zunanja podatkovna shramba",
-    "Cron" : "Periodično opravilo",
-    "Email server" : "Poštni strežnik",
-    "Log" : "Dnevnik",
-    "Tips & tricks" : "Nasveti in triki",
-    "Updates" : "Posodobitve",
     "Couldn't remove app." : "Ni mogoče odstraniti programa.",
     "Language changed" : "Jezik je spremenjen",
     "Invalid request" : "Neveljavna zahteva",
@@ -115,53 +104,14 @@ OC.L10N.register(
     "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",
-    "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke",
-    "Errors and fatal issues" : "Napake in usodne dogodke",
-    "Fatal issues only" : "Le usodne dogodke",
     "None" : "Brez",
     "Login" : "Prijava",
     "Plain" : "Besedilno",
     "NT LAN Manager" : "Upravljalnik NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
-    "PHP is apparently setup 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.",
-    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
-    "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
-    "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
-    "All checks passed." : "Vsa preverjanja so uspešno zaključena.",
+    "Email server" : "Poštni strežnik",
     "Open documentation" : "Odprta dokumentacija",
-    "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
-    "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
-    "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
-    "Enforce password protection" : "Vsili zaščito z geslom",
-    "Set default expiration date" : "Nastavitev privzetega datuma poteka",
-    "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
-    "Expire after " : "Preteče po",
-    "days" : "dneh",
-    "Enforce expiration date" : "Vsili datum preteka",
-    "Allow resharing" : "Dovoli nadaljnjo souporabo",
-    "Allow sharing with groups" : "Dovoli souporabo s skupinami",
-    "Restrict users to only share with users in their groups" : "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
-    "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",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Modul za šifriranje ni naložen. Prosim, omogočite en šifrirni modul v spisku aplikacij.",
-    "Select default encryption module:" : "Izbor privzetega modula za šifriranje:",
-    "Start migration" : "Začni selitev",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
     "Encryption" : "Šifriranje",
@@ -177,11 +127,58 @@ OC.L10N.register(
     "Store credentials" : "Shrani poverila",
     "Test email settings" : "Preizkus nastavitev elektronske pošte",
     "Send email" : "Pošlji elektronsko sporočilo",
+    "Server-side encryption" : "Šifriranje na strežniku",
+    "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",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Modul za šifriranje ni naložen. Prosim, omogočite en šifrirni modul v spisku aplikacij.",
+    "Select default encryption module:" : "Izbor privzetega modula za šifriranje:",
+    "Start migration" : "Začni selitev",
+    "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",
+    "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke",
+    "Errors and fatal issues" : "Napake in usodne dogodke",
+    "Fatal issues only" : "Le usodne dogodke",
+    "Log" : "Dnevnik",
     "What to log" : "Kaj naj se beleži?",
     "Download logfile" : "Prejmi dnevniško datoteko",
     "More" : "Več",
     "Less" : "Manj",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Dnevniškega datoteka je večja od 100 MB. Hitrost prejema je odvisna od širokopasovne povezave!",
+    "Security & setup warnings" : "Varnost in namestitvena opozorila",
+    "PHP is apparently setup 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.",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
+    "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+    "All checks passed." : "Vsa preverjanja so uspešno zaključena.",
+    "Cron" : "Periodično opravilo",
+    "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.",
+    "Version" : "Različica",
+    "Sharing" : "Souporaba",
+    "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
+    "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
+    "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
+    "Enforce password protection" : "Vsili zaščito z geslom",
+    "Set default expiration date" : "Nastavitev privzetega datuma poteka",
+    "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
+    "Expire after " : "Preteče po",
+    "days" : "dneh",
+    "Enforce expiration date" : "Vsili datum preteka",
+    "Allow resharing" : "Dovoli nadaljnjo souporabo",
+    "Allow sharing with groups" : "Dovoli souporabo s skupinami",
+    "Restrict users to only share with users in their groups" : "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
+    "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",
+    "Tips & tricks" : "Nasveti in triki",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Uporabljena zbirka je SQLite. Za obsežnejše sisteme je priporočljiv prehod na drugo vrsto zbirke.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Uporaba SQLite ni priporočljiva iz varnostnih razlogov, to še posebej velja, če se sistem krajevno usklajuje z namizjem prek odjemalca.",
     "How to do backups" : "Kako ustvariti varnostne kopije",
@@ -190,7 +187,6 @@ OC.L10N.register(
     "Improving the config.php" : "Izboljšave v config.php",
     "Theming" : "Teme",
     "Hardening and security guidance" : "Varnost in varnostni napotki",
-    "Version" : "Različica",
     "Developer documentation" : "Dokumentacija za razvijalce",
     "Experimental applications ahead" : "Preizkusni programi",
     "%s-licensed" : "dovoljenje-%s",
@@ -244,16 +240,16 @@ OC.L10N.register(
     "Change password" : "Spremeni geslo",
     "Language" : "Jezik",
     "Help translate" : "Sodelujte pri prevajanju",
-    "Name" : "Ime",
-    "App name" : "Ime 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",
     "Android app" : "Program za Android",
     "iOS app" : "Program za iOS",
     "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
+    "Name" : "Ime",
+    "App name" : "Ime aplikacije",
+    "Create new app password" : "Ustvari novo geslo aplikacije",
+    "Username" : "Uporabniško ime",
+    "Done" : "Končano",
     "Show storage location" : "Pokaži mesto shrambe",
     "Show last log in" : "Pokaži podatke zadnje prijave",
     "Show user backend" : "Pokaži ozadnji program",
@@ -272,6 +268,10 @@ OC.L10N.register(
     "change full name" : "Spremeni polno ime",
     "set new password" : "nastavi novo geslo",
     "change email address" : "spremeni naslov elektronske pošte",
-    "Default" : "Privzeto"
+    "Default" : "Privzeto",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Zunanja podatkovna shramba",
+    "Updates" : "Posodobitve"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 44b7c9e55d6..7cbf0085b1d 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -32,17 +32,6 @@
     "Email saved" : "Elektronski naslov je shranjen",
     "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
     "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Varnost in namestitvena opozorila",
-    "Sharing" : "Souporaba",
-    "Server-side encryption" : "Šifriranje na strežniku",
-    "External Storage" : "Zunanja podatkovna shramba",
-    "Cron" : "Periodično opravilo",
-    "Email server" : "Poštni strežnik",
-    "Log" : "Dnevnik",
-    "Tips & tricks" : "Nasveti in triki",
-    "Updates" : "Posodobitve",
     "Couldn't remove app." : "Ni mogoče odstraniti programa.",
     "Language changed" : "Jezik je spremenjen",
     "Invalid request" : "Neveljavna zahteva",
@@ -113,53 +102,14 @@
     "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",
-    "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke",
-    "Errors and fatal issues" : "Napake in usodne dogodke",
-    "Fatal issues only" : "Le usodne dogodke",
     "None" : "Brez",
     "Login" : "Prijava",
     "Plain" : "Besedilno",
     "NT LAN Manager" : "Upravljalnik NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
-    "PHP is apparently setup 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.",
-    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
-    "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
-    "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
-    "All checks passed." : "Vsa preverjanja so uspešno zaključena.",
+    "Email server" : "Poštni strežnik",
     "Open documentation" : "Odprta dokumentacija",
-    "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
-    "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
-    "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
-    "Enforce password protection" : "Vsili zaščito z geslom",
-    "Set default expiration date" : "Nastavitev privzetega datuma poteka",
-    "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
-    "Expire after " : "Preteče po",
-    "days" : "dneh",
-    "Enforce expiration date" : "Vsili datum preteka",
-    "Allow resharing" : "Dovoli nadaljnjo souporabo",
-    "Allow sharing with groups" : "Dovoli souporabo s skupinami",
-    "Restrict users to only share with users in their groups" : "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
-    "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",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Modul za šifriranje ni naložen. Prosim, omogočite en šifrirni modul v spisku aplikacij.",
-    "Select default encryption module:" : "Izbor privzetega modula za šifriranje:",
-    "Start migration" : "Začni selitev",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
     "Encryption" : "Šifriranje",
@@ -175,11 +125,58 @@
     "Store credentials" : "Shrani poverila",
     "Test email settings" : "Preizkus nastavitev elektronske pošte",
     "Send email" : "Pošlji elektronsko sporočilo",
+    "Server-side encryption" : "Šifriranje na strežniku",
+    "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",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Modul za šifriranje ni naložen. Prosim, omogočite en šifrirni modul v spisku aplikacij.",
+    "Select default encryption module:" : "Izbor privzetega modula za šifriranje:",
+    "Start migration" : "Začni selitev",
+    "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",
+    "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke",
+    "Errors and fatal issues" : "Napake in usodne dogodke",
+    "Fatal issues only" : "Le usodne dogodke",
+    "Log" : "Dnevnik",
     "What to log" : "Kaj naj se beleži?",
     "Download logfile" : "Prejmi dnevniško datoteko",
     "More" : "Več",
     "Less" : "Manj",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Dnevniškega datoteka je večja od 100 MB. Hitrost prejema je odvisna od širokopasovne povezave!",
+    "Security & setup warnings" : "Varnost in namestitvena opozorila",
+    "PHP is apparently setup 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.",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
+    "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+    "All checks passed." : "Vsa preverjanja so uspešno zaključena.",
+    "Cron" : "Periodično opravilo",
+    "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.",
+    "Version" : "Različica",
+    "Sharing" : "Souporaba",
+    "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
+    "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
+    "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
+    "Enforce password protection" : "Vsili zaščito z geslom",
+    "Set default expiration date" : "Nastavitev privzetega datuma poteka",
+    "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
+    "Expire after " : "Preteče po",
+    "days" : "dneh",
+    "Enforce expiration date" : "Vsili datum preteka",
+    "Allow resharing" : "Dovoli nadaljnjo souporabo",
+    "Allow sharing with groups" : "Dovoli souporabo s skupinami",
+    "Restrict users to only share with users in their groups" : "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
+    "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",
+    "Tips & tricks" : "Nasveti in triki",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Uporabljena zbirka je SQLite. Za obsežnejše sisteme je priporočljiv prehod na drugo vrsto zbirke.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Uporaba SQLite ni priporočljiva iz varnostnih razlogov, to še posebej velja, če se sistem krajevno usklajuje z namizjem prek odjemalca.",
     "How to do backups" : "Kako ustvariti varnostne kopije",
@@ -188,7 +185,6 @@
     "Improving the config.php" : "Izboljšave v config.php",
     "Theming" : "Teme",
     "Hardening and security guidance" : "Varnost in varnostni napotki",
-    "Version" : "Različica",
     "Developer documentation" : "Dokumentacija za razvijalce",
     "Experimental applications ahead" : "Preizkusni programi",
     "%s-licensed" : "dovoljenje-%s",
@@ -242,16 +238,16 @@
     "Change password" : "Spremeni geslo",
     "Language" : "Jezik",
     "Help translate" : "Sodelujte pri prevajanju",
-    "Name" : "Ime",
-    "App name" : "Ime 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",
     "Android app" : "Program za Android",
     "iOS app" : "Program za iOS",
     "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
+    "Name" : "Ime",
+    "App name" : "Ime aplikacije",
+    "Create new app password" : "Ustvari novo geslo aplikacije",
+    "Username" : "Uporabniško ime",
+    "Done" : "Končano",
     "Show storage location" : "Pokaži mesto shrambe",
     "Show last log in" : "Pokaži podatke zadnje prijave",
     "Show user backend" : "Pokaži ozadnji program",
@@ -270,6 +266,10 @@
     "change full name" : "Spremeni polno ime",
     "set new password" : "nastavi novo geslo",
     "change email address" : "spremeni naslov elektronske pošte",
-    "Default" : "Privzeto"
+    "Default" : "Privzeto",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Zunanja podatkovna shramba",
+    "Updates" : "Posodobitve"
 },"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/settings/l10n/sq.js b/settings/l10n/sq.js
index 6fb6afaf4b4..ed6baef5ae4 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "Email-i u ruajt",
     "Your full name has been changed." : "Emri juaj i plotë u ndryshua.",
     "Unable to change full name" : "S’arrin të ndryshojë emrin e plotë",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Sinjalizime sigurie & rregullimi",
-    "Sharing" : "Ndarje me të tjerët",
-    "Server-side encryption" : "Fshehtëzim më anë shërbyesi",
-    "External Storage" : "Depozitim i Jashtëm",
-    "Cron" : "Cron",
-    "Email server" : "Shërbyes email-esh",
-    "Log" : "Regjistër",
-    "Tips & tricks" : "Ndihmëza & rrengje",
-    "Updates" : "Përditësime",
     "Couldn't remove app." : "S’hoqi dot aplikacionin.",
     "Language changed" : "Gjuha u ndryshua",
     "Invalid request" : "Kërkesë e pavlefshme",
@@ -118,17 +107,54 @@ OC.L10N.register(
     "Sessions" : "Sesione",
     "App passwords" : "Fjalëkalim aplikacioni",
     "Sync clients" : "Klientë njëkohësimi",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Gjithçka (probleme fatale, gabime, sinjalizime, të dhëna, diagnostikim)",
-    "Info, warnings, errors and fatal issues" : "Të dhëna, sinjalizime, gabime dhe probleme fatale",
-    "Warnings, errors and fatal issues" : "Sinjalizime, gabime dhe probleme fatale",
-    "Errors and fatal issues" : "Gabime dhe probleme fatale",
-    "Fatal issues only" : "Vetëm probleme fatale",
     "None" : "Asnjë",
     "Login" : "Hyrje",
     "Plain" : "E thjeshtë",
     "NT LAN Manager" : "Përgjegjës Rrjeti NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Shërbyes email-esh",
+    "Open documentation" : "Hapni dokumentimin",
+    "This is used for sending out notifications." : "Ky përdoret për të dërguar njoftime.",
+    "Send mode" : "Mënyrë dërgimi",
+    "Encryption" : "Fshehtëzim",
+    "From address" : "Nga adresa",
+    "mail" : "email",
+    "Authentication method" : "Metodë mirëfilltësimi",
+    "Authentication required" : "Lypset mirëfilltësim",
+    "Server address" : "Adresë shërbyesi",
+    "Port" : "Portë",
+    "Credentials" : "Kredenciale",
+    "SMTP Username" : "Emër përdoruesi SMTP",
+    "SMTP Password" : "Fjalëkalim SMTP",
+    "Store credentials" : "Depozitoji kredencialet",
+    "Test email settings" : "Testoni rregullimet e email-it",
+    "Send email" : "Dërgo email",
+    "Server-side encryption" : "Fshehtëzim më anë shërbyesi",
+    "Enable server-side encryption" : "Aktivizo fshehtëzim më anë të shërbyesit",
+    "Please read carefully before activating server-side encryption: " : "Ju lutemi, lexoni me kujdes përpara aktivizimit të fshehtëzimeve më anë shërbyesi: ",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Pasi të jetë aktivizuar fshehtëzimi, krejt kartelat e ngarkuara te shërbyesi nga kjo pikë e tutje do të fshehtëzohen pasi të jenë depozituar në shërbyes. Çaktivizimi i fshehtëzimit në një datë të mëvonshme do të jetë i mundur vetëm nëse moduli aktiv i fshehtëzimeve e mbulon këtë funksion, dhe nëse plotësohen krejt parakushtet (p.sh. caktimi i një kyçi rimarrjesh).",
+    "Be aware that encryption always increases the file size." : "Kini parasysh që fshehtëzimi e rrit gjithnjë madhësinë e kartelës.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Është gjithmonë ide e mirë të krijohen kopjeruajtje të rregullta të të dhënave tuaja, në rast fshehtëzimi sigurohuni që bëni kopjeruajtje të kyçeve të fshehtëzimit, tok me të dhënat tuaja.",
+    "This is the final warning: Do you really want to enable encryption?" : "Ky është sinjalizimi përfundimtar: Doni vërtet të aktivizohet fshehtëzimi?",
+    "Enable encryption" : "Aktivizoni fshehtëzim",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "S’ka të ngarkuar modul fshehtëzimi, ju lutemi, aktivizoni një modul fshehtëzimi që nga menuja e aplikacionit.",
+    "Select default encryption module:" : "Përzgjidhni modul parazgjedhje fshehtëzimi:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Lypset të migroni kyçet tuaj të fshehtëzimit nga fshehtëzimi i vjetër (ownCloud <= 8.0) te i riu. Ju lutemi, aktivizoni \"Modul parazgjedhje fshehtëzimesh\" dhe ekzekutoni 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Lypset të migroni kyçet tuaj të fshehtëzimit nga fshehtëzimi i vjetër (ownCloud <= 8.0) te i riu.",
+    "Start migration" : "Fillo migrimin",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Gjithçka (probleme fatale, gabime, sinjalizime, të dhëna, diagnostikim)",
+    "Info, warnings, errors and fatal issues" : "Të dhëna, sinjalizime, gabime dhe probleme fatale",
+    "Warnings, errors and fatal issues" : "Sinjalizime, gabime dhe probleme fatale",
+    "Errors and fatal issues" : "Gabime dhe probleme fatale",
+    "Fatal issues only" : "Vetëm probleme fatale",
+    "Log" : "Regjistër",
+    "What to log" : "Ç’të regjistrohet",
+    "Download logfile" : "Shkarkoni kartelën regjistër",
+    "More" : "Më tepër",
+    "Less" : "Më pak",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Kartela regjistër është më e madhe se 100 MB. Shkarkimi i saj mund të hajë ca kohë!",
+    "Security & setup warnings" : "Sinjalizime sigurie & rregullimi",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP-ja nuk duket të jetë rregulluar si duhet për të kërkuar ndryshore mjedisi sistemi. Testi me getenv(\"PATH\") kthen vetëm një përgjigje të zbrazët.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Ju lutemi, kontrolloni <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentimin e instalimit ↗</a> për shënime rreth formësimit të php-së dhe formësimin php të shërbyesit tuaj, veçanërisht kur përdoret using php-fpm.",
     "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." : "Rregullimi Vetëm-Lexim u aktivizua. Kjo parandalon rregullimin e disa parametrave përmes ndërfaqes web. Më tej, për çdo përditësim kartela lyp të kalohet dorazi si e shkrueshme.",
@@ -144,7 +170,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "S’qe e mundur të përmbushej akti cron përmes CLI-së. U shfaqën gabimet teknike vijuese:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Ju lutemi, rihidhuni një sy <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">udhërrëfyesve të instalimit ↗</a>, dhe kontrolloni te <a href=\"#log-section\">regjistri</a> për çfarëdo gabimesh apo sinjalizimesh.",
     "All checks passed." : "I kaloi krejt kontrollet.",
-    "Open documentation" : "Hapni dokumentimin",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Përmbushja e fundit e aktit cron: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Përmbushja e fundit e aktit cron: %s. Duket se nuk shkon diçka.",
+    "Cron was not executed yet!" : "Cron-i s’qe ekzekutuar ende!",
+    "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php është regjistruar te një shërbim webcron që ta aktivizojë cron.php-në çdo 15 minuta përmes http-je.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Përdorni shërbimin cron të sistemit që ta aktivizojë cron.php-në çdo 15 minuta.",
+    "Version" : "Version",
+    "Sharing" : "Ndarje me të tjerët",
     "Allow apps to use the Share API" : "Lejoni aplikacionet të përdorin API Share",
     "Allow users to share via link" : "Lejoji përdoruesit të ndajnë me të tjerët përmes lidhjesh",
     "Allow public uploads" : "Lejo ngarkime publike",
@@ -161,44 +195,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Përjashtoni grupe nga ndarjet",
     "These groups will still be able to receive shares, but not to initiate them." : "Këto grupe prapë do të jenë në gjendje të marrin ndarje nga të tjerët, por jo të fillojnë të tilla.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Lejo vetëplotësim emra përdoruesish te dialogu i ndarjeve me të tjerët. Nëse kjo është e çaktivizuar, do të duhet të jepen emra përdoruesish.",
-    "Last cron job execution: %s." : "Përmbushja e fundit e aktit cron: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Përmbushja e fundit e aktit cron: %s. Duket se nuk shkon diçka.",
-    "Cron was not executed yet!" : "Cron-i s’qe ekzekutuar ende!",
-    "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php është regjistruar te një shërbim webcron që ta aktivizojë cron.php-në çdo 15 minuta përmes http-je.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Përdorni shërbimin cron të sistemit që ta aktivizojë cron.php-në çdo 15 minuta.",
-    "Enable server-side encryption" : "Aktivizo fshehtëzim më anë të shërbyesit",
-    "Please read carefully before activating server-side encryption: " : "Ju lutemi, lexoni me kujdes përpara aktivizimit të fshehtëzimeve më anë shërbyesi: ",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Pasi të jetë aktivizuar fshehtëzimi, krejt kartelat e ngarkuara te shërbyesi nga kjo pikë e tutje do të fshehtëzohen pasi të jenë depozituar në shërbyes. Çaktivizimi i fshehtëzimit në një datë të mëvonshme do të jetë i mundur vetëm nëse moduli aktiv i fshehtëzimeve e mbulon këtë funksion, dhe nëse plotësohen krejt parakushtet (p.sh. caktimi i një kyçi rimarrjesh).",
-    "Be aware that encryption always increases the file size." : "Kini parasysh që fshehtëzimi e rrit gjithnjë madhësinë e kartelës.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Është gjithmonë ide e mirë të krijohen kopjeruajtje të rregullta të të dhënave tuaja, në rast fshehtëzimi sigurohuni që bëni kopjeruajtje të kyçeve të fshehtëzimit, tok me të dhënat tuaja.",
-    "This is the final warning: Do you really want to enable encryption?" : "Ky është sinjalizimi përfundimtar: Doni vërtet të aktivizohet fshehtëzimi?",
-    "Enable encryption" : "Aktivizoni fshehtëzim",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "S’ka të ngarkuar modul fshehtëzimi, ju lutemi, aktivizoni një modul fshehtëzimi që nga menuja e aplikacionit.",
-    "Select default encryption module:" : "Përzgjidhni modul parazgjedhje fshehtëzimi:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Lypset të migroni kyçet tuaj të fshehtëzimit nga fshehtëzimi i vjetër (ownCloud <= 8.0) te i riu. Ju lutemi, aktivizoni \"Modul parazgjedhje fshehtëzimesh\" dhe ekzekutoni 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Lypset të migroni kyçet tuaj të fshehtëzimit nga fshehtëzimi i vjetër (ownCloud <= 8.0) te i riu.",
-    "Start migration" : "Fillo migrimin",
-    "This is used for sending out notifications." : "Ky përdoret për të dërguar njoftime.",
-    "Send mode" : "Mënyrë dërgimi",
-    "Encryption" : "Fshehtëzim",
-    "From address" : "Nga adresa",
-    "mail" : "email",
-    "Authentication method" : "Metodë mirëfilltësimi",
-    "Authentication required" : "Lypset mirëfilltësim",
-    "Server address" : "Adresë shërbyesi",
-    "Port" : "Portë",
-    "Credentials" : "Kredenciale",
-    "SMTP Username" : "Emër përdoruesi SMTP",
-    "SMTP Password" : "Fjalëkalim SMTP",
-    "Store credentials" : "Depozitoji kredencialet",
-    "Test email settings" : "Testoni rregullimet e email-it",
-    "Send email" : "Dërgo email",
-    "What to log" : "Ç’të regjistrohet",
-    "Download logfile" : "Shkarkoni kartelën regjistër",
-    "More" : "Më tepër",
-    "Less" : "Më pak",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Kartela regjistër është më e madhe se 100 MB. Shkarkimi i saj mund të hajë ca kohë!",
+    "Tips & tricks" : "Ndihmëza & rrengje",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Si bazë të dhënash përdoret SQLite. Për instalime më të ngarkuara, këshillojmë të kalohet në një program tjetër baze të dhënash.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Përdorimi i SQLite-it nuk këshillohet veçanërisht kur përdoret klienti desktop për njëkohësim kartelash.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Për të kaluar te një tjetër bazë të dhënash përdorni mjetin rresht urdhrash: 'occ db:convert-type', ose shihni <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentimin ↗</a>.",
@@ -208,7 +205,6 @@ OC.L10N.register(
     "Improving the config.php" : "Si të përmirësohet config.php",
     "Theming" : "Ndryshim teme grafike",
     "Hardening and security guidance" : "Udhëzime për forcim dhe siguri",
-    "Version" : "Version",
     "Developer documentation" : "Dokumentim për zhvillues",
     "Experimental applications ahead" : "Keni përpara aplikacione eksperimentale",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplikacionet eksperimentale nuk kontrollohen për probleme sigurie, mund të jenë të rinj ose të njohur si të paqëndrueshëm, dhe nën zhvillim intensiv. Instalimi i tyre mund të shkaktojë humbje të dhënash ose cenim të sigurisë.",
@@ -262,16 +258,16 @@ OC.L10N.register(
     "Change password" : "Ndrysho fjalëkalimin",
     "Language" : "Gjuhë",
     "Help translate" : "Ndihmoni në përkthim",
-    "Name" : "Emër",
-    "App name" : "Emër aplikacioni",
-    "Create new app password" : "Krijoni fjalëkalim aplikacioni të ri",
-    "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",
     "Android app" : "Aplikacion për Android",
     "iOS app" : "Aplikacion për iOS",
     "Show First Run Wizard again" : "Shfaqe sërish Ndihmësin e Herës së Parë",
+    "Name" : "Emër",
+    "App name" : "Emër aplikacioni",
+    "Create new app password" : "Krijoni fjalëkalim aplikacioni të ri",
+    "Username" : "Emër përdoruesi",
+    "Done" : "U bë",
     "Show storage location" : "Shfaq vendndodhje depozite",
     "Show last log in" : "Shfaq hyrjen e fundit",
     "Show user backend" : "Shfaq programin klient të përdoruesit",
@@ -290,6 +286,10 @@ OC.L10N.register(
     "change full name" : "ndryshoni emrin e plotë",
     "set new password" : "caktoni fjalëkalim të ri",
     "change email address" : "ndryshoni adresën email",
-    "Default" : "Parazgjedhje"
+    "Default" : "Parazgjedhje",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Depozitim i Jashtëm",
+    "Updates" : "Përditësime"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index e4b4ac4dee5..5b83ea9d56d 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -33,17 +33,6 @@
     "Email saved" : "Email-i u ruajt",
     "Your full name has been changed." : "Emri juaj i plotë u ndryshua.",
     "Unable to change full name" : "S’arrin të ndryshojë emrin e plotë",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Sinjalizime sigurie & rregullimi",
-    "Sharing" : "Ndarje me të tjerët",
-    "Server-side encryption" : "Fshehtëzim më anë shërbyesi",
-    "External Storage" : "Depozitim i Jashtëm",
-    "Cron" : "Cron",
-    "Email server" : "Shërbyes email-esh",
-    "Log" : "Regjistër",
-    "Tips & tricks" : "Ndihmëza & rrengje",
-    "Updates" : "Përditësime",
     "Couldn't remove app." : "S’hoqi dot aplikacionin.",
     "Language changed" : "Gjuha u ndryshua",
     "Invalid request" : "Kërkesë e pavlefshme",
@@ -116,17 +105,54 @@
     "Sessions" : "Sesione",
     "App passwords" : "Fjalëkalim aplikacioni",
     "Sync clients" : "Klientë njëkohësimi",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Gjithçka (probleme fatale, gabime, sinjalizime, të dhëna, diagnostikim)",
-    "Info, warnings, errors and fatal issues" : "Të dhëna, sinjalizime, gabime dhe probleme fatale",
-    "Warnings, errors and fatal issues" : "Sinjalizime, gabime dhe probleme fatale",
-    "Errors and fatal issues" : "Gabime dhe probleme fatale",
-    "Fatal issues only" : "Vetëm probleme fatale",
     "None" : "Asnjë",
     "Login" : "Hyrje",
     "Plain" : "E thjeshtë",
     "NT LAN Manager" : "Përgjegjës Rrjeti NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "Shërbyes email-esh",
+    "Open documentation" : "Hapni dokumentimin",
+    "This is used for sending out notifications." : "Ky përdoret për të dërguar njoftime.",
+    "Send mode" : "Mënyrë dërgimi",
+    "Encryption" : "Fshehtëzim",
+    "From address" : "Nga adresa",
+    "mail" : "email",
+    "Authentication method" : "Metodë mirëfilltësimi",
+    "Authentication required" : "Lypset mirëfilltësim",
+    "Server address" : "Adresë shërbyesi",
+    "Port" : "Portë",
+    "Credentials" : "Kredenciale",
+    "SMTP Username" : "Emër përdoruesi SMTP",
+    "SMTP Password" : "Fjalëkalim SMTP",
+    "Store credentials" : "Depozitoji kredencialet",
+    "Test email settings" : "Testoni rregullimet e email-it",
+    "Send email" : "Dërgo email",
+    "Server-side encryption" : "Fshehtëzim më anë shërbyesi",
+    "Enable server-side encryption" : "Aktivizo fshehtëzim më anë të shërbyesit",
+    "Please read carefully before activating server-side encryption: " : "Ju lutemi, lexoni me kujdes përpara aktivizimit të fshehtëzimeve më anë shërbyesi: ",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Pasi të jetë aktivizuar fshehtëzimi, krejt kartelat e ngarkuara te shërbyesi nga kjo pikë e tutje do të fshehtëzohen pasi të jenë depozituar në shërbyes. Çaktivizimi i fshehtëzimit në një datë të mëvonshme do të jetë i mundur vetëm nëse moduli aktiv i fshehtëzimeve e mbulon këtë funksion, dhe nëse plotësohen krejt parakushtet (p.sh. caktimi i një kyçi rimarrjesh).",
+    "Be aware that encryption always increases the file size." : "Kini parasysh që fshehtëzimi e rrit gjithnjë madhësinë e kartelës.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Është gjithmonë ide e mirë të krijohen kopjeruajtje të rregullta të të dhënave tuaja, në rast fshehtëzimi sigurohuni që bëni kopjeruajtje të kyçeve të fshehtëzimit, tok me të dhënat tuaja.",
+    "This is the final warning: Do you really want to enable encryption?" : "Ky është sinjalizimi përfundimtar: Doni vërtet të aktivizohet fshehtëzimi?",
+    "Enable encryption" : "Aktivizoni fshehtëzim",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "S’ka të ngarkuar modul fshehtëzimi, ju lutemi, aktivizoni një modul fshehtëzimi që nga menuja e aplikacionit.",
+    "Select default encryption module:" : "Përzgjidhni modul parazgjedhje fshehtëzimi:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Lypset të migroni kyçet tuaj të fshehtëzimit nga fshehtëzimi i vjetër (ownCloud <= 8.0) te i riu. Ju lutemi, aktivizoni \"Modul parazgjedhje fshehtëzimesh\" dhe ekzekutoni 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Lypset të migroni kyçet tuaj të fshehtëzimit nga fshehtëzimi i vjetër (ownCloud <= 8.0) te i riu.",
+    "Start migration" : "Fillo migrimin",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Gjithçka (probleme fatale, gabime, sinjalizime, të dhëna, diagnostikim)",
+    "Info, warnings, errors and fatal issues" : "Të dhëna, sinjalizime, gabime dhe probleme fatale",
+    "Warnings, errors and fatal issues" : "Sinjalizime, gabime dhe probleme fatale",
+    "Errors and fatal issues" : "Gabime dhe probleme fatale",
+    "Fatal issues only" : "Vetëm probleme fatale",
+    "Log" : "Regjistër",
+    "What to log" : "Ç’të regjistrohet",
+    "Download logfile" : "Shkarkoni kartelën regjistër",
+    "More" : "Më tepër",
+    "Less" : "Më pak",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Kartela regjistër është më e madhe se 100 MB. Shkarkimi i saj mund të hajë ca kohë!",
+    "Security & setup warnings" : "Sinjalizime sigurie & rregullimi",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP-ja nuk duket të jetë rregulluar si duhet për të kërkuar ndryshore mjedisi sistemi. Testi me getenv(\"PATH\") kthen vetëm një përgjigje të zbrazët.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Ju lutemi, kontrolloni <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentimin e instalimit ↗</a> për shënime rreth formësimit të php-së dhe formësimin php të shërbyesit tuaj, veçanërisht kur përdoret using php-fpm.",
     "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." : "Rregullimi Vetëm-Lexim u aktivizua. Kjo parandalon rregullimin e disa parametrave përmes ndërfaqes web. Më tej, për çdo përditësim kartela lyp të kalohet dorazi si e shkrueshme.",
@@ -142,7 +168,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "S’qe e mundur të përmbushej akti cron përmes CLI-së. U shfaqën gabimet teknike vijuese:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Ju lutemi, rihidhuni një sy <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">udhërrëfyesve të instalimit ↗</a>, dhe kontrolloni te <a href=\"#log-section\">regjistri</a> për çfarëdo gabimesh apo sinjalizimesh.",
     "All checks passed." : "I kaloi krejt kontrollet.",
-    "Open documentation" : "Hapni dokumentimin",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Përmbushja e fundit e aktit cron: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Përmbushja e fundit e aktit cron: %s. Duket se nuk shkon diçka.",
+    "Cron was not executed yet!" : "Cron-i s’qe ekzekutuar ende!",
+    "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php është regjistruar te një shërbim webcron që ta aktivizojë cron.php-në çdo 15 minuta përmes http-je.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Përdorni shërbimin cron të sistemit që ta aktivizojë cron.php-në çdo 15 minuta.",
+    "Version" : "Version",
+    "Sharing" : "Ndarje me të tjerët",
     "Allow apps to use the Share API" : "Lejoni aplikacionet të përdorin API Share",
     "Allow users to share via link" : "Lejoji përdoruesit të ndajnë me të tjerët përmes lidhjesh",
     "Allow public uploads" : "Lejo ngarkime publike",
@@ -159,44 +193,7 @@
     "Exclude groups from sharing" : "Përjashtoni grupe nga ndarjet",
     "These groups will still be able to receive shares, but not to initiate them." : "Këto grupe prapë do të jenë në gjendje të marrin ndarje nga të tjerët, por jo të fillojnë të tilla.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Lejo vetëplotësim emra përdoruesish te dialogu i ndarjeve me të tjerët. Nëse kjo është e çaktivizuar, do të duhet të jepen emra përdoruesish.",
-    "Last cron job execution: %s." : "Përmbushja e fundit e aktit cron: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Përmbushja e fundit e aktit cron: %s. Duket se nuk shkon diçka.",
-    "Cron was not executed yet!" : "Cron-i s’qe ekzekutuar ende!",
-    "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php është regjistruar te një shërbim webcron që ta aktivizojë cron.php-në çdo 15 minuta përmes http-je.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Përdorni shërbimin cron të sistemit që ta aktivizojë cron.php-në çdo 15 minuta.",
-    "Enable server-side encryption" : "Aktivizo fshehtëzim më anë të shërbyesit",
-    "Please read carefully before activating server-side encryption: " : "Ju lutemi, lexoni me kujdes përpara aktivizimit të fshehtëzimeve më anë shërbyesi: ",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Pasi të jetë aktivizuar fshehtëzimi, krejt kartelat e ngarkuara te shërbyesi nga kjo pikë e tutje do të fshehtëzohen pasi të jenë depozituar në shërbyes. Çaktivizimi i fshehtëzimit në një datë të mëvonshme do të jetë i mundur vetëm nëse moduli aktiv i fshehtëzimeve e mbulon këtë funksion, dhe nëse plotësohen krejt parakushtet (p.sh. caktimi i një kyçi rimarrjesh).",
-    "Be aware that encryption always increases the file size." : "Kini parasysh që fshehtëzimi e rrit gjithnjë madhësinë e kartelës.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Është gjithmonë ide e mirë të krijohen kopjeruajtje të rregullta të të dhënave tuaja, në rast fshehtëzimi sigurohuni që bëni kopjeruajtje të kyçeve të fshehtëzimit, tok me të dhënat tuaja.",
-    "This is the final warning: Do you really want to enable encryption?" : "Ky është sinjalizimi përfundimtar: Doni vërtet të aktivizohet fshehtëzimi?",
-    "Enable encryption" : "Aktivizoni fshehtëzim",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "S’ka të ngarkuar modul fshehtëzimi, ju lutemi, aktivizoni një modul fshehtëzimi që nga menuja e aplikacionit.",
-    "Select default encryption module:" : "Përzgjidhni modul parazgjedhje fshehtëzimi:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Lypset të migroni kyçet tuaj të fshehtëzimit nga fshehtëzimi i vjetër (ownCloud <= 8.0) te i riu. Ju lutemi, aktivizoni \"Modul parazgjedhje fshehtëzimesh\" dhe ekzekutoni 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Lypset të migroni kyçet tuaj të fshehtëzimit nga fshehtëzimi i vjetër (ownCloud <= 8.0) te i riu.",
-    "Start migration" : "Fillo migrimin",
-    "This is used for sending out notifications." : "Ky përdoret për të dërguar njoftime.",
-    "Send mode" : "Mënyrë dërgimi",
-    "Encryption" : "Fshehtëzim",
-    "From address" : "Nga adresa",
-    "mail" : "email",
-    "Authentication method" : "Metodë mirëfilltësimi",
-    "Authentication required" : "Lypset mirëfilltësim",
-    "Server address" : "Adresë shërbyesi",
-    "Port" : "Portë",
-    "Credentials" : "Kredenciale",
-    "SMTP Username" : "Emër përdoruesi SMTP",
-    "SMTP Password" : "Fjalëkalim SMTP",
-    "Store credentials" : "Depozitoji kredencialet",
-    "Test email settings" : "Testoni rregullimet e email-it",
-    "Send email" : "Dërgo email",
-    "What to log" : "Ç’të regjistrohet",
-    "Download logfile" : "Shkarkoni kartelën regjistër",
-    "More" : "Më tepër",
-    "Less" : "Më pak",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Kartela regjistër është më e madhe se 100 MB. Shkarkimi i saj mund të hajë ca kohë!",
+    "Tips & tricks" : "Ndihmëza & rrengje",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Si bazë të dhënash përdoret SQLite. Për instalime më të ngarkuara, këshillojmë të kalohet në një program tjetër baze të dhënash.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Përdorimi i SQLite-it nuk këshillohet veçanërisht kur përdoret klienti desktop për njëkohësim kartelash.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Për të kaluar te një tjetër bazë të dhënash përdorni mjetin rresht urdhrash: 'occ db:convert-type', ose shihni <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentimin ↗</a>.",
@@ -206,7 +203,6 @@
     "Improving the config.php" : "Si të përmirësohet config.php",
     "Theming" : "Ndryshim teme grafike",
     "Hardening and security guidance" : "Udhëzime për forcim dhe siguri",
-    "Version" : "Version",
     "Developer documentation" : "Dokumentim për zhvillues",
     "Experimental applications ahead" : "Keni përpara aplikacione eksperimentale",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplikacionet eksperimentale nuk kontrollohen për probleme sigurie, mund të jenë të rinj ose të njohur si të paqëndrueshëm, dhe nën zhvillim intensiv. Instalimi i tyre mund të shkaktojë humbje të dhënash ose cenim të sigurisë.",
@@ -260,16 +256,16 @@
     "Change password" : "Ndrysho fjalëkalimin",
     "Language" : "Gjuhë",
     "Help translate" : "Ndihmoni në përkthim",
-    "Name" : "Emër",
-    "App name" : "Emër aplikacioni",
-    "Create new app password" : "Krijoni fjalëkalim aplikacioni të ri",
-    "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",
     "Android app" : "Aplikacion për Android",
     "iOS app" : "Aplikacion për iOS",
     "Show First Run Wizard again" : "Shfaqe sërish Ndihmësin e Herës së Parë",
+    "Name" : "Emër",
+    "App name" : "Emër aplikacioni",
+    "Create new app password" : "Krijoni fjalëkalim aplikacioni të ri",
+    "Username" : "Emër përdoruesi",
+    "Done" : "U bë",
     "Show storage location" : "Shfaq vendndodhje depozite",
     "Show last log in" : "Shfaq hyrjen e fundit",
     "Show user backend" : "Shfaq programin klient të përdoruesit",
@@ -288,6 +284,10 @@
     "change full name" : "ndryshoni emrin e plotë",
     "set new password" : "caktoni fjalëkalim të ri",
     "change email address" : "ndryshoni adresën email",
-    "Default" : "Parazgjedhje"
+    "Default" : "Parazgjedhje",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Depozitim i Jashtëm",
+    "Updates" : "Përditësime"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index cdde7e7e6e7..767fe96eebf 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "E-post sparad",
     "Your full name has been changed." : "Hela ditt namn har ändrats",
     "Unable to change full name" : "Kunde inte ändra hela namnet",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Säkerhet & systemvarningar",
-    "Sharing" : "Dela",
-    "Server-side encryption" : "Serverkryptering",
-    "External Storage" : "Extern lagring",
-    "Cron" : "Cron",
-    "Email server" : "E-post server",
-    "Log" : "Logg",
-    "Tips & tricks" : "Tips & tricks",
-    "Updates" : "Uppdateringar",
     "Couldn't remove app." : "Kunde inte ta bort applikationen.",
     "Language changed" : "Språk ändrades",
     "Invalid request" : "Ogiltig begäran",
@@ -117,17 +106,54 @@ OC.L10N.register(
     "Personal info" : "Personlig information",
     "Sessions" : "Sessioner",
     "Sync clients" : "Synk-klienter",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
-    "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
-    "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
-    "Errors and fatal issues" : "Fel och allvarliga fel",
-    "Fatal issues only" : "Endast allvarliga fel",
     "None" : "Ingen",
     "Login" : "Logga in",
     "Plain" : "Enkel",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-post server",
+    "Open documentation" : "Öppna dokumentation",
+    "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
+    "Send mode" : "Sändningsläge",
+    "Encryption" : "Kryptering",
+    "From address" : "Från adress",
+    "mail" : "mail",
+    "Authentication method" : "Autentiseringsmetod",
+    "Authentication required" : "Autentisering krävs",
+    "Server address" : "Serveradress",
+    "Port" : "Port",
+    "Credentials" : "Inloggningsuppgifter",
+    "SMTP Username" : "SMTP-användarnamn",
+    "SMTP Password" : "SMTP-lösenord",
+    "Store credentials" : "Lagra inloggningsuppgifter",
+    "Test email settings" : "Testa e-postinställningar",
+    "Send email" : "Skicka e-post",
+    "Server-side encryption" : "Serverkryptering",
+    "Enable server-side encryption" : "Aktivera kryptering på server.",
+    "Please read carefully before activating server-side encryption: " : "OBS: Var god läs noga innan kryptering aktiveras på servern.",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "När kryptering är aktiverat, så kommer alla filer som laddas upp till servern från den tidpunkt och frammåt bli krypterad på servern. Det kommer bara vara möjligt att inaktivera kryptering vid ett senare tillfälle om krypteringsmodulen stödjer den funktionen och alla förvillkor (exempelvis använder återställningsnyckel) är mötta.",
+    "Be aware that encryption always increases the file size." : "OBS! Observera att kryptering alltid ökar filstorleken",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det är alltid en god ide att skapa regelbundna säkerhetskopior av din data, om kryptering används var säker på att även krypteringsnycklarna säkerhetskopieras tillsammans med din data.",
+    "This is the final warning: Do you really want to enable encryption?" : "Detta är en slutgiltig varning: Vill du verkligen aktivera kryptering?",
+    "Enable encryption" : "Aktivera kryptering",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul laddad, var god aktivera krypteringsmodulen i applikationsmenyn.",
+    "Select default encryption module:" : "Välj standard krypteringsmodul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya. Var god aktivera \"Default encryption module\" och kör 'occ encryption:migrate'.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya.",
+    "Start migration" : "Starta migrering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
+    "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
+    "Errors and fatal issues" : "Fel och allvarliga fel",
+    "Fatal issues only" : "Endast allvarliga fel",
+    "Log" : "Logg",
+    "What to log" : "Vad som ska loggas",
+    "Download logfile" : "Ladda ner loggfil",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen är större än 100 MB. Nerladdningen kan ta en stund!",
+    "Security & setup warnings" : "Säkerhet & systemvarningar",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php verkar ej vara konfigurerat för att kunna skicka förfrågan om systemmiljövariabler. Testet med getenv(\"PATH\") returnerade bara ett tomt svar.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Var god kontrollera <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> installationsdokumentationen ↗</a> för konfigurationsanteckningar för php och för php konfigurationen för din server, speciellt när php-fpm används.",
     "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." : "Läs-bara konfigureringen har blivit aktiv. Detta förhindrar att några konfigureringar kan sättas via web-gränssnittet.",
@@ -143,7 +169,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ej möjligt att exekvera cronjob via CLI. Följande tekniska fel har uppstått:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Var god dubbelkontrollera <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> installationsguiden ↗</a>, och kontrollera efter några fel eller varningar i <a href=\"#log-section\"> logfilen</a>.",
     "All checks passed." : "Alla kontroller lyckades!",
-    "Open documentation" : "Öppna dokumentation",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Sista cron kördes %s",
+    "Last cron job execution: %s. Something seems wrong." : "Sista cron kördes %s. Något verkar vara fel.",
+    "Cron was not executed yet!" : "Cron har inte körts ännu!",
+    "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Använd systemets cron-tjänst för att anropa cron.php var 15:e minut.",
+    "Version" : "Version",
+    "Sharing" : "Dela",
     "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API",
     "Allow users to share via link" : "Tillåt användare att dela via länk",
     "Allow public uploads" : "Tillåt offentlig uppladdning",
@@ -160,44 +194,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Exkludera grupp från att dela",
     "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Tillåt användarnamn att autokompletteras i delningsfönstret. Om det är inaktiverat krävs fullständigt användarnamn i rutan.",
-    "Last cron job execution: %s." : "Sista cron kördes %s",
-    "Last cron job execution: %s. Something seems wrong." : "Sista cron kördes %s. Något verkar vara fel.",
-    "Cron was not executed yet!" : "Cron har inte körts ännu!",
-    "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Använd systemets cron-tjänst för att anropa cron.php var 15:e minut.",
-    "Enable server-side encryption" : "Aktivera kryptering på server.",
-    "Please read carefully before activating server-side encryption: " : "OBS: Var god läs noga innan kryptering aktiveras på servern.",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "När kryptering är aktiverat, så kommer alla filer som laddas upp till servern från den tidpunkt och frammåt bli krypterad på servern. Det kommer bara vara möjligt att inaktivera kryptering vid ett senare tillfälle om krypteringsmodulen stödjer den funktionen och alla förvillkor (exempelvis använder återställningsnyckel) är mötta.",
-    "Be aware that encryption always increases the file size." : "OBS! Observera att kryptering alltid ökar filstorleken",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det är alltid en god ide att skapa regelbundna säkerhetskopior av din data, om kryptering används var säker på att även krypteringsnycklarna säkerhetskopieras tillsammans med din data.",
-    "This is the final warning: Do you really want to enable encryption?" : "Detta är en slutgiltig varning: Vill du verkligen aktivera kryptering?",
-    "Enable encryption" : "Aktivera kryptering",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul laddad, var god aktivera krypteringsmodulen i applikationsmenyn.",
-    "Select default encryption module:" : "Välj standard krypteringsmodul:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya. Var god aktivera \"Default encryption module\" och kör 'occ encryption:migrate'.",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya.",
-    "Start migration" : "Starta migrering",
-    "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
-    "Send mode" : "Sändningsläge",
-    "Encryption" : "Kryptering",
-    "From address" : "Från adress",
-    "mail" : "mail",
-    "Authentication method" : "Autentiseringsmetod",
-    "Authentication required" : "Autentisering krävs",
-    "Server address" : "Serveradress",
-    "Port" : "Port",
-    "Credentials" : "Inloggningsuppgifter",
-    "SMTP Username" : "SMTP-användarnamn",
-    "SMTP Password" : "SMTP-lösenord",
-    "Store credentials" : "Lagra inloggningsuppgifter",
-    "Test email settings" : "Testa e-postinställningar",
-    "Send email" : "Skicka e-post",
-    "What to log" : "Vad som ska loggas",
-    "Download logfile" : "Ladda ner loggfil",
-    "More" : "Mer",
-    "Less" : "Mindre",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen är större än 100 MB. Nerladdningen kan ta en stund!",
+    "Tips & tricks" : "Tips & tricks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite används som databas. För större installationer så rekommenderar vi ett byte till en annan databasmotor.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när desktop klienten för filsynkronisering används så avråds användande av SQLite.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "För att migrera till en annan databas använd kommandoverktyget 'occ db:convert-type' eller se <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> dokumentationen ↗</a>",
@@ -207,7 +204,6 @@ OC.L10N.register(
     "Improving the config.php" : "Förbättra config.php",
     "Theming" : "Teman",
     "Hardening and security guidance" : "Säkerhetsriktlinjer",
-    "Version" : "Version",
     "Developer documentation" : "Utvecklar dokumentation",
     "Experimental applications ahead" : "Experimentiella applikationer framför",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentella applikationer är ej kontrollerade för säkerhetsproblem, nya eller kända att vara instabila och under föränderlig utveckling. Installation utav dessa kan orsaka dataförlust eller säkerhetsbrott.",
@@ -261,14 +257,14 @@ OC.L10N.register(
     "Change password" : "Ändra lösenord",
     "Language" : "Språk",
     "Help translate" : "Hjälp att översätta",
-    "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",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
     "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen",
+    "Name" : "Namn",
+    "Username" : "Användarnamn",
+    "Done" : "Färdig",
     "Show storage location" : "Visa lagringsplats",
     "Show last log in" : "Visa senaste inloggning",
     "Show user backend" : "Visa användar-backend",
@@ -287,6 +283,10 @@ OC.L10N.register(
     "change full name" : "ändra hela namnet",
     "set new password" : "ange nytt lösenord",
     "change email address" : "ändra e-postadress",
-    "Default" : "Förvald"
+    "Default" : "Förvald",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Extern lagring",
+    "Updates" : "Uppdateringar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index 6f77c010307..df7cda217e3 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -33,17 +33,6 @@
     "Email saved" : "E-post sparad",
     "Your full name has been changed." : "Hela ditt namn har ändrats",
     "Unable to change full name" : "Kunde inte ändra hela namnet",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Säkerhet & systemvarningar",
-    "Sharing" : "Dela",
-    "Server-side encryption" : "Serverkryptering",
-    "External Storage" : "Extern lagring",
-    "Cron" : "Cron",
-    "Email server" : "E-post server",
-    "Log" : "Logg",
-    "Tips & tricks" : "Tips & tricks",
-    "Updates" : "Uppdateringar",
     "Couldn't remove app." : "Kunde inte ta bort applikationen.",
     "Language changed" : "Språk ändrades",
     "Invalid request" : "Ogiltig begäran",
@@ -115,17 +104,54 @@
     "Personal info" : "Personlig information",
     "Sessions" : "Sessioner",
     "Sync clients" : "Synk-klienter",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
-    "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
-    "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
-    "Errors and fatal issues" : "Fel och allvarliga fel",
-    "Fatal issues only" : "Endast allvarliga fel",
     "None" : "Ingen",
     "Login" : "Logga in",
     "Plain" : "Enkel",
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-post server",
+    "Open documentation" : "Öppna dokumentation",
+    "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
+    "Send mode" : "Sändningsläge",
+    "Encryption" : "Kryptering",
+    "From address" : "Från adress",
+    "mail" : "mail",
+    "Authentication method" : "Autentiseringsmetod",
+    "Authentication required" : "Autentisering krävs",
+    "Server address" : "Serveradress",
+    "Port" : "Port",
+    "Credentials" : "Inloggningsuppgifter",
+    "SMTP Username" : "SMTP-användarnamn",
+    "SMTP Password" : "SMTP-lösenord",
+    "Store credentials" : "Lagra inloggningsuppgifter",
+    "Test email settings" : "Testa e-postinställningar",
+    "Send email" : "Skicka e-post",
+    "Server-side encryption" : "Serverkryptering",
+    "Enable server-side encryption" : "Aktivera kryptering på server.",
+    "Please read carefully before activating server-side encryption: " : "OBS: Var god läs noga innan kryptering aktiveras på servern.",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "När kryptering är aktiverat, så kommer alla filer som laddas upp till servern från den tidpunkt och frammåt bli krypterad på servern. Det kommer bara vara möjligt att inaktivera kryptering vid ett senare tillfälle om krypteringsmodulen stödjer den funktionen och alla förvillkor (exempelvis använder återställningsnyckel) är mötta.",
+    "Be aware that encryption always increases the file size." : "OBS! Observera att kryptering alltid ökar filstorleken",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det är alltid en god ide att skapa regelbundna säkerhetskopior av din data, om kryptering används var säker på att även krypteringsnycklarna säkerhetskopieras tillsammans med din data.",
+    "This is the final warning: Do you really want to enable encryption?" : "Detta är en slutgiltig varning: Vill du verkligen aktivera kryptering?",
+    "Enable encryption" : "Aktivera kryptering",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul laddad, var god aktivera krypteringsmodulen i applikationsmenyn.",
+    "Select default encryption module:" : "Välj standard krypteringsmodul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya. Var god aktivera \"Default encryption module\" och kör 'occ encryption:migrate'.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya.",
+    "Start migration" : "Starta migrering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
+    "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
+    "Errors and fatal issues" : "Fel och allvarliga fel",
+    "Fatal issues only" : "Endast allvarliga fel",
+    "Log" : "Logg",
+    "What to log" : "Vad som ska loggas",
+    "Download logfile" : "Ladda ner loggfil",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen är större än 100 MB. Nerladdningen kan ta en stund!",
+    "Security & setup warnings" : "Säkerhet & systemvarningar",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php verkar ej vara konfigurerat för att kunna skicka förfrågan om systemmiljövariabler. Testet med getenv(\"PATH\") returnerade bara ett tomt svar.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Var god kontrollera <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> installationsdokumentationen ↗</a> för konfigurationsanteckningar för php och för php konfigurationen för din server, speciellt när php-fpm används.",
     "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." : "Läs-bara konfigureringen har blivit aktiv. Detta förhindrar att några konfigureringar kan sättas via web-gränssnittet.",
@@ -141,7 +167,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ej möjligt att exekvera cronjob via CLI. Följande tekniska fel har uppstått:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Var god dubbelkontrollera <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> installationsguiden ↗</a>, och kontrollera efter några fel eller varningar i <a href=\"#log-section\"> logfilen</a>.",
     "All checks passed." : "Alla kontroller lyckades!",
-    "Open documentation" : "Öppna dokumentation",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Sista cron kördes %s",
+    "Last cron job execution: %s. Something seems wrong." : "Sista cron kördes %s. Något verkar vara fel.",
+    "Cron was not executed yet!" : "Cron har inte körts ännu!",
+    "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Använd systemets cron-tjänst för att anropa cron.php var 15:e minut.",
+    "Version" : "Version",
+    "Sharing" : "Dela",
     "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API",
     "Allow users to share via link" : "Tillåt användare att dela via länk",
     "Allow public uploads" : "Tillåt offentlig uppladdning",
@@ -158,44 +192,7 @@
     "Exclude groups from sharing" : "Exkludera grupp från att dela",
     "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Tillåt användarnamn att autokompletteras i delningsfönstret. Om det är inaktiverat krävs fullständigt användarnamn i rutan.",
-    "Last cron job execution: %s." : "Sista cron kördes %s",
-    "Last cron job execution: %s. Something seems wrong." : "Sista cron kördes %s. Något verkar vara fel.",
-    "Cron was not executed yet!" : "Cron har inte körts ännu!",
-    "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Använd systemets cron-tjänst för att anropa cron.php var 15:e minut.",
-    "Enable server-side encryption" : "Aktivera kryptering på server.",
-    "Please read carefully before activating server-side encryption: " : "OBS: Var god läs noga innan kryptering aktiveras på servern.",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "När kryptering är aktiverat, så kommer alla filer som laddas upp till servern från den tidpunkt och frammåt bli krypterad på servern. Det kommer bara vara möjligt att inaktivera kryptering vid ett senare tillfälle om krypteringsmodulen stödjer den funktionen och alla förvillkor (exempelvis använder återställningsnyckel) är mötta.",
-    "Be aware that encryption always increases the file size." : "OBS! Observera att kryptering alltid ökar filstorleken",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det är alltid en god ide att skapa regelbundna säkerhetskopior av din data, om kryptering används var säker på att även krypteringsnycklarna säkerhetskopieras tillsammans med din data.",
-    "This is the final warning: Do you really want to enable encryption?" : "Detta är en slutgiltig varning: Vill du verkligen aktivera kryptering?",
-    "Enable encryption" : "Aktivera kryptering",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul laddad, var god aktivera krypteringsmodulen i applikationsmenyn.",
-    "Select default encryption module:" : "Välj standard krypteringsmodul:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya. Var god aktivera \"Default encryption module\" och kör 'occ encryption:migrate'.",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya.",
-    "Start migration" : "Starta migrering",
-    "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
-    "Send mode" : "Sändningsläge",
-    "Encryption" : "Kryptering",
-    "From address" : "Från adress",
-    "mail" : "mail",
-    "Authentication method" : "Autentiseringsmetod",
-    "Authentication required" : "Autentisering krävs",
-    "Server address" : "Serveradress",
-    "Port" : "Port",
-    "Credentials" : "Inloggningsuppgifter",
-    "SMTP Username" : "SMTP-användarnamn",
-    "SMTP Password" : "SMTP-lösenord",
-    "Store credentials" : "Lagra inloggningsuppgifter",
-    "Test email settings" : "Testa e-postinställningar",
-    "Send email" : "Skicka e-post",
-    "What to log" : "Vad som ska loggas",
-    "Download logfile" : "Ladda ner loggfil",
-    "More" : "Mer",
-    "Less" : "Mindre",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen är större än 100 MB. Nerladdningen kan ta en stund!",
+    "Tips & tricks" : "Tips & tricks",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite används som databas. För större installationer så rekommenderar vi ett byte till en annan databasmotor.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när desktop klienten för filsynkronisering används så avråds användande av SQLite.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "För att migrera till en annan databas använd kommandoverktyget 'occ db:convert-type' eller se <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> dokumentationen ↗</a>",
@@ -205,7 +202,6 @@
     "Improving the config.php" : "Förbättra config.php",
     "Theming" : "Teman",
     "Hardening and security guidance" : "Säkerhetsriktlinjer",
-    "Version" : "Version",
     "Developer documentation" : "Utvecklar dokumentation",
     "Experimental applications ahead" : "Experimentiella applikationer framför",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentella applikationer är ej kontrollerade för säkerhetsproblem, nya eller kända att vara instabila och under föränderlig utveckling. Installation utav dessa kan orsaka dataförlust eller säkerhetsbrott.",
@@ -259,14 +255,14 @@
     "Change password" : "Ändra lösenord",
     "Language" : "Språk",
     "Help translate" : "Hjälp att översätta",
-    "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",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
     "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen",
+    "Name" : "Namn",
+    "Username" : "Användarnamn",
+    "Done" : "Färdig",
     "Show storage location" : "Visa lagringsplats",
     "Show last log in" : "Visa senaste inloggning",
     "Show user backend" : "Visa användar-backend",
@@ -285,6 +281,10 @@
     "change full name" : "ändra hela namnet",
     "set new password" : "ange nytt lösenord",
     "change email address" : "ändra e-postadress",
-    "Default" : "Förvald"
+    "Default" : "Förvald",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Extern lagring",
+    "Updates" : "Uppdateringar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index fdbe3d7015e..41f545c4517 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "อีเมลถูกบันทึกแล้ว",
     "Your full name has been changed." : "ชื่อเต็มของคุณถูกเปลี่ยนแปลง",
     "Unable to change full name" : "ไม่สามารถเปลี่ยนชื่อเต็ม",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "คำเตือนความปลอดภัยและการติดตั้ง",
-    "Sharing" : "แชร์ข้อมูล",
-    "Server-side encryption" : "เข้ารหัสฝั่งเซิร์ฟเวอร์",
-    "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
-    "Cron" : "Cron",
-    "Email server" : "อีเมลเซิร์ฟเวอร์",
-    "Log" : "บันทึกการเปลี่ยนแปลง",
-    "Tips & tricks" : "เคล็ดลับและเทคนิค",
-    "Updates" : "อัพเดท",
     "Couldn't remove app." : "ไม่สามารถลบแอพฯ",
     "Language changed" : "เปลี่ยนภาษาเรียบร้อยแล้ว",
     "Invalid request" : "คำร้องขอไม่ถูกต้อง",
@@ -112,17 +101,54 @@ OC.L10N.register(
     "Unlimited" : "ไม่จำกัด",
     "Personal info" : "ข้อมูลส่วนบุคคล",
     "Sync clients" : "ประสานข้อมูลไคลเอนต์",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "ทุกอย่าง (ปัญหาร้ายแรง ข้อผิดพลาด คำเตือน ข้อมูล การแก้ปัญหา)",
-    "Info, warnings, errors and fatal issues" : "ข้อมูล คำเตือน ข้อผิดพลาดและปัญหาร้ายแรง",
-    "Warnings, errors and fatal issues" : "คำเตือนข้อผิดพลาดและปัญหาที่ร้ายแรง",
-    "Errors and fatal issues" : "ข้อผิดพลาดและปัญหาที่ร้ายแรง",
-    "Fatal issues only" : "ปัญหาร้ายแรงเท่านั้น",
     "None" : "ไม่มี",
     "Login" : "เข้าสู่ระบบ",
     "Plain" : "ธรรมดา",
     "NT LAN Manager" : "ตัวจัดการ NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "อีเมลเซิร์ฟเวอร์",
+    "Open documentation" : "เปิดเอกสาร",
+    "This is used for sending out notifications." : "นี้จะใช้สำหรับการส่งออกการแจ้งเตือน",
+    "Send mode" : "โหมดการส่ง",
+    "Encryption" : "การเข้ารหัส",
+    "From address" : "จากที่อยู่",
+    "mail" : "อีเมล",
+    "Authentication method" : "วิธีการตรวจสอบ",
+    "Authentication required" : "จำเป็นต้องตรวจสอบความถูกต้อง",
+    "Server address" : "ที่อยู่เซิร์ฟเวอร์",
+    "Port" : "พอร์ต",
+    "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
+    "SMTP Username" : "ชื่อผู้ใช้ SMTP",
+    "SMTP Password" : "รหัสผ่าน SMTP",
+    "Store credentials" : "ข้อมูลประจำตัวของร้านค้า",
+    "Test email settings" : "ทดสอบการตั้งค่าอีเมล",
+    "Send email" : "ส่งอีเมล",
+    "Server-side encryption" : "เข้ารหัสฝั่งเซิร์ฟเวอร์",
+    "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
+    "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "เมื่อเปิดใช้งานการเข้ารหัส ไฟล์ทั้งหมดที่อัพโหลดไปยังเซิร์ฟเวอร์นั้นจะถูกเข้ารหัสในส่วนของเซิฟเวอร์ มันเป็นไปได้ที่จะปิดใช้งานการเข้ารหัสในภายหลัง ถ้าเปิดใช้ฟังก์ชั่นการสนับสนุนโมดูลการเข้ารหัสที่และเงื่อนไขก่อน (เช่น การตั้งค่าคีย์กู้คืน)",
+    "Be aware that encryption always increases the file size." : "โปรดทราบว่าหากเข้ารหัสไฟล์จะทำให้ขนาดของไฟล์ใหญ่ขึ้น",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "มันจะดีถ้าคุณสำรองข้อมูลบ่อยๆ ในกรณีของการเข้ารหัสโปรดแน่ใจว่าจะสำรองคีย์การเข้ารหัสลับพร้อมกับข้อมูลของคุณ",
+    "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
+    "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
+    "Select default encryption module:" : "เลือกค่าเริ่มต้นโมดูลการเข้ารหัส:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "คุณจำเป็นต้องโอนย้ายคีย์การเข้ารหัสลับของคุณจากการเข้ารหัสเก่า (ownCloud <= 8.0) ไปใหม่ กรุณาเปิดใช้งาน \"โมดูลการเข้ารหัสเริ่มต้น\" และเรียกใช้ 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "คุณจำเป็นต้องโอนย้ายคีย์การเข้ารหัสลับของคุณจากการเข้ารหัสเก่า (ownCloud <= 8.0) ไปใหม่",
+    "Start migration" : "เริ่มการโยกย้าย",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "ทุกอย่าง (ปัญหาร้ายแรง ข้อผิดพลาด คำเตือน ข้อมูล การแก้ปัญหา)",
+    "Info, warnings, errors and fatal issues" : "ข้อมูล คำเตือน ข้อผิดพลาดและปัญหาร้ายแรง",
+    "Warnings, errors and fatal issues" : "คำเตือนข้อผิดพลาดและปัญหาที่ร้ายแรง",
+    "Errors and fatal issues" : "ข้อผิดพลาดและปัญหาที่ร้ายแรง",
+    "Fatal issues only" : "ปัญหาร้ายแรงเท่านั้น",
+    "Log" : "บันทึกการเปลี่ยนแปลง",
+    "What to log" : "อะไรที่จะบันทึก",
+    "Download logfile" : "ดาวน์โหลดไฟล์บันทึก",
+    "More" : "มาก",
+    "Less" : "ย่อ",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ไฟล์บันทึกมีขนาดใหญ่กว่า 100 เมกะไบต์ มันอาจจะใช้เวลาดาวน์โหลดนาน!",
+    "Security & setup warnings" : "คำเตือนความปลอดภัยและการติดตั้ง",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ไม่ได้ติดตั้งphp อย่างถูกต้องค้นหาตัวแปรสภาพแวดล้อมของระบบการทดสอบกับ getenv(\"PATH\") ส่งกลับเฉพาะการตอบสนองที่ว่างเปล่า",
     "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." : "ตั้งค่าให้สามารถอ่านได้อย่างเดียวถูกเปิดใช้งาน นี้จะช่วยป้องกันการตั้งค่าผ่านทางบางเว็บอินเตอร์เฟซ นอกจากนี้จะต้องเขียนไฟล์ด้วยตนเองสำหรับทุกการอัพเดท",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "เห็นได้ชัดว่าการตั้งค่า PHP จะตัดบล็อคเอกสารแบบอินไลน์ ซึ่งจะทำให้แอพพลิเคชันอีกหลายแกนไม่สามารถเข้าถึงได้",
@@ -135,7 +161,15 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "หากการติดตั้งของคุณไม่ได้ติดตั้งในรากของโดเมนและใช้ระบบ cron อาจมีปัญหาเกี่ยวกับการสร้าง URL เพื่อหลีกเลี่ยงปัญหาเหล่านี้โปรดไปตั้งค่า \"overwrite.cli.url\" ในไฟล์ config.php ของคุณไปยังเส้นทาง webroot ของการติดตั้งของคุณ (แนะนำ: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "มันเป็นไปไม่ได้ที่จะดำเนินการ cronjob ผ่านทาง CLI ข้อผิดพลาดทางเทคนิคต่อไปนี้จะปรากฏ:",
     "All checks passed." : "ผ่านการตรวจสอบทั้งหมด",
-    "Open documentation" : "เปิดเอกสาร",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "การดำเนินการ cron job ล่าสุด: %s",
+    "Last cron job execution: %s. Something seems wrong." : "การดำเนินการ cron job ล่าสุด: %s ดูเหมือนมีบางสิ่งไม่ถูกต้อง",
+    "Cron was not executed yet!" : "Cron ไม่ได้ถูกดำเนินการ!",
+    "Execute one task with each page loaded" : "ประมวลผลหนึ่งงาน ในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ได้ถูกลงทะเบียนที่บริการ Webcron เพื่อเรียก cron.php ทุกๆ 15 นาที บน Http",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "ใช้ระบบบริการ cron เพื่อเรียกไฟล์ cron.php ทุก 15 นาที",
+    "Version" : "รุ่น",
+    "Sharing" : "แชร์ข้อมูล",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow users to share via link" : "อนุญาตให้ผู้ใช้สามารถแชร์ผ่านทางลิงค์",
     "Allow public uploads" : "อนุญาตให้อัพโหลดสาธารณะ",
@@ -152,44 +186,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "ไม่รวมกลุ่มที่กำลังแชร์",
     "These groups will still be able to receive shares, but not to initiate them." : "กลุ่มนี้จะยังคงสามารถได้รับการแชร์ แต่พวกเขาจะไม่รู้จักมัน",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "อนุญาตให้เติมข้อความชื่อผู้ใช้อัตโนมัติในกล่องข้อความแชร์  ถ้านี้ถูกปิดใช้งานจะต้องกรอกชื่อผู้ใช้เอง",
-    "Last cron job execution: %s." : "การดำเนินการ cron job ล่าสุด: %s",
-    "Last cron job execution: %s. Something seems wrong." : "การดำเนินการ cron job ล่าสุด: %s ดูเหมือนมีบางสิ่งไม่ถูกต้อง",
-    "Cron was not executed yet!" : "Cron ไม่ได้ถูกดำเนินการ!",
-    "Execute one task with each page loaded" : "ประมวลผลหนึ่งงาน ในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ได้ถูกลงทะเบียนที่บริการ Webcron เพื่อเรียก cron.php ทุกๆ 15 นาที บน Http",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "ใช้ระบบบริการ cron เพื่อเรียกไฟล์ cron.php ทุก 15 นาที",
-    "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
-    "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "เมื่อเปิดใช้งานการเข้ารหัส ไฟล์ทั้งหมดที่อัพโหลดไปยังเซิร์ฟเวอร์นั้นจะถูกเข้ารหัสในส่วนของเซิฟเวอร์ มันเป็นไปได้ที่จะปิดใช้งานการเข้ารหัสในภายหลัง ถ้าเปิดใช้ฟังก์ชั่นการสนับสนุนโมดูลการเข้ารหัสที่และเงื่อนไขก่อน (เช่น การตั้งค่าคีย์กู้คืน)",
-    "Be aware that encryption always increases the file size." : "โปรดทราบว่าหากเข้ารหัสไฟล์จะทำให้ขนาดของไฟล์ใหญ่ขึ้น",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "มันจะดีถ้าคุณสำรองข้อมูลบ่อยๆ ในกรณีของการเข้ารหัสโปรดแน่ใจว่าจะสำรองคีย์การเข้ารหัสลับพร้อมกับข้อมูลของคุณ",
-    "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
-    "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
-    "Select default encryption module:" : "เลือกค่าเริ่มต้นโมดูลการเข้ารหัส:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "คุณจำเป็นต้องโอนย้ายคีย์การเข้ารหัสลับของคุณจากการเข้ารหัสเก่า (ownCloud <= 8.0) ไปใหม่ กรุณาเปิดใช้งาน \"โมดูลการเข้ารหัสเริ่มต้น\" และเรียกใช้ 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "คุณจำเป็นต้องโอนย้ายคีย์การเข้ารหัสลับของคุณจากการเข้ารหัสเก่า (ownCloud <= 8.0) ไปใหม่",
-    "Start migration" : "เริ่มการโยกย้าย",
-    "This is used for sending out notifications." : "นี้จะใช้สำหรับการส่งออกการแจ้งเตือน",
-    "Send mode" : "โหมดการส่ง",
-    "Encryption" : "การเข้ารหัส",
-    "From address" : "จากที่อยู่",
-    "mail" : "อีเมล",
-    "Authentication method" : "วิธีการตรวจสอบ",
-    "Authentication required" : "จำเป็นต้องตรวจสอบความถูกต้อง",
-    "Server address" : "ที่อยู่เซิร์ฟเวอร์",
-    "Port" : "พอร์ต",
-    "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
-    "SMTP Username" : "ชื่อผู้ใช้ SMTP",
-    "SMTP Password" : "รหัสผ่าน SMTP",
-    "Store credentials" : "ข้อมูลประจำตัวของร้านค้า",
-    "Test email settings" : "ทดสอบการตั้งค่าอีเมล",
-    "Send email" : "ส่งอีเมล",
-    "What to log" : "อะไรที่จะบันทึก",
-    "Download logfile" : "ดาวน์โหลดไฟล์บันทึก",
-    "More" : "มาก",
-    "Less" : "ย่อ",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ไฟล์บันทึกมีขนาดใหญ่กว่า 100 เมกะไบต์ มันอาจจะใช้เวลาดาวน์โหลดนาน!",
+    "Tips & tricks" : "เคล็ดลับและเทคนิค",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "จะใช้ SQLite เป็นฐานข้อมูล สำหรับการติดตั้งขนาดใหญ่เราขอแนะนำเพื่อสลับไปยังฐานข้อมูลแบ็กเอนด์ที่แตกต่างกัน",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการประสานข้อมูลโดย SQLite",
     "How to do backups" : "วิธีการสำรองข้อมูล",
@@ -198,7 +195,6 @@ OC.L10N.register(
     "Improving the config.php" : "ปรับปรุงไฟล์ config.php",
     "Theming" : "ชุดรูปแบบ",
     "Hardening and security guidance" : "คำแนะนำการรักษาความปลอดภัย",
-    "Version" : "รุ่น",
     "Developer documentation" : "เอกสารสำหรับนักพัฒนา",
     "Experimental applications ahead" : "การใช้งานก่อนการทดลอง",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "การทดลองแอพพลิเคชันไม่ได้ถูกตรวจสอบปัญหาด้านความปลอดภัย การติดตั้งพวกเขาสามารถก่อให้เกิดการสูญเสียข้อมูลหรือการละเมิดความปลอดภัย",
@@ -249,14 +245,14 @@ OC.L10N.register(
     "Change password" : "เปลี่ยนรหัสผ่าน",
     "Language" : "ภาษา",
     "Help translate" : "มาช่วยกันแปลสิ!",
-    "Name" : "ชื่อ",
-    "Username" : "ชื่อผู้ใช้งาน",
-    "Done" : "เสร็จสิ้น",
     "Get the apps to sync your files" : "ใช้แอพพลิเคชันในการประสานไฟล์ของคุณ",
     "Desktop client" : "เดสก์ทอปผู้ใช้",
     "Android app" : "แอพฯ แอนดรอยด์",
     "iOS app" : "แอพฯ IOS",
     "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
+    "Name" : "ชื่อ",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Done" : "เสร็จสิ้น",
     "Show storage location" : "แสดงสถานที่จัดเก็บข้อมูล",
     "Show last log in" : "แสดงการเข้าสู่ระบบล่าสุด",
     "Show user backend" : "แสดงแบ็กเอนด์ของผู้ใช้",
@@ -275,6 +271,10 @@ OC.L10N.register(
     "change full name" : "เปลี่ยนชื่อเต็ม",
     "set new password" : "ตั้งค่ารหัสผ่านใหม่",
     "change email address" : "เปลี่ยนแปลงที่อยู่อีเมล",
-    "Default" : "ค่าเริ่มต้น"
+    "Default" : "ค่าเริ่มต้น",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
+    "Updates" : "อัพเดท"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index b018e8e5dce..e749cd78184 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -33,17 +33,6 @@
     "Email saved" : "อีเมลถูกบันทึกแล้ว",
     "Your full name has been changed." : "ชื่อเต็มของคุณถูกเปลี่ยนแปลง",
     "Unable to change full name" : "ไม่สามารถเปลี่ยนชื่อเต็ม",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "คำเตือนความปลอดภัยและการติดตั้ง",
-    "Sharing" : "แชร์ข้อมูล",
-    "Server-side encryption" : "เข้ารหัสฝั่งเซิร์ฟเวอร์",
-    "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
-    "Cron" : "Cron",
-    "Email server" : "อีเมลเซิร์ฟเวอร์",
-    "Log" : "บันทึกการเปลี่ยนแปลง",
-    "Tips & tricks" : "เคล็ดลับและเทคนิค",
-    "Updates" : "อัพเดท",
     "Couldn't remove app." : "ไม่สามารถลบแอพฯ",
     "Language changed" : "เปลี่ยนภาษาเรียบร้อยแล้ว",
     "Invalid request" : "คำร้องขอไม่ถูกต้อง",
@@ -110,17 +99,54 @@
     "Unlimited" : "ไม่จำกัด",
     "Personal info" : "ข้อมูลส่วนบุคคล",
     "Sync clients" : "ประสานข้อมูลไคลเอนต์",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "ทุกอย่าง (ปัญหาร้ายแรง ข้อผิดพลาด คำเตือน ข้อมูล การแก้ปัญหา)",
-    "Info, warnings, errors and fatal issues" : "ข้อมูล คำเตือน ข้อผิดพลาดและปัญหาร้ายแรง",
-    "Warnings, errors and fatal issues" : "คำเตือนข้อผิดพลาดและปัญหาที่ร้ายแรง",
-    "Errors and fatal issues" : "ข้อผิดพลาดและปัญหาที่ร้ายแรง",
-    "Fatal issues only" : "ปัญหาร้ายแรงเท่านั้น",
     "None" : "ไม่มี",
     "Login" : "เข้าสู่ระบบ",
     "Plain" : "ธรรมดา",
     "NT LAN Manager" : "ตัวจัดการ NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "อีเมลเซิร์ฟเวอร์",
+    "Open documentation" : "เปิดเอกสาร",
+    "This is used for sending out notifications." : "นี้จะใช้สำหรับการส่งออกการแจ้งเตือน",
+    "Send mode" : "โหมดการส่ง",
+    "Encryption" : "การเข้ารหัส",
+    "From address" : "จากที่อยู่",
+    "mail" : "อีเมล",
+    "Authentication method" : "วิธีการตรวจสอบ",
+    "Authentication required" : "จำเป็นต้องตรวจสอบความถูกต้อง",
+    "Server address" : "ที่อยู่เซิร์ฟเวอร์",
+    "Port" : "พอร์ต",
+    "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
+    "SMTP Username" : "ชื่อผู้ใช้ SMTP",
+    "SMTP Password" : "รหัสผ่าน SMTP",
+    "Store credentials" : "ข้อมูลประจำตัวของร้านค้า",
+    "Test email settings" : "ทดสอบการตั้งค่าอีเมล",
+    "Send email" : "ส่งอีเมล",
+    "Server-side encryption" : "เข้ารหัสฝั่งเซิร์ฟเวอร์",
+    "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
+    "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "เมื่อเปิดใช้งานการเข้ารหัส ไฟล์ทั้งหมดที่อัพโหลดไปยังเซิร์ฟเวอร์นั้นจะถูกเข้ารหัสในส่วนของเซิฟเวอร์ มันเป็นไปได้ที่จะปิดใช้งานการเข้ารหัสในภายหลัง ถ้าเปิดใช้ฟังก์ชั่นการสนับสนุนโมดูลการเข้ารหัสที่และเงื่อนไขก่อน (เช่น การตั้งค่าคีย์กู้คืน)",
+    "Be aware that encryption always increases the file size." : "โปรดทราบว่าหากเข้ารหัสไฟล์จะทำให้ขนาดของไฟล์ใหญ่ขึ้น",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "มันจะดีถ้าคุณสำรองข้อมูลบ่อยๆ ในกรณีของการเข้ารหัสโปรดแน่ใจว่าจะสำรองคีย์การเข้ารหัสลับพร้อมกับข้อมูลของคุณ",
+    "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
+    "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
+    "Select default encryption module:" : "เลือกค่าเริ่มต้นโมดูลการเข้ารหัส:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "คุณจำเป็นต้องโอนย้ายคีย์การเข้ารหัสลับของคุณจากการเข้ารหัสเก่า (ownCloud <= 8.0) ไปใหม่ กรุณาเปิดใช้งาน \"โมดูลการเข้ารหัสเริ่มต้น\" และเรียกใช้ 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "คุณจำเป็นต้องโอนย้ายคีย์การเข้ารหัสลับของคุณจากการเข้ารหัสเก่า (ownCloud <= 8.0) ไปใหม่",
+    "Start migration" : "เริ่มการโยกย้าย",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "ทุกอย่าง (ปัญหาร้ายแรง ข้อผิดพลาด คำเตือน ข้อมูล การแก้ปัญหา)",
+    "Info, warnings, errors and fatal issues" : "ข้อมูล คำเตือน ข้อผิดพลาดและปัญหาร้ายแรง",
+    "Warnings, errors and fatal issues" : "คำเตือนข้อผิดพลาดและปัญหาที่ร้ายแรง",
+    "Errors and fatal issues" : "ข้อผิดพลาดและปัญหาที่ร้ายแรง",
+    "Fatal issues only" : "ปัญหาร้ายแรงเท่านั้น",
+    "Log" : "บันทึกการเปลี่ยนแปลง",
+    "What to log" : "อะไรที่จะบันทึก",
+    "Download logfile" : "ดาวน์โหลดไฟล์บันทึก",
+    "More" : "มาก",
+    "Less" : "ย่อ",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ไฟล์บันทึกมีขนาดใหญ่กว่า 100 เมกะไบต์ มันอาจจะใช้เวลาดาวน์โหลดนาน!",
+    "Security & setup warnings" : "คำเตือนความปลอดภัยและการติดตั้ง",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ไม่ได้ติดตั้งphp อย่างถูกต้องค้นหาตัวแปรสภาพแวดล้อมของระบบการทดสอบกับ getenv(\"PATH\") ส่งกลับเฉพาะการตอบสนองที่ว่างเปล่า",
     "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." : "ตั้งค่าให้สามารถอ่านได้อย่างเดียวถูกเปิดใช้งาน นี้จะช่วยป้องกันการตั้งค่าผ่านทางบางเว็บอินเตอร์เฟซ นอกจากนี้จะต้องเขียนไฟล์ด้วยตนเองสำหรับทุกการอัพเดท",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "เห็นได้ชัดว่าการตั้งค่า PHP จะตัดบล็อคเอกสารแบบอินไลน์ ซึ่งจะทำให้แอพพลิเคชันอีกหลายแกนไม่สามารถเข้าถึงได้",
@@ -133,7 +159,15 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "หากการติดตั้งของคุณไม่ได้ติดตั้งในรากของโดเมนและใช้ระบบ cron อาจมีปัญหาเกี่ยวกับการสร้าง URL เพื่อหลีกเลี่ยงปัญหาเหล่านี้โปรดไปตั้งค่า \"overwrite.cli.url\" ในไฟล์ config.php ของคุณไปยังเส้นทาง webroot ของการติดตั้งของคุณ (แนะนำ: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "มันเป็นไปไม่ได้ที่จะดำเนินการ cronjob ผ่านทาง CLI ข้อผิดพลาดทางเทคนิคต่อไปนี้จะปรากฏ:",
     "All checks passed." : "ผ่านการตรวจสอบทั้งหมด",
-    "Open documentation" : "เปิดเอกสาร",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "การดำเนินการ cron job ล่าสุด: %s",
+    "Last cron job execution: %s. Something seems wrong." : "การดำเนินการ cron job ล่าสุด: %s ดูเหมือนมีบางสิ่งไม่ถูกต้อง",
+    "Cron was not executed yet!" : "Cron ไม่ได้ถูกดำเนินการ!",
+    "Execute one task with each page loaded" : "ประมวลผลหนึ่งงาน ในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ได้ถูกลงทะเบียนที่บริการ Webcron เพื่อเรียก cron.php ทุกๆ 15 นาที บน Http",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "ใช้ระบบบริการ cron เพื่อเรียกไฟล์ cron.php ทุก 15 นาที",
+    "Version" : "รุ่น",
+    "Sharing" : "แชร์ข้อมูล",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow users to share via link" : "อนุญาตให้ผู้ใช้สามารถแชร์ผ่านทางลิงค์",
     "Allow public uploads" : "อนุญาตให้อัพโหลดสาธารณะ",
@@ -150,44 +184,7 @@
     "Exclude groups from sharing" : "ไม่รวมกลุ่มที่กำลังแชร์",
     "These groups will still be able to receive shares, but not to initiate them." : "กลุ่มนี้จะยังคงสามารถได้รับการแชร์ แต่พวกเขาจะไม่รู้จักมัน",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "อนุญาตให้เติมข้อความชื่อผู้ใช้อัตโนมัติในกล่องข้อความแชร์  ถ้านี้ถูกปิดใช้งานจะต้องกรอกชื่อผู้ใช้เอง",
-    "Last cron job execution: %s." : "การดำเนินการ cron job ล่าสุด: %s",
-    "Last cron job execution: %s. Something seems wrong." : "การดำเนินการ cron job ล่าสุด: %s ดูเหมือนมีบางสิ่งไม่ถูกต้อง",
-    "Cron was not executed yet!" : "Cron ไม่ได้ถูกดำเนินการ!",
-    "Execute one task with each page loaded" : "ประมวลผลหนึ่งงาน ในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ได้ถูกลงทะเบียนที่บริการ Webcron เพื่อเรียก cron.php ทุกๆ 15 นาที บน Http",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "ใช้ระบบบริการ cron เพื่อเรียกไฟล์ cron.php ทุก 15 นาที",
-    "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
-    "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "เมื่อเปิดใช้งานการเข้ารหัส ไฟล์ทั้งหมดที่อัพโหลดไปยังเซิร์ฟเวอร์นั้นจะถูกเข้ารหัสในส่วนของเซิฟเวอร์ มันเป็นไปได้ที่จะปิดใช้งานการเข้ารหัสในภายหลัง ถ้าเปิดใช้ฟังก์ชั่นการสนับสนุนโมดูลการเข้ารหัสที่และเงื่อนไขก่อน (เช่น การตั้งค่าคีย์กู้คืน)",
-    "Be aware that encryption always increases the file size." : "โปรดทราบว่าหากเข้ารหัสไฟล์จะทำให้ขนาดของไฟล์ใหญ่ขึ้น",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "มันจะดีถ้าคุณสำรองข้อมูลบ่อยๆ ในกรณีของการเข้ารหัสโปรดแน่ใจว่าจะสำรองคีย์การเข้ารหัสลับพร้อมกับข้อมูลของคุณ",
-    "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
-    "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
-    "Select default encryption module:" : "เลือกค่าเริ่มต้นโมดูลการเข้ารหัส:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "คุณจำเป็นต้องโอนย้ายคีย์การเข้ารหัสลับของคุณจากการเข้ารหัสเก่า (ownCloud <= 8.0) ไปใหม่ กรุณาเปิดใช้งาน \"โมดูลการเข้ารหัสเริ่มต้น\" และเรียกใช้ 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "คุณจำเป็นต้องโอนย้ายคีย์การเข้ารหัสลับของคุณจากการเข้ารหัสเก่า (ownCloud <= 8.0) ไปใหม่",
-    "Start migration" : "เริ่มการโยกย้าย",
-    "This is used for sending out notifications." : "นี้จะใช้สำหรับการส่งออกการแจ้งเตือน",
-    "Send mode" : "โหมดการส่ง",
-    "Encryption" : "การเข้ารหัส",
-    "From address" : "จากที่อยู่",
-    "mail" : "อีเมล",
-    "Authentication method" : "วิธีการตรวจสอบ",
-    "Authentication required" : "จำเป็นต้องตรวจสอบความถูกต้อง",
-    "Server address" : "ที่อยู่เซิร์ฟเวอร์",
-    "Port" : "พอร์ต",
-    "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
-    "SMTP Username" : "ชื่อผู้ใช้ SMTP",
-    "SMTP Password" : "รหัสผ่าน SMTP",
-    "Store credentials" : "ข้อมูลประจำตัวของร้านค้า",
-    "Test email settings" : "ทดสอบการตั้งค่าอีเมล",
-    "Send email" : "ส่งอีเมล",
-    "What to log" : "อะไรที่จะบันทึก",
-    "Download logfile" : "ดาวน์โหลดไฟล์บันทึก",
-    "More" : "มาก",
-    "Less" : "ย่อ",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ไฟล์บันทึกมีขนาดใหญ่กว่า 100 เมกะไบต์ มันอาจจะใช้เวลาดาวน์โหลดนาน!",
+    "Tips & tricks" : "เคล็ดลับและเทคนิค",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "จะใช้ SQLite เป็นฐานข้อมูล สำหรับการติดตั้งขนาดใหญ่เราขอแนะนำเพื่อสลับไปยังฐานข้อมูลแบ็กเอนด์ที่แตกต่างกัน",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการประสานข้อมูลโดย SQLite",
     "How to do backups" : "วิธีการสำรองข้อมูล",
@@ -196,7 +193,6 @@
     "Improving the config.php" : "ปรับปรุงไฟล์ config.php",
     "Theming" : "ชุดรูปแบบ",
     "Hardening and security guidance" : "คำแนะนำการรักษาความปลอดภัย",
-    "Version" : "รุ่น",
     "Developer documentation" : "เอกสารสำหรับนักพัฒนา",
     "Experimental applications ahead" : "การใช้งานก่อนการทดลอง",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "การทดลองแอพพลิเคชันไม่ได้ถูกตรวจสอบปัญหาด้านความปลอดภัย การติดตั้งพวกเขาสามารถก่อให้เกิดการสูญเสียข้อมูลหรือการละเมิดความปลอดภัย",
@@ -247,14 +243,14 @@
     "Change password" : "เปลี่ยนรหัสผ่าน",
     "Language" : "ภาษา",
     "Help translate" : "มาช่วยกันแปลสิ!",
-    "Name" : "ชื่อ",
-    "Username" : "ชื่อผู้ใช้งาน",
-    "Done" : "เสร็จสิ้น",
     "Get the apps to sync your files" : "ใช้แอพพลิเคชันในการประสานไฟล์ของคุณ",
     "Desktop client" : "เดสก์ทอปผู้ใช้",
     "Android app" : "แอพฯ แอนดรอยด์",
     "iOS app" : "แอพฯ IOS",
     "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
+    "Name" : "ชื่อ",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Done" : "เสร็จสิ้น",
     "Show storage location" : "แสดงสถานที่จัดเก็บข้อมูล",
     "Show last log in" : "แสดงการเข้าสู่ระบบล่าสุด",
     "Show user backend" : "แสดงแบ็กเอนด์ของผู้ใช้",
@@ -273,6 +269,10 @@
     "change full name" : "เปลี่ยนชื่อเต็ม",
     "set new password" : "ตั้งค่ารหัสผ่านใหม่",
     "change email address" : "เปลี่ยนแปลงที่อยู่อีเมล",
-    "Default" : "ค่าเริ่มต้น"
+    "Default" : "ค่าเริ่มต้น",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
+    "Updates" : "อัพเดท"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index b3ef46cb41e..28b4d90cd3b 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "E-posta kaydedildi",
     "Your full name has been changed." : "Tam adınız değiştirildi.",
     "Unable to change full name" : "Tam adınız değiştirilirken hata",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
-    "Sharing" : "Paylaşım",
-    "Server-side encryption" : "Sunucu taraflı şifreleme",
-    "External Storage" : "Harici Depolama",
-    "Cron" : "Cron",
-    "Email server" : "E-posta sunucusu",
-    "Log" : "Günlük",
-    "Tips & tricks" : "İpuçları ve hileler",
-    "Updates" : "Güncellemeler",
     "Couldn't remove app." : "Uygulama kaldırılamadı.",
     "Language changed" : "Dil değiştirildi",
     "Invalid request" : "Geçersiz istek",
@@ -133,17 +122,55 @@ OC.L10N.register(
     "Sessions" : "Oturum",
     "App passwords" : "Uygulama parolaları",
     "Sync clients" : "Eşitleme istemcileri",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
-    "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
-    "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
-    "Errors and fatal issues" : "Hatalar ve ciddi sorunlar",
-    "Fatal issues only" : "Sadece ciddi sorunlar",
     "None" : "Hiçbiri",
     "Login" : "Oturum Aç",
     "Plain" : "Düz",
     "NT LAN Manager" : "NT Ağ Yöneticisi",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-posta sunucusu",
+    "Open documentation" : "Belgelendirmeyi aç",
+    "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
+    "Send mode" : "Gönderme kipi",
+    "Encryption" : "Şifreleme",
+    "From address" : "Kimden adresi",
+    "mail" : "posta",
+    "Authentication method" : "Kimlik doğrulama yöntemi",
+    "Authentication required" : "Kimlik doğrulama gerekli",
+    "Server address" : "Sunucu adresi",
+    "Port" : "Port",
+    "Credentials" : "Kimlik Bilgileri",
+    "SMTP Username" : "SMTP Kullanıcı Adı",
+    "SMTP Password" : "SMTP Parolası",
+    "Store credentials" : "Kimlik bilgilerini depola",
+    "Test email settings" : "E-posta ayarlarını sına",
+    "Send email" : "E-posta gönder",
+    "Server-side encryption" : "Sunucu taraflı şifreleme",
+    "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
+    "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Şifreleme etkinleştirildiğinde, sunucuya yüklenen tüm dosyalar şifrelenmiş olarak kalacaktır. Şifrelemeyi devre dışı bırakmak sadece ileriki zamanlarda aktif şifreleme modülü desteklediğinde ve ön koşullar (örn: düzenleme anahtarı oluşturulması) yerine getirildiğinde yapılabilir.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Şifreleme tek başına sistemin güvenliğini garanti etmez. Lütfen şifreleme uygulamasının nasıl çalıştığı ve desteklenen durumlar hakkında daha fazla bilgi almak için belgelendirmeye bakınız.",
+    "Be aware that encryption always increases the file size." : "Şifrelemenin dosya boyutunu büyüteceğini unutmayın.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Verilerinizi düzenli yedekleyin ve şifreleme anahtarlarınızın verilerinizle birlikte yedeklendiğinden emin olun. ",
+    "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
+    "Enable encryption" : "Şifrelemeyi aç",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
+    "Select default encryption module:" : "Öntanımlı şifreleme modülünü seçin:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Eski şifreleme anahtarlarınızı eski şifrelemeden (ownCloud <= 8.0) yenisine taşımanız gerekli. Lütfen \"Öntanımlı şifreleme modülü\"nü etkinleştirin ve 'occ encryption:migrate' çalıştırın",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Eski şifreleme anahtarlarınızı eski şifrelemeden (ownCloud <= 8.0) yenisine taşımanız gerekli.",
+    "Start migration" : "Taşınmayı başlat",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
+    "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
+    "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
+    "Errors and fatal issues" : "Hatalar ve ciddi sorunlar",
+    "Fatal issues only" : "Sadece ciddi sorunlar",
+    "Log" : "Günlük",
+    "What to log" : "Neler günlüklenmeli",
+    "Download logfile" : "Günlük dosyasını indir",
+    "More" : "Daha fazla",
+    "Less" : "Daha az",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
+    "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen php yapılandırma notları ve özellikler php-fpm kullanırken sunucu php yapılandırması için <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">kurulum belgelendirmesine ↗</a> bakın.",
     "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." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.",
@@ -160,7 +187,15 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">kurulum rehberlerine ↗</a> ve <a href=\"#log-section\">günlük</a> kısmındaki hata ve uyarılara bakın.",
     "All checks passed." : "Tüm kontroller geçildi.",
-    "Open documentation" : "Belgelendirmeyi aç",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Son cron çalıştırılma: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Son cron çalıştırılma: %s. Bir şeyler yanlış gibi görünüyor.",
+    "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
+    "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
+    "Version" : "Sürüm",
+    "Sharing" : "Paylaşım",
     "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
     "Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
     "Allow public uploads" : "Herkes tarafından yüklemeye izin ver",
@@ -177,45 +212,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Grupları paylaşma eyleminden hariç tut",
     "These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Paylaşma iletişim kutusunda kullanıcı adı otomatik tamamlamasını etkinleştir. Devre dışı olduğunda tam kullanıcı adı girilmeli.",
-    "Last cron job execution: %s." : "Son cron çalıştırılma: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Son cron çalıştırılma: %s. Bir şeyler yanlış gibi görünüyor.",
-    "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
-    "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
-    "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
-    "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Şifreleme etkinleştirildiğinde, sunucuya yüklenen tüm dosyalar şifrelenmiş olarak kalacaktır. Şifrelemeyi devre dışı bırakmak sadece ileriki zamanlarda aktif şifreleme modülü desteklediğinde ve ön koşullar (örn: düzenleme anahtarı oluşturulması) yerine getirildiğinde yapılabilir.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Şifreleme tek başına sistemin güvenliğini garanti etmez. Lütfen şifreleme uygulamasının nasıl çalıştığı ve desteklenen durumlar hakkında daha fazla bilgi almak için belgelendirmeye bakınız.",
-    "Be aware that encryption always increases the file size." : "Şifrelemenin dosya boyutunu büyüteceğini unutmayın.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Verilerinizi düzenli yedekleyin ve şifreleme anahtarlarınızın verilerinizle birlikte yedeklendiğinden emin olun. ",
-    "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
-    "Enable encryption" : "Şifrelemeyi aç",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
-    "Select default encryption module:" : "Öntanımlı şifreleme modülünü seçin:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Eski şifreleme anahtarlarınızı eski şifrelemeden (ownCloud <= 8.0) yenisine taşımanız gerekli. Lütfen \"Öntanımlı şifreleme modülü\"nü etkinleştirin ve 'occ encryption:migrate' çalıştırın",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Eski şifreleme anahtarlarınızı eski şifrelemeden (ownCloud <= 8.0) yenisine taşımanız gerekli.",
-    "Start migration" : "Taşınmayı başlat",
-    "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
-    "Send mode" : "Gönderme kipi",
-    "Encryption" : "Şifreleme",
-    "From address" : "Kimden adresi",
-    "mail" : "posta",
-    "Authentication method" : "Kimlik doğrulama yöntemi",
-    "Authentication required" : "Kimlik doğrulama gerekli",
-    "Server address" : "Sunucu adresi",
-    "Port" : "Port",
-    "Credentials" : "Kimlik Bilgileri",
-    "SMTP Username" : "SMTP Kullanıcı Adı",
-    "SMTP Password" : "SMTP Parolası",
-    "Store credentials" : "Kimlik bilgilerini depola",
-    "Test email settings" : "E-posta ayarlarını sına",
-    "Send email" : "E-posta gönder",
-    "What to log" : "Neler günlüklenmeli",
-    "Download logfile" : "Günlük dosyasını indir",
-    "More" : "Daha fazla",
-    "Less" : "Daha az",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
+    "Tips & tricks" : "İpuçları ve hileler",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
@@ -225,7 +222,6 @@ OC.L10N.register(
     "Improving the config.php" : "config.php iyileştirme",
     "Theming" : "Tema",
     "Hardening and security guidance" : "Sağlamlaştırma ve güvenlik rehberliği",
-    "Version" : "Sürüm",
     "Developer documentation" : "Geliştirici belgelendirmesi",
     "Experimental applications ahead" : "İlerideki deneysel uygulamalar",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Deneysel uygulamalar güvenlik açısından denetlenmemiş, yeni veya kararsız olmaya açık ya da geliştirilme aşamasında olan uygulamalardır. Yüklemek veri kaybı veya güvenlik açıklarına sebep olabilir.",
@@ -281,6 +277,11 @@ OC.L10N.register(
     "Change password" : "Parola değiştir",
     "Language" : "Dil",
     "Help translate" : "Çevirilere yardım edin",
+    "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
+    "Desktop client" : "Masaüstü istemcisi",
+    "Android app" : "Android uygulaması",
+    "iOS app" : "iOS uygulaması",
+    "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
     "Web, desktop and mobile clients currently logged in to your account." : "Web, masaüstü ve mobil şu anda hesabınıza oturum açmış durumda.",
     "Device" : "Aygıt",
     "Last activity" : "Son etkinlik",
@@ -291,12 +292,6 @@ OC.L10N.register(
     "Use the credentials below to configure your app or device." : "Uygulama veya aygıtınızı yapılandırmak için aşağıdaki kimlik bilgilerini kullan.",
     "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",
-    "Android app" : "Android uygulaması",
-    "iOS app" : "iOS uygulaması",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Projeyi desteklemek isterseniz\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">gelişimine katılın</a>\n\t\tya da\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">dünyaya duyurun</a>!",
-    "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
     "Show storage location" : "Depolama konumunu göster",
     "Show last log in" : "Son oturum açılma zamanını göster",
     "Show user backend" : "Kullanıcı arka ucunu göster",
@@ -320,6 +315,10 @@ OC.L10N.register(
     "change full name" : "tam adı değiştir",
     "set new password" : "yeni parola belirle",
     "change email address" : "e-posta adresini değiştir",
-    "Default" : "Öntanımlı"
+    "Default" : "Öntanımlı",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Harici Depolama",
+    "Updates" : "Güncellemeler"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 6aa7e16459b..2f5472cf82e 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -33,17 +33,6 @@
     "Email saved" : "E-posta kaydedildi",
     "Your full name has been changed." : "Tam adınız değiştirildi.",
     "Unable to change full name" : "Tam adınız değiştirilirken hata",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
-    "Sharing" : "Paylaşım",
-    "Server-side encryption" : "Sunucu taraflı şifreleme",
-    "External Storage" : "Harici Depolama",
-    "Cron" : "Cron",
-    "Email server" : "E-posta sunucusu",
-    "Log" : "Günlük",
-    "Tips & tricks" : "İpuçları ve hileler",
-    "Updates" : "Güncellemeler",
     "Couldn't remove app." : "Uygulama kaldırılamadı.",
     "Language changed" : "Dil değiştirildi",
     "Invalid request" : "Geçersiz istek",
@@ -131,17 +120,55 @@
     "Sessions" : "Oturum",
     "App passwords" : "Uygulama parolaları",
     "Sync clients" : "Eşitleme istemcileri",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
-    "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
-    "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
-    "Errors and fatal issues" : "Hatalar ve ciddi sorunlar",
-    "Fatal issues only" : "Sadece ciddi sorunlar",
     "None" : "Hiçbiri",
     "Login" : "Oturum Aç",
     "Plain" : "Düz",
     "NT LAN Manager" : "NT Ağ Yöneticisi",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "E-posta sunucusu",
+    "Open documentation" : "Belgelendirmeyi aç",
+    "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
+    "Send mode" : "Gönderme kipi",
+    "Encryption" : "Şifreleme",
+    "From address" : "Kimden adresi",
+    "mail" : "posta",
+    "Authentication method" : "Kimlik doğrulama yöntemi",
+    "Authentication required" : "Kimlik doğrulama gerekli",
+    "Server address" : "Sunucu adresi",
+    "Port" : "Port",
+    "Credentials" : "Kimlik Bilgileri",
+    "SMTP Username" : "SMTP Kullanıcı Adı",
+    "SMTP Password" : "SMTP Parolası",
+    "Store credentials" : "Kimlik bilgilerini depola",
+    "Test email settings" : "E-posta ayarlarını sına",
+    "Send email" : "E-posta gönder",
+    "Server-side encryption" : "Sunucu taraflı şifreleme",
+    "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
+    "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Şifreleme etkinleştirildiğinde, sunucuya yüklenen tüm dosyalar şifrelenmiş olarak kalacaktır. Şifrelemeyi devre dışı bırakmak sadece ileriki zamanlarda aktif şifreleme modülü desteklediğinde ve ön koşullar (örn: düzenleme anahtarı oluşturulması) yerine getirildiğinde yapılabilir.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Şifreleme tek başına sistemin güvenliğini garanti etmez. Lütfen şifreleme uygulamasının nasıl çalıştığı ve desteklenen durumlar hakkında daha fazla bilgi almak için belgelendirmeye bakınız.",
+    "Be aware that encryption always increases the file size." : "Şifrelemenin dosya boyutunu büyüteceğini unutmayın.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Verilerinizi düzenli yedekleyin ve şifreleme anahtarlarınızın verilerinizle birlikte yedeklendiğinden emin olun. ",
+    "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
+    "Enable encryption" : "Şifrelemeyi aç",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
+    "Select default encryption module:" : "Öntanımlı şifreleme modülünü seçin:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Eski şifreleme anahtarlarınızı eski şifrelemeden (ownCloud <= 8.0) yenisine taşımanız gerekli. Lütfen \"Öntanımlı şifreleme modülü\"nü etkinleştirin ve 'occ encryption:migrate' çalıştırın",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Eski şifreleme anahtarlarınızı eski şifrelemeden (ownCloud <= 8.0) yenisine taşımanız gerekli.",
+    "Start migration" : "Taşınmayı başlat",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
+    "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
+    "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
+    "Errors and fatal issues" : "Hatalar ve ciddi sorunlar",
+    "Fatal issues only" : "Sadece ciddi sorunlar",
+    "Log" : "Günlük",
+    "What to log" : "Neler günlüklenmeli",
+    "Download logfile" : "Günlük dosyasını indir",
+    "More" : "Daha fazla",
+    "Less" : "Daha az",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
+    "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen php yapılandırma notları ve özellikler php-fpm kullanırken sunucu php yapılandırması için <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">kurulum belgelendirmesine ↗</a> bakın.",
     "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." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.",
@@ -158,7 +185,15 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">kurulum rehberlerine ↗</a> ve <a href=\"#log-section\">günlük</a> kısmındaki hata ve uyarılara bakın.",
     "All checks passed." : "Tüm kontroller geçildi.",
-    "Open documentation" : "Belgelendirmeyi aç",
+    "Cron" : "Cron",
+    "Last cron job execution: %s." : "Son cron çalıştırılma: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Son cron çalıştırılma: %s. Bir şeyler yanlış gibi görünüyor.",
+    "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
+    "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
+    "Version" : "Sürüm",
+    "Sharing" : "Paylaşım",
     "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
     "Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
     "Allow public uploads" : "Herkes tarafından yüklemeye izin ver",
@@ -175,45 +210,7 @@
     "Exclude groups from sharing" : "Grupları paylaşma eyleminden hariç tut",
     "These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Paylaşma iletişim kutusunda kullanıcı adı otomatik tamamlamasını etkinleştir. Devre dışı olduğunda tam kullanıcı adı girilmeli.",
-    "Last cron job execution: %s." : "Son cron çalıştırılma: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Son cron çalıştırılma: %s. Bir şeyler yanlış gibi görünüyor.",
-    "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
-    "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
-    "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
-    "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Şifreleme etkinleştirildiğinde, sunucuya yüklenen tüm dosyalar şifrelenmiş olarak kalacaktır. Şifrelemeyi devre dışı bırakmak sadece ileriki zamanlarda aktif şifreleme modülü desteklediğinde ve ön koşullar (örn: düzenleme anahtarı oluşturulması) yerine getirildiğinde yapılabilir.",
-    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Şifreleme tek başına sistemin güvenliğini garanti etmez. Lütfen şifreleme uygulamasının nasıl çalıştığı ve desteklenen durumlar hakkında daha fazla bilgi almak için belgelendirmeye bakınız.",
-    "Be aware that encryption always increases the file size." : "Şifrelemenin dosya boyutunu büyüteceğini unutmayın.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Verilerinizi düzenli yedekleyin ve şifreleme anahtarlarınızın verilerinizle birlikte yedeklendiğinden emin olun. ",
-    "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
-    "Enable encryption" : "Şifrelemeyi aç",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
-    "Select default encryption module:" : "Öntanımlı şifreleme modülünü seçin:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Eski şifreleme anahtarlarınızı eski şifrelemeden (ownCloud <= 8.0) yenisine taşımanız gerekli. Lütfen \"Öntanımlı şifreleme modülü\"nü etkinleştirin ve 'occ encryption:migrate' çalıştırın",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Eski şifreleme anahtarlarınızı eski şifrelemeden (ownCloud <= 8.0) yenisine taşımanız gerekli.",
-    "Start migration" : "Taşınmayı başlat",
-    "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
-    "Send mode" : "Gönderme kipi",
-    "Encryption" : "Şifreleme",
-    "From address" : "Kimden adresi",
-    "mail" : "posta",
-    "Authentication method" : "Kimlik doğrulama yöntemi",
-    "Authentication required" : "Kimlik doğrulama gerekli",
-    "Server address" : "Sunucu adresi",
-    "Port" : "Port",
-    "Credentials" : "Kimlik Bilgileri",
-    "SMTP Username" : "SMTP Kullanıcı Adı",
-    "SMTP Password" : "SMTP Parolası",
-    "Store credentials" : "Kimlik bilgilerini depola",
-    "Test email settings" : "E-posta ayarlarını sına",
-    "Send email" : "E-posta gönder",
-    "What to log" : "Neler günlüklenmeli",
-    "Download logfile" : "Günlük dosyasını indir",
-    "More" : "Daha fazla",
-    "Less" : "Daha az",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
+    "Tips & tricks" : "İpuçları ve hileler",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
@@ -223,7 +220,6 @@
     "Improving the config.php" : "config.php iyileştirme",
     "Theming" : "Tema",
     "Hardening and security guidance" : "Sağlamlaştırma ve güvenlik rehberliği",
-    "Version" : "Sürüm",
     "Developer documentation" : "Geliştirici belgelendirmesi",
     "Experimental applications ahead" : "İlerideki deneysel uygulamalar",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Deneysel uygulamalar güvenlik açısından denetlenmemiş, yeni veya kararsız olmaya açık ya da geliştirilme aşamasında olan uygulamalardır. Yüklemek veri kaybı veya güvenlik açıklarına sebep olabilir.",
@@ -279,6 +275,11 @@
     "Change password" : "Parola değiştir",
     "Language" : "Dil",
     "Help translate" : "Çevirilere yardım edin",
+    "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
+    "Desktop client" : "Masaüstü istemcisi",
+    "Android app" : "Android uygulaması",
+    "iOS app" : "iOS uygulaması",
+    "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
     "Web, desktop and mobile clients currently logged in to your account." : "Web, masaüstü ve mobil şu anda hesabınıza oturum açmış durumda.",
     "Device" : "Aygıt",
     "Last activity" : "Son etkinlik",
@@ -289,12 +290,6 @@
     "Use the credentials below to configure your app or device." : "Uygulama veya aygıtınızı yapılandırmak için aşağıdaki kimlik bilgilerini kullan.",
     "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",
-    "Android app" : "Android uygulaması",
-    "iOS app" : "iOS uygulaması",
-    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Projeyi desteklemek isterseniz\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">gelişimine katılın</a>\n\t\tya da\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">dünyaya duyurun</a>!",
-    "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
     "Show storage location" : "Depolama konumunu göster",
     "Show last log in" : "Son oturum açılma zamanını göster",
     "Show user backend" : "Kullanıcı arka ucunu göster",
@@ -318,6 +313,10 @@
     "change full name" : "tam adı değiştir",
     "set new password" : "yeni parola belirle",
     "change email address" : "e-posta adresini değiştir",
-    "Default" : "Öntanımlı"
+    "Default" : "Öntanımlı",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "Harici Depolama",
+    "Updates" : "Güncellemeler"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index ca7541fe800..9c76075ca03 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -35,17 +35,6 @@ OC.L10N.register(
     "Email saved" : "电子邮件已保存",
     "Your full name has been changed." : "您的全名已修改。",
     "Unable to change full name" : "无法修改全名",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "安全及设置警告",
-    "Sharing" : "共享",
-    "Server-side encryption" : "服务器端加密",
-    "External Storage" : "外部存储",
-    "Cron" : "计划任务",
-    "Email server" : "电子邮件服务器",
-    "Log" : "日志",
-    "Tips & tricks" : "技巧提示",
-    "Updates" : "更新",
     "Couldn't remove app." : "无法删除应用。",
     "Language changed" : "语言已修改",
     "Invalid request" : "无效请求",
@@ -110,17 +99,54 @@ OC.L10N.register(
     "Unlimited" : "无限",
     "Personal info" : "个人信息",
     "Sync clients" : "客户端",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
-    "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题",
-    "Warnings, errors and fatal issues" : "警告，错误和灾难性问题",
-    "Errors and fatal issues" : "错误和灾难性问题",
-    "Fatal issues only" : "仅灾难性问题",
     "None" : "无",
     "Login" : "登录",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN 管理器",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "电子邮件服务器",
+    "Open documentation" : "打开文档",
+    "This is used for sending out notifications." : "这被用于发送通知。",
+    "Send mode" : "发送模式",
+    "Encryption" : "加密",
+    "From address" : "来自地址",
+    "mail" : "邮件",
+    "Authentication method" : "认证方法",
+    "Authentication required" : "需要认证",
+    "Server address" : "服务器地址",
+    "Port" : "端口",
+    "Credentials" : "凭证",
+    "SMTP Username" : "SMTP 用户名",
+    "SMTP Password" : "SMTP 密码",
+    "Store credentials" : "存储凭据",
+    "Test email settings" : "测试电子邮件设置",
+    "Send email" : "发送邮件",
+    "Server-side encryption" : "服务器端加密",
+    "Enable server-side encryption" : "启用服务器端加密",
+    "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密被启用，之后上传到服务器的所有文件都将服务器上加密。只有当启用状态的加密模块支持解密并且所有的先决条件(例如，设定恢复键)得到满足时才能解除加密。",
+    "Be aware that encryption always increases the file size." : "请注意，加密会增加文件大小。",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定期备份数据有利于保证数据完整，并且确保备份您的加密数据和加密密钥。",
+    "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
+    "Enable encryption" : "启用加密",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
+    "Select default encryption module:" : "选择默认的加密模块：",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "你需要升级你的加密密钥 (旧版 ownCloud <= 8.0) 。 请在应用中启用 \\\"Default encryption module\\\" 并运行 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "您需要将加密密钥从旧版(ownCloud<=8.0)迁移到新版。",
+    "Start migration" : "开始迁移",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
+    "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题",
+    "Warnings, errors and fatal issues" : "警告，错误和灾难性问题",
+    "Errors and fatal issues" : "错误和灾难性问题",
+    "Fatal issues only" : "仅灾难性问题",
+    "Log" : "日志",
+    "What to log" : "记录日志",
+    "Download logfile" : "下载日志文件",
+    "More" : "更多",
+    "Less" : "更少",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
+    "Security & setup warnings" : "安全及设置警告",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
     "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." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
@@ -132,7 +158,15 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你不是安装在网域根目录而且又使用系统定时计划任务，那么可以导致 URL 链接生成问题。为了避免这些问题，请在你的 Config.php 文件中设置 \\\"overwrite.cli.url\\\" 选项为 webroot 安装根目录 (建议: \\\"%s\\\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "由于下面的错误，无法通过 CLI 执行定时计划任务:",
     "All checks passed." : "所有检查已通过。",
-    "Open documentation" : "打开文档",
+    "Cron" : "计划任务",
+    "Last cron job execution: %s." : "上次定时任务执行于： %s.",
+    "Last cron job execution: %s. Something seems wrong." : "上次定时任务执行于: %s. 似乎有些问题。",
+    "Cron was not executed yet!" : "定时任务还未被执行！",
+    "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
+    "Version" : "版本",
+    "Sharing" : "共享",
     "Allow apps to use the Share API" : "允许应用软件使用共享API",
     "Allow users to share via link" : "允许用户通过链接分享文件",
     "Allow public uploads" : "允许公开上传",
@@ -149,44 +183,7 @@ OC.L10N.register(
     "Exclude groups from sharing" : "在分享中排除组",
     "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "允许在共享对话框中的自动补全用户名。如果被禁用，需要输入用户全名。",
-    "Last cron job execution: %s." : "上次定时任务执行于： %s.",
-    "Last cron job execution: %s. Something seems wrong." : "上次定时任务执行于: %s. 似乎有些问题。",
-    "Cron was not executed yet!" : "定时任务还未被执行！",
-    "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
-    "Enable server-side encryption" : "启用服务器端加密",
-    "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密被启用，之后上传到服务器的所有文件都将服务器上加密。只有当启用状态的加密模块支持解密并且所有的先决条件(例如，设定恢复键)得到满足时才能解除加密。",
-    "Be aware that encryption always increases the file size." : "请注意，加密会增加文件大小。",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定期备份数据有利于保证数据完整，并且确保备份您的加密数据和加密密钥。",
-    "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
-    "Enable encryption" : "启用加密",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
-    "Select default encryption module:" : "选择默认的加密模块：",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "你需要升级你的加密密钥 (旧版 ownCloud <= 8.0) 。 请在应用中启用 \\\"Default encryption module\\\" 并运行 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "您需要将加密密钥从旧版(ownCloud<=8.0)迁移到新版。",
-    "Start migration" : "开始迁移",
-    "This is used for sending out notifications." : "这被用于发送通知。",
-    "Send mode" : "发送模式",
-    "Encryption" : "加密",
-    "From address" : "来自地址",
-    "mail" : "邮件",
-    "Authentication method" : "认证方法",
-    "Authentication required" : "需要认证",
-    "Server address" : "服务器地址",
-    "Port" : "端口",
-    "Credentials" : "凭证",
-    "SMTP Username" : "SMTP 用户名",
-    "SMTP Password" : "SMTP 密码",
-    "Store credentials" : "存储凭据",
-    "Test email settings" : "测试电子邮件设置",
-    "Send email" : "发送邮件",
-    "What to log" : "记录日志",
-    "Download logfile" : "下载日志文件",
-    "More" : "更多",
-    "Less" : "更少",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
+    "Tips & tricks" : "技巧提示",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite 被用作数据库。对于较大数据量的安装和使用，我们建议您切换到不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
     "How to do backups" : "如何做备份",
@@ -195,7 +192,6 @@ OC.L10N.register(
     "Improving the config.php" : "正在优化 config.php",
     "Theming" : "主题",
     "Hardening and security guidance" : "强化和安全指南",
-    "Version" : "版本",
     "Developer documentation" : "开发者文档",
     "Experimental applications ahead" : "未来的实验应用",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "实验应用程序没有在安全性的问题上作过多检查，新的或已知的不稳定 BUG 都在开发中。安装它们可能会导致数据丢失或安全漏洞。",
@@ -245,13 +241,13 @@ OC.L10N.register(
     "Change password" : "修改密码",
     "Language" : "语言",
     "Help translate" : "帮助翻译",
-    "Name" : "名称",
-    "Username" : "用户名",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
     "iOS app" : "iOS 应用",
     "Show First Run Wizard again" : "再次显示首次运行向导",
+    "Name" : "名称",
+    "Username" : "用户名",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
     "Show user backend" : "显示用户后端",
@@ -270,6 +266,10 @@ OC.L10N.register(
     "change full name" : "更改全名",
     "set new password" : "设置新密码",
     "change email address" : "修改电子邮箱地址",
-    "Default" : "默认"
+    "Default" : "默认",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "外部存储",
+    "Updates" : "更新"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index c5af97dd214..e3681f87c0c 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -33,17 +33,6 @@
     "Email saved" : "电子邮件已保存",
     "Your full name has been changed." : "您的全名已修改。",
     "Unable to change full name" : "无法修改全名",
-    "APCu" : "APCu",
-    "Redis" : "Redis",
-    "Security & setup warnings" : "安全及设置警告",
-    "Sharing" : "共享",
-    "Server-side encryption" : "服务器端加密",
-    "External Storage" : "外部存储",
-    "Cron" : "计划任务",
-    "Email server" : "电子邮件服务器",
-    "Log" : "日志",
-    "Tips & tricks" : "技巧提示",
-    "Updates" : "更新",
     "Couldn't remove app." : "无法删除应用。",
     "Language changed" : "语言已修改",
     "Invalid request" : "无效请求",
@@ -108,17 +97,54 @@
     "Unlimited" : "无限",
     "Personal info" : "个人信息",
     "Sync clients" : "客户端",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
-    "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题",
-    "Warnings, errors and fatal issues" : "警告，错误和灾难性问题",
-    "Errors and fatal issues" : "错误和灾难性问题",
-    "Fatal issues only" : "仅灾难性问题",
     "None" : "无",
     "Login" : "登录",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN 管理器",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Email server" : "电子邮件服务器",
+    "Open documentation" : "打开文档",
+    "This is used for sending out notifications." : "这被用于发送通知。",
+    "Send mode" : "发送模式",
+    "Encryption" : "加密",
+    "From address" : "来自地址",
+    "mail" : "邮件",
+    "Authentication method" : "认证方法",
+    "Authentication required" : "需要认证",
+    "Server address" : "服务器地址",
+    "Port" : "端口",
+    "Credentials" : "凭证",
+    "SMTP Username" : "SMTP 用户名",
+    "SMTP Password" : "SMTP 密码",
+    "Store credentials" : "存储凭据",
+    "Test email settings" : "测试电子邮件设置",
+    "Send email" : "发送邮件",
+    "Server-side encryption" : "服务器端加密",
+    "Enable server-side encryption" : "启用服务器端加密",
+    "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密被启用，之后上传到服务器的所有文件都将服务器上加密。只有当启用状态的加密模块支持解密并且所有的先决条件(例如，设定恢复键)得到满足时才能解除加密。",
+    "Be aware that encryption always increases the file size." : "请注意，加密会增加文件大小。",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定期备份数据有利于保证数据完整，并且确保备份您的加密数据和加密密钥。",
+    "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
+    "Enable encryption" : "启用加密",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
+    "Select default encryption module:" : "选择默认的加密模块：",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "你需要升级你的加密密钥 (旧版 ownCloud <= 8.0) 。 请在应用中启用 \\\"Default encryption module\\\" 并运行 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "您需要将加密密钥从旧版(ownCloud<=8.0)迁移到新版。",
+    "Start migration" : "开始迁移",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
+    "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题",
+    "Warnings, errors and fatal issues" : "警告，错误和灾难性问题",
+    "Errors and fatal issues" : "错误和灾难性问题",
+    "Fatal issues only" : "仅灾难性问题",
+    "Log" : "日志",
+    "What to log" : "记录日志",
+    "Download logfile" : "下载日志文件",
+    "More" : "更多",
+    "Less" : "更少",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
+    "Security & setup warnings" : "安全及设置警告",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
     "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." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
@@ -130,7 +156,15 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你不是安装在网域根目录而且又使用系统定时计划任务，那么可以导致 URL 链接生成问题。为了避免这些问题，请在你的 Config.php 文件中设置 \\\"overwrite.cli.url\\\" 选项为 webroot 安装根目录 (建议: \\\"%s\\\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "由于下面的错误，无法通过 CLI 执行定时计划任务:",
     "All checks passed." : "所有检查已通过。",
-    "Open documentation" : "打开文档",
+    "Cron" : "计划任务",
+    "Last cron job execution: %s." : "上次定时任务执行于： %s.",
+    "Last cron job execution: %s. Something seems wrong." : "上次定时任务执行于: %s. 似乎有些问题。",
+    "Cron was not executed yet!" : "定时任务还未被执行！",
+    "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
+    "Version" : "版本",
+    "Sharing" : "共享",
     "Allow apps to use the Share API" : "允许应用软件使用共享API",
     "Allow users to share via link" : "允许用户通过链接分享文件",
     "Allow public uploads" : "允许公开上传",
@@ -147,44 +181,7 @@
     "Exclude groups from sharing" : "在分享中排除组",
     "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "允许在共享对话框中的自动补全用户名。如果被禁用，需要输入用户全名。",
-    "Last cron job execution: %s." : "上次定时任务执行于： %s.",
-    "Last cron job execution: %s. Something seems wrong." : "上次定时任务执行于: %s. 似乎有些问题。",
-    "Cron was not executed yet!" : "定时任务还未被执行！",
-    "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。",
-    "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
-    "Enable server-side encryption" : "启用服务器端加密",
-    "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
-    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密被启用，之后上传到服务器的所有文件都将服务器上加密。只有当启用状态的加密模块支持解密并且所有的先决条件(例如，设定恢复键)得到满足时才能解除加密。",
-    "Be aware that encryption always increases the file size." : "请注意，加密会增加文件大小。",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定期备份数据有利于保证数据完整，并且确保备份您的加密数据和加密密钥。",
-    "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
-    "Enable encryption" : "启用加密",
-    "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
-    "Select default encryption module:" : "选择默认的加密模块：",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "你需要升级你的加密密钥 (旧版 ownCloud <= 8.0) 。 请在应用中启用 \\\"Default encryption module\\\" 并运行 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "您需要将加密密钥从旧版(ownCloud<=8.0)迁移到新版。",
-    "Start migration" : "开始迁移",
-    "This is used for sending out notifications." : "这被用于发送通知。",
-    "Send mode" : "发送模式",
-    "Encryption" : "加密",
-    "From address" : "来自地址",
-    "mail" : "邮件",
-    "Authentication method" : "认证方法",
-    "Authentication required" : "需要认证",
-    "Server address" : "服务器地址",
-    "Port" : "端口",
-    "Credentials" : "凭证",
-    "SMTP Username" : "SMTP 用户名",
-    "SMTP Password" : "SMTP 密码",
-    "Store credentials" : "存储凭据",
-    "Test email settings" : "测试电子邮件设置",
-    "Send email" : "发送邮件",
-    "What to log" : "记录日志",
-    "Download logfile" : "下载日志文件",
-    "More" : "更多",
-    "Less" : "更少",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
+    "Tips & tricks" : "技巧提示",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite 被用作数据库。对于较大数据量的安装和使用，我们建议您切换到不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
     "How to do backups" : "如何做备份",
@@ -193,7 +190,6 @@
     "Improving the config.php" : "正在优化 config.php",
     "Theming" : "主题",
     "Hardening and security guidance" : "强化和安全指南",
-    "Version" : "版本",
     "Developer documentation" : "开发者文档",
     "Experimental applications ahead" : "未来的实验应用",
     "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "实验应用程序没有在安全性的问题上作过多检查，新的或已知的不稳定 BUG 都在开发中。安装它们可能会导致数据丢失或安全漏洞。",
@@ -243,13 +239,13 @@
     "Change password" : "修改密码",
     "Language" : "语言",
     "Help translate" : "帮助翻译",
-    "Name" : "名称",
-    "Username" : "用户名",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
     "iOS app" : "iOS 应用",
     "Show First Run Wizard again" : "再次显示首次运行向导",
+    "Name" : "名称",
+    "Username" : "用户名",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
     "Show user backend" : "显示用户后端",
@@ -268,6 +264,10 @@
     "change full name" : "更改全名",
     "set new password" : "设置新密码",
     "change email address" : "修改电子邮箱地址",
-    "Default" : "默认"
+    "Default" : "默认",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "External Storage" : "外部存储",
+    "Updates" : "更新"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file