Merge branch 'staging' into sfPassword

customize.dist/translations/messages.ja.js

@@ -0,0 +1,14 @@
+/*
+ * You can override the translation text using this file.
+ * The recommended method is to make a copy of this file (/customize.dist/translations/messages.{LANG}.js)
+   in a 'customize' directory (/customize/translations/messages.{LANG}.js).
+ * If you want to check all the existing translation keys, you can open the internal language file
+   but you should not change it directly (/common/translations/messages.{LANG}.js)
+*/
+define(['/common/translations/messages.ja.js'], function (Messages) {
+    // Replace the existing keys in your copied file here:
+    // Messages.button_newpad = "New Rich Text Document";
+
+    return Messages;
+});
+

www/common/translations/messages.fr.json

@@ -1221,5 +1221,9 @@
     "team_title": "Équipe : {0}",
     "team_quota": "Limite de stockage de votre équipe",
     "drive_quota": "Votre limite de stockage",
-    "settings_codeBrackets": "Fermer automatiquement les parenthèses"
+    "settings_codeBrackets": "Fermer automatiquement les parenthèses",
+    "team_viewers": "Lecteurs",
+    "drive_sfPassword": "Votre dossier partagé {0} n'est plus disponible. Il a soit été supprimé par son propriétaire ou il est protégé par un nouveau mot de passe. Vous pouvez supprimer ce dossier de votre CryptDrive ou retrouver l'accès en tapant le nouveau mot de passe.",
+    "drive_sfPasswordError": "Mot de passe incorrect",
+    "password_error_seed": "Pad introuvable !<br>Cette erreur peut provenir de deux facteurs. Soit un mot de passe a été ajouté ou modifié, soit le pad a été supprimé par son propriétaire."
 }

www/common/translations/messages.ja.json

@@ -0,0 +1 @@
+{}

www/common/translations/messages.json

@@ -1221,5 +1221,9 @@
     "team_title": "Team: {0}",
     "team_quota": "Your team's storage limit",
     "drive_quota": "Your storage limit",
-    "settings_codeBrackets": "Auto-close brackets"
+    "settings_codeBrackets": "Auto-close brackets",
+    "team_viewers": "Viewers",
+    "drive_sfPassword": "Your shared folder {0} is no longer available. It has either been deleted by its owner or it is now protected with a new password. You can remove this folder from your CryptDrive, or recover access using the new password.",
+    "drive_sfPasswordError": "Wrong password",
+    "password_error_seed": "Pad not found!<br>This error can be caused by two factors: either a password was added/changed, or the pad has been deleted from the server."
 }