Merge branch 'soon' into staging

This commit is contained in:
yflory 2021-02-26 14:48:53 +01:00
commit f7a08af49f
2 changed files with 8 additions and 2 deletions

View file

@ -1233,5 +1233,8 @@
"admin_cat_performance": "Performance",
"redo": "Rétablir",
"undo": "Annuler",
"addOptionalPassword": "Ajouter un mot de passe (optionnel)"
"addOptionalPassword": "Ajouter un mot de passe (optionnel)",
"fm_cantUploadHere": "Impossible d'importer un fichier ici",
"importError": "Impossible d'importer (mauvais format)",
"oo_lostEdits": "Vos récentes modifications non sauvegardées n'ont pas pu être récupérées après la synchronisation du nouveau contenu."
}

View file

@ -1233,5 +1233,8 @@
"pad_settings_hide": "Hide",
"pad_settings_show": "Show",
"settings_colortheme_custom": "Custom",
"addOptionalPassword": "Add a password (optional)"
"addOptionalPassword": "Add a password (optional)",
"importError": "Failed to import (wrong format)",
"fm_cantUploadHere": "Can't upload a file here",
"oo_lostEdits": "Unfortunately your recent unsaved edits could not be recovered after synchronising new content."
}