diff --git a/apps/twofactor_backupcodes/l10n/zh_CN.js b/apps/twofactor_backupcodes/l10n/zh_CN.js
index 2e5842f7ce948c7667006da1a7b01fe694b15c59..fb910ba0e2cbe0cc7e899214c18a097fa7502dde 100644
--- a/apps/twofactor_backupcodes/l10n/zh_CN.js
+++ b/apps/twofactor_backupcodes/l10n/zh_CN.js
@@ -14,11 +14,11 @@ OC.L10N.register(
     "Generate backup codes" : "生成备用码",
     "You created two-factor backup codes for your account" : "您已经为账号创建了两步验证的备用码",
     "Second-factor backup codes" : "两步验证备用码",
-    "You have enabled two-factor authentication but have not yet generated backup codes. Be sure to do this in case you lose access to your second factor." : "您已启用双因素认证但还没有生成备用码。请确保您进行了这一操作以防您不能访问您的第二因素。",
+    "You have enabled two-factor authentication but have not yet generated backup codes. Be sure to do this in case you lose access to your second factor." : "您已启用两步认证但还没有生成备用码。请确保您进行了这一操作以防您不能访问您的第二因素。",
     "Backup code" : "备用码",
     "Use backup code" : "使用备用码",
-    "Two factor backup codes" : "双因素备用码",
-    "A two-factor auth backup codes provider" : "一个双因素认证备用码提供者",
+    "Two factor backup codes" : "两步验证备用码",
+    "A two-factor auth backup codes provider" : "一个两步验证备用码提供者",
     "Use one of the backup codes you saved when setting up two-factor authentication." : "在设置双因素认证时使用您保存的其中一个备用码",
     "Submit" : "提交",
     "Backup codes have been generated. {{used}} of {{total}} codes have been used." : "备用码已经生成。已经使用了 {{used}} (共 {{total}}) 个备用码。",
diff --git a/apps/twofactor_backupcodes/l10n/zh_CN.json b/apps/twofactor_backupcodes/l10n/zh_CN.json
index 115931a58105bd8fc8ce33142d17c6e4e44fc6fd..3f032b85f567bb52a7522daf105e24a079034cc2 100644
--- a/apps/twofactor_backupcodes/l10n/zh_CN.json
+++ b/apps/twofactor_backupcodes/l10n/zh_CN.json
@@ -12,11 +12,11 @@
     "Generate backup codes" : "生成备用码",
     "You created two-factor backup codes for your account" : "您已经为账号创建了两步验证的备用码",
     "Second-factor backup codes" : "两步验证备用码",
-    "You have enabled two-factor authentication but have not yet generated backup codes. Be sure to do this in case you lose access to your second factor." : "您已启用双因素认证但还没有生成备用码。请确保您进行了这一操作以防您不能访问您的第二因素。",
+    "You have enabled two-factor authentication but have not yet generated backup codes. Be sure to do this in case you lose access to your second factor." : "您已启用两步认证但还没有生成备用码。请确保您进行了这一操作以防您不能访问您的第二因素。",
     "Backup code" : "备用码",
     "Use backup code" : "使用备用码",
-    "Two factor backup codes" : "双因素备用码",
-    "A two-factor auth backup codes provider" : "一个双因素认证备用码提供者",
+    "Two factor backup codes" : "两步验证备用码",
+    "A two-factor auth backup codes provider" : "一个两步验证备用码提供者",
     "Use one of the backup codes you saved when setting up two-factor authentication." : "在设置双因素认证时使用您保存的其中一个备用码",
     "Submit" : "提交",
     "Backup codes have been generated. {{used}} of {{total}} codes have been used." : "备用码已经生成。已经使用了 {{used}} (共 {{total}}) 个备用码。",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 81833c829f075d8ea7cce1624b6f8796b8e0f230..735e3e5f4ba07374923860e43a545f75769de422 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -364,9 +364,11 @@ OC.L10N.register(
     "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "La sécurité renforcée est activée pour votre compte. Choisissez un second facteur pour l'authentification :",
     "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "Impossible de charger au moins l'une de vos méthodes activées d'authentification à deux facteurs . Veuillez contacter votre administrateur.",
     "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "L'authentification en deux étapes a été imposée mais n'est pas configurée sur votre compte. Contactez votre administrateur pour avoir de l'aide.",
+    "Set up two-factor authentication" : "Paramétrer l'authentification à double facteur",
     "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "L'authentification en deux étapes a été imposée mais n'est pas configurée sur votre compte. Utilisez un de vos codes de secours pour vous connecter ou contactez votre administrateur pour avoir de l'aide.",
     "Use backup code" : "Utiliser un code de récupération",
     "Cancel log in" : "Annuler l'authentification",
+    "Setup two-factor authentication" : "Paramétrer l'authentification à double facteur",
     "Error while validating your second factor" : "Erreur lors de la validation de votre second facteur",
     "Access through untrusted domain" : "Accès à partir d'un domaine non approuvé",
     "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Veuillez contacter votre administrateur. Si vous êtes un administrateur, éditez la variable \"trusted_domains\" dans le fichier config/config.php comme l'exemple dans le fichier config/config.sample.php.",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 1967c237fd78ba17e93397d7c167923b13c01299..12327f714f36edd3994bc94ade3bdc0598c7d8f5 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -362,9 +362,11 @@
     "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "La sécurité renforcée est activée pour votre compte. Choisissez un second facteur pour l'authentification :",
     "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "Impossible de charger au moins l'une de vos méthodes activées d'authentification à deux facteurs . Veuillez contacter votre administrateur.",
     "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "L'authentification en deux étapes a été imposée mais n'est pas configurée sur votre compte. Contactez votre administrateur pour avoir de l'aide.",
+    "Set up two-factor authentication" : "Paramétrer l'authentification à double facteur",
     "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "L'authentification en deux étapes a été imposée mais n'est pas configurée sur votre compte. Utilisez un de vos codes de secours pour vous connecter ou contactez votre administrateur pour avoir de l'aide.",
     "Use backup code" : "Utiliser un code de récupération",
     "Cancel log in" : "Annuler l'authentification",
+    "Setup two-factor authentication" : "Paramétrer l'authentification à double facteur",
     "Error while validating your second factor" : "Erreur lors de la validation de votre second facteur",
     "Access through untrusted domain" : "Accès à partir d'un domaine non approuvé",
     "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Veuillez contacter votre administrateur. Si vous êtes un administrateur, éditez la variable \"trusted_domains\" dans le fichier config/config.php comme l'exemple dans le fichier config/config.sample.php.",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 06002ea185ea5c778b41f12a922c5f7d3a6bee47..ede8bdfc6ed6346f659a2ea3c9f9796d9667df39 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -364,9 +364,13 @@ OC.L10N.register(
     "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "La sicurezza migliorata è abilitata per il tuo account. Scegli un secondo fattore per l'autenticazione:",
     "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "Impossibile caricare almeno uno dei metodi di autenticazione a due fattori. Contatta il tuo amministratore.",
     "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "L'autenticazione a due fattori è applicata, ma non è stata configurata nel tuo account. Contatta il tuo amministratore per assistenza.",
+    "Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication." : "L'autenticazione a due fattori è applicata, ma non è stata configurata nel tuo account. Continua per configurare l'autenticazione a due fattori.",
+    "Set up two-factor authentication" : "Configura l'autenticazione a due fattori",
     "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "L'autenticazione a due fattori è applicata, ma non è stata configurata nel tuo account. Utilizza uno dei tuoi codici di backup per accedere o contatta il tuo amministratore per assistenza.",
     "Use backup code" : "Usa il codice di backup",
     "Cancel log in" : "Annulla l'accesso",
+    "Setup two-factor authentication" : "Configura l'autenticazione a due fattori",
+    "Enhanced security is enforced for your account. Choose wich provider to set up:" : "La sicurezza migliorata è abilitata per il tuo account. Scegli quale fornitore configurare:",
     "Error while validating your second factor" : "Errore durante la convalida del tuo secondo fattore",
     "Access through untrusted domain" : "Accedi tramite un dominio non attendibile",
     "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Contatta il tuo amministratore. Se sei un amministratore, modifica l'impostazione \"trusted_domains\" in config/config.php come l'esempio disponibile in config/config.sample.php.",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index b9c6200ddda1c7c6eaf74f7d24675f1c48a9907f..9d69fa679a9a2fcfd25f6bc6296d43eafbfffe52 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -362,9 +362,13 @@
     "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "La sicurezza migliorata è abilitata per il tuo account. Scegli un secondo fattore per l'autenticazione:",
     "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "Impossibile caricare almeno uno dei metodi di autenticazione a due fattori. Contatta il tuo amministratore.",
     "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "L'autenticazione a due fattori è applicata, ma non è stata configurata nel tuo account. Contatta il tuo amministratore per assistenza.",
+    "Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication." : "L'autenticazione a due fattori è applicata, ma non è stata configurata nel tuo account. Continua per configurare l'autenticazione a due fattori.",
+    "Set up two-factor authentication" : "Configura l'autenticazione a due fattori",
     "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "L'autenticazione a due fattori è applicata, ma non è stata configurata nel tuo account. Utilizza uno dei tuoi codici di backup per accedere o contatta il tuo amministratore per assistenza.",
     "Use backup code" : "Usa il codice di backup",
     "Cancel log in" : "Annulla l'accesso",
+    "Setup two-factor authentication" : "Configura l'autenticazione a due fattori",
+    "Enhanced security is enforced for your account. Choose wich provider to set up:" : "La sicurezza migliorata è abilitata per il tuo account. Scegli quale fornitore configurare:",
     "Error while validating your second factor" : "Errore durante la convalida del tuo secondo fattore",
     "Access through untrusted domain" : "Accedi tramite un dominio non attendibile",
     "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Contatta il tuo amministratore. Se sei un amministratore, modifica l'impostazione \"trusted_domains\" in config/config.php come l'esempio disponibile in config/config.sample.php.",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 2ef8effba05cddc63d5c5a7d6f6e9f258bb94e05..e8fa91be27a478362f28b5cddd9b9d7591c06713 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -80,7 +80,7 @@ OC.L10N.register(
     "read-only" : "somente leitura",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de arquivo","{count} arquivo conflita"],
     "One file conflict" : "Conflito em um arquivo",
-    "New Files" : "Novos Arquivos",
+    "New Files" : "Novos arquivos",
     "Already existing files" : "Arquivos já existentes",
     "Which files do you want to keep?" : "Quais arquivos você quer manter?",
     "If you select both versions, the copied file will have a number added to its name." : "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 4e4b3ec83680279f3a65bdbf666e5b93e96968d8..f44cacfe52bda2c470a863a464f1d81557597ed0 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -78,7 +78,7 @@
     "read-only" : "somente leitura",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de arquivo","{count} arquivo conflita"],
     "One file conflict" : "Conflito em um arquivo",
-    "New Files" : "Novos Arquivos",
+    "New Files" : "Novos arquivos",
     "Already existing files" : "Arquivos já existentes",
     "Which files do you want to keep?" : "Quais arquivos você quer manter?",
     "If you select both versions, the copied file will have a number added to its name." : "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index bc379543ac81c536d7faabcb5db214ccb18c1af2..96f84d2d0e52fcadcca51873230157f837243581 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -364,9 +364,13 @@ OC.L10N.register(
     "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "您的账户已启用安全增强。请选择第二种验证方式。",
     "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "无法载入您启用的任何两步验证方法。请联系管理员。",
     "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "两步验证是强制性的，但您的账户似乎未做配置。请联系管理员获得支持。",
+    "Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication." : "两步验证是强制性的，但您的账户未做配置。请联系管理员配置两步验证。",
+    "Set up two-factor authentication" : "配置两步验证",
     "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "两步验证是强制性的，但您的账户似乎未做配置。使用您的备份代码登录或联系管理员。",
     "Use backup code" : "使用备用口令",
     "Cancel log in" : "取消登录",
+    "Setup two-factor authentication" : "配置两步验证",
+    "Enhanced security is enforced for your account. Choose wich provider to set up:" : "您的账户已启用安全增强。请选择提供者进行配置：",
     "Error while validating your second factor" : "验证您的第二项时出错",
     "Access through untrusted domain" : "通过不被信任的域名访问",
     "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "请联系您的管理员。如果您就是管理员，请参照 config.sample.php 中的示例编辑 config/config.php 中的  \"trusted_domains\" 设置。",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 49fdbeb2ef6e9fcb807bd032e77c90cbc143f572..6d985d9e5b74099d039f4a8fe37ef9e9050ff2be 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -362,9 +362,13 @@
     "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "您的账户已启用安全增强。请选择第二种验证方式。",
     "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "无法载入您启用的任何两步验证方法。请联系管理员。",
     "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "两步验证是强制性的，但您的账户似乎未做配置。请联系管理员获得支持。",
+    "Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication." : "两步验证是强制性的，但您的账户未做配置。请联系管理员配置两步验证。",
+    "Set up two-factor authentication" : "配置两步验证",
     "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "两步验证是强制性的，但您的账户似乎未做配置。使用您的备份代码登录或联系管理员。",
     "Use backup code" : "使用备用口令",
     "Cancel log in" : "取消登录",
+    "Setup two-factor authentication" : "配置两步验证",
+    "Enhanced security is enforced for your account. Choose wich provider to set up:" : "您的账户已启用安全增强。请选择提供者进行配置：",
     "Error while validating your second factor" : "验证您的第二项时出错",
     "Access through untrusted domain" : "通过不被信任的域名访问",
     "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "请联系您的管理员。如果您就是管理员，请参照 config.sample.php 中的示例编辑 config/config.php 中的  \"trusted_domains\" 设置。",
diff --git a/lib/l10n/ps.js b/lib/l10n/ps.js
new file mode 100644
index 0000000000000000000000000000000000000000..b4e283e27a398e0f50571712d5c7daa6cebebb16
--- /dev/null
+++ b/lib/l10n/ps.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "شسیب",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "شسیب",
+    "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "شسیب"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ps.json b/lib/l10n/ps.json
new file mode 100644
index 0000000000000000000000000000000000000000..8ad0966d66ef829e3f41a2cdab271cf3d5bad7fa
--- /dev/null
+++ b/lib/l10n/ps.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "شسیب",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "شسیب",
+    "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "شسیب"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file