diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
index 61a2f085a08264081a69d9bc8060f87639e7e9bf..9e4517d63cdb2380865439598805bbab02fa7b6d 100644
--- a/apps/files_encryption/l10n/ja.php
+++ b/apps/files_encryption/l10n/ja.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "不明なエラー",
+"Missing recovery key password" => "復旧キーのパスワードがありません",
+"Please repeat the recovery key password" => "復旧キーのパスワードをもう一度入力",
+"Repeated recovery key password does not match the provided recovery key password" => "入力された復旧キーのパスワードが一致しません。",
 "Recovery key successfully enabled" => "リカバリ用のキーを正常に有効にしました",
 "Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
 "Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
+"Please provide the old recovery password" => "古い復旧キーのパスワードを入力",
+"Please provide a new recovery password" => "新しい復旧キーのパスワードを入力",
+"Please repeat the new recovery password" => "新しい復旧キーのパスワードをもう一度入力",
 "Password successfully changed." => "パスワードを変更できました。",
 "Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
 "Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index ac700a97d4a4218b119717633e9e3fb280727776..dedf3b759b4c521d067c16b1cada286720ad5940 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -88,6 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "送信",
 "Set expiration date" => "有効期限を設定",
 "Expiration date" => "有効期限",
+"Adding user..." => "ユーザー追加中...",
 "group" => "グループ",
 "Resharing is not allowed" => "再共有は許可されていません",
 "Shared in {item} with {user}" => "{item} 内で {user} と共有中",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index e51697320e5f4ffb875b894d2e44f642fb8cd7ee..1074ad1b2173aa003462ef7d17659e75bf172a2c 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -66,7 +66,7 @@ $TRANSLATIONS = array(
 "So-so password" => "So-so-passord",
 "Good password" => "Bra passord",
 "Strong password" => "Sterkt passord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettserver er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke fungere.",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, f.eks. å koble opp ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
 "Error occurred while checking server setup" => "Feil oppstod ved sjekking av server-oppsett",
 "Shared" => "Delt",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 2deb44c1b30b39a33a4f711274ff36e690de2970..0cac9dd446c4378e814a8f69c0f464832aa77697 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index a3d68ce1dcb630f763cf9fcef7d8d4e630b2f730..457a5ca05668f381f01b2dc0ddd31331399b4d98 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index c23c3508aff39382b7339986f09bd9f5358ff568..0173a314c0289beaa1088f9594c03217d2a5478f 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 1426cba24ae4c2c01fe14effa89351434c5e579d..53441ce6c4848295f5bfb39b4ea31764cccf9f2f 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index b240d545a696e0af9f6bd87ca5f5d3d4988b931c..15dceb256e31c454aa896c49375b194f5ea36737 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index dd727868f8ac0c30501b21d399bc698734191873..c9ab8d9785e762c7af813b9b85ff7cbd58e1292a 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 636dce121822b57822ff9db4ceb3ba7aa3b97f03..ac4241695c9eed09c15193365a18697ccf47e6b0 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 334d673904bdc8081c698e4ba6b3176268375231..2079d1a4a6dccb3ecfd7f2efa27b08a366daade2 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -273,126 +273,126 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:508
+#: private/share/share.php:509
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:515
+#: private/share/share.php:516
 #, php-format
 msgid "You are not allowed to share %s"
 msgstr ""
 
-#: private/share/share.php:545
+#: private/share/share.php:546
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:551
+#: private/share/share.php:552
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:560
+#: private/share/share.php:561
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: private/share/share.php:573 private/share/share.php:601
+#: private/share/share.php:574 private/share/share.php:602
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:581
+#: private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:588
+#: private/share/share.php:589
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:642
+#: private/share/share.php:643
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: private/share/share.php:671
+#: private/share/share.php:672
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:678
+#: private/share/share.php:679
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:902
+#: private/share/share.php:903
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:963
+#: private/share/share.php:964
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:1001
+#: private/share/share.php:1002
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: private/share/share.php:1009
+#: private/share/share.php:1010
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: private/share/share.php:1135
+#: private/share/share.php:1136
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:1142
+#: private/share/share.php:1143
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:1148
+#: private/share/share.php:1149
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1840
+#: private/share/share.php:1841
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1850
+#: private/share/share.php:1851
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1876
+#: private/share/share.php:1877
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1890
+#: private/share/share.php:1891
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1904
+#: private/share/share.php:1905
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 6329d5628577f276d719e9d3d1d0950cca90b2da..a41340342b15f0f830104490f6dc4f771a3f229c 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -232,126 +232,126 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: share/share.php:508
+#: share/share.php:509
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: share/share.php:515
+#: share/share.php:516
 #, php-format
 msgid "You are not allowed to share %s"
 msgstr ""
 
-#: share/share.php:545
+#: share/share.php:546
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: share/share.php:551
+#: share/share.php:552
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: share/share.php:560
+#: share/share.php:561
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: share/share.php:573 share/share.php:601
+#: share/share.php:574 share/share.php:602
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: share/share.php:581
+#: share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: share/share.php:588
+#: share/share.php:589
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: share/share.php:642
+#: share/share.php:643
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: share/share.php:671
+#: share/share.php:672
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: share/share.php:678
+#: share/share.php:679
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: share/share.php:902
+#: share/share.php:903
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: share/share.php:963
+#: share/share.php:964
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: share/share.php:1001
+#: share/share.php:1002
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: share/share.php:1009
+#: share/share.php:1010
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: share/share.php:1135
+#: share/share.php:1136
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: share/share.php:1142
+#: share/share.php:1143
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: share/share.php:1148
+#: share/share.php:1149
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: share/share.php:1840
+#: share/share.php:1841
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: share/share.php:1850
+#: share/share.php:1851
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: share/share.php:1876
+#: share/share.php:1877
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: share/share.php:1890
+#: share/share.php:1891
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: share/share.php:1904
+#: share/share.php:1905
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index f8f99e1b636230a03b89894851d5288d669f488a..82ebe7df4fa66c6a1c1b854e6dff2384d1f03f90 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index b6cd78523127ddc0f22d07df905510fac1b6fa38..a2483f773c5c36c952b17d9ddb3b708f96739ef0 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 8d9aad981f4ada853b0946625081271bac50fce1..e85687618fb919a5a9323b81c92698252e2e2692 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 96c38db5d4ddb9735f7413619d8d04f2a9fb80e2..6c82b4e266bd45ef9f264a323880f46dcdf680fb 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -37,7 +37,7 @@ $TRANSLATIONS = array(
 "Wrong password" => "Mot de passe incorrect",
 "No user supplied" => "Aucun utilisateur fourni",
 "Please provide an admin recovery password, otherwise all user data will be lost" => "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
-"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau.",
+"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
 "Unable to change password" => "Impossible de modifier le mot de passe",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
@@ -139,7 +139,7 @@ $TRANSLATIONS = array(
 "Enforce expiration date" => "Imposer la date d'expiration",
 "Allow resharing" => "Autoriser le repartage",
 "Restrict users to only share with users in their groups" => "N'autoriser les partages qu'entre membres de même groupes",
-"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les fichiers partagés",
+"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
 "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. ",
 "Security" => "Sécurité",
@@ -192,8 +192,8 @@ $TRANSLATIONS = array(
 "Your email address" => "Votre adresse e-mail",
 "Fill in an email address to enable password recovery and receive notifications" => "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
 "Profile picture" => "Photo de profil",
-"Upload new" => "Téléverser une nouvelle",
-"Select new from Files" => "Sélectionner une nouvelle depuis les Fichiers",
+"Upload new" => "Nouvelle depuis votre ordinateur",
+"Select new from Files" => "Nouvelle depuis les Fichiers",
 "Remove image" => "Supprimer l'image",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
 "Your avatar is provided by your original account." => "Votre avatar est fourni par votre compte original.",