Merge branch 'soon' into staging

www/common/translations/messages.fr.json

@@ -1165,7 +1165,7 @@
     "admin_broadcastCancel": "Effacer le message",
     "admin_broadcastActive": "Message actif",
     "admin_broadcastButton": "Envoyer",
-    "admin_broadcastHint": "Envoyez un message à tous les utilisateurs de cette instance. Tous les utilisateurs existants et nouveaux le recevront sous forme de notification. Prévisualisez les messages avant de les envoyer avec <b>Aperçu de la notification</b>. Les aperçus de notifications ont une icône rouge et ne sont visibles que par vous.",
+    "admin_broadcastHint": "Envoyez un message à tous les utilisateurs de cette instance. Tous les utilisateurs existants et nouveaux le recevront sous forme de notification. Prévisualisez les messages avant de les envoyer avec \"Aperçu de la notification\". Les aperçus de notifications ont une icône rouge et ne sont visibles que par vous.",
     "admin_broadcastTitle": "Message d'annonce",
     "broadcast_surveyURL": "Lien vers l'enquête",
     "admin_surveyActive": "Ouvrir l'enquête",
@@ -1183,5 +1183,49 @@
     "admin_maintenanceTitle": "Maintenance",
     "admin_cat_broadcast": "Annonces",
     "oo_cantMigrate": "Ce tableur dépasse la taille maximale de téléchargement et est trop grand pour être mis à jour.",
-    "footer_roadmap": "Feuille de route"
+    "footer_roadmap": "Feuille de route",
+    "calendar_noNotification": "Aucun",
+    "calendar_addNotification": "Ajouter rappel",
+    "calendar_notifications": "Rappels",
+    "settings_notifCalendarCheckbox": "Activer les notifications d'agenda",
+    "settings_notifCalendarHint": "Activer/désactiver les notifications pour les évenements à venir.",
+    "settings_notifCalendarTitle": "Notifications de calendrier",
+    "reminder_date": "<b>{0}</b> le {1}",
+    "reminder_time": "<b>{0}</b> aujourd'hui à {1}",
+    "reminder_minutes": "<b>{0}</b> commencera dans {1} minute(s)",
+    "reminder_inProgressAllDay": "Aujourd'hui : <b>{0}</b>",
+    "reminder_inProgress": "<b>{0}</b> a commencé à {1}",
+    "reminder_now": "<b>{0}</b> a commencé",
+    "reminder_missed": "<b>{0}</b> a eu lieu le {1}",
+    "calendar_more": "{0} de plus",
+    "calendar_days": "Jours",
+    "calendar_hours": "Heures",
+    "calendar_minutes": "Minutes",
+    "calendar_allDay": "Journée entière",
+    "calendar_location": "Lieu : {0}",
+    "calendar_loc": "Lieu",
+    "calendar_title": "Titre",
+    "calendar_update": "Modifier",
+    "calendar_dateTimeRange": "{0} {1} - {2}",
+    "calendar_dateRange": "{0} - {1}",
+    "calendar_newEvent": "Nouvel évènement",
+    "calendar_import": "Ajouter à mes calendriers",
+    "calendar_errorNoCalendar": "Aucun agenda modifiable sélectionné",
+    "calendar_deleteOwned": "Il restera accessible pour les autres utilisateurs avec qui il a été partagé.",
+    "calendar_deleteTeamConfirm": "Êtes-vous sûr de vouloir supprimer ce calendrier de l'équipe ?",
+    "calendar_deleteConfirm": "Êtes-vous sûr de vouloir supprimer ce calendrier de votre compte ?",
+    "calendar_today": "Aujourd'hui",
+    "calendar_month": "Mois",
+    "calendar_week": "Semaine",
+    "calendar_day": "Jour",
+    "calendar_new": "Nouvel agenda",
+    "calendar_default": "Mon agenda",
+    "calendar": "Agenda",
+    "calendar_before": "avant",
+    "calendar_weekNumber": "Semaine {0}",
+    "calendar_import_temp": "Importer ce calendrier",
+    "pad_goToAnchor": "Aller à cette ancre",
+    "settings_padOpenLinkLabel": "Activer l'ouverture directe des liens",
+    "settings_padOpenLinkHint": "Cette option permet d'ouvrir les liens dans un document texte sans fenêtre d’aperçu",
+    "settings_padOpenLinkTitle": "Ouvrir les lien avec un seul clic"
 }

www/common/translations/messages.json

@@ -436,7 +436,7 @@
     "settings_padSpellcheckLabel": "Enable spell check in rich text pads",
     "settings_padOpenLinkTitle": "Open links on first click",
     "settings_padOpenLinkHint": "With this option you can open embedded links on click without the preview popup",
-    "settings_padOpenLinkLabel": "Enable direct link opening rich text pads",
+    "settings_padOpenLinkLabel": "Enable direct link opening",
     "settings_ownDriveTitle": "Update Account",
     "settings_ownDriveHint": "Older accounts do not have access to the latest features, due to technical reasons. A free update will enable current features, and prepare your CryptDrive for future updates.",
     "settings_ownDriveButton": "Upgrade your account",
@@ -1174,7 +1174,7 @@
     "admin_surveyActive": "Open survey",
     "broadcast_surveyURL": "Survey link",
     "admin_broadcastTitle": "Broadcast message",
-    "admin_broadcastHint": "Send a message to all users on this instance. All existing and new users will receive it as a notification. Preview messages before sending them with <b>Preview notification</b>. Preview notifications have a red icon and are visible only to you.",
+    "admin_broadcastHint": "Send a message to all users on this instance. All existing and new users will receive it as a notification. Preview messages before sending them with \"Preview notification\". Preview notifications have a red icon and are visible only to you.",
     "admin_broadcastButton": "Send",
     "admin_broadcastActive": "Active message",
     "admin_broadcastCancel": "Delete message",
@@ -1186,5 +1186,46 @@
     "settings_deleteContinue": "Delete my account",
     "settings_deleteSubscription": "Manage my subscription",
     "footer_roadmap": "Roadmap",
-    "oo_cantMigrate": "This sheet exceeds the maximum upload size and is too large to be migrated."
+    "oo_cantMigrate": "This sheet exceeds the maximum upload size and is too large to be migrated.",
+    "pad_goToAnchor": "Go to anchor",
+    "calendar_import_temp": "Import this calendar",
+    "calendar_weekNumber": "Week {0}",
+    "calendar_before": "before",
+    "calendar": "Calendar",
+    "calendar_default": "My calendar",
+    "calendar_new": "New calendar",
+    "calendar_day": "Day",
+    "calendar_week": "Week",
+    "calendar_month": "Month",
+    "calendar_today": "Today",
+    "calendar_deleteConfirm": "Are you sure you want to delete this calendar from your account?",
+    "calendar_deleteTeamConfirm": "Are you sure you want to delete this calendar from the team?",
+    "calendar_deleteOwned": "It will remain visible to other users it has been shared with.",
+    "calendar_errorNoCalendar": "No editable calendar selected",
+    "calendar_import": "Add to my calendars",
+    "calendar_newEvent": "New event",
+    "calendar_dateRange": "{0} - {1}",
+    "calendar_dateTimeRange": "{0} {1} - {2}",
+    "calendar_update": "Update",
+    "calendar_title": "Title",
+    "calendar_loc": "Location",
+    "calendar_location": "Location: {0}",
+    "calendar_allDay": "All day",
+    "calendar_minutes": "Minutes",
+    "calendar_hours": "Hours",
+    "calendar_days": "Days",
+    "calendar_more": "{0} more",
+    "reminder_missed": "<b>{0}</b> took place on {1}",
+    "reminder_now": "<b>{0}</b> has started",
+    "reminder_inProgress": "<b>{0}</b> has started on {1}",
+    "reminder_inProgressAllDay": "Today: <b>{0}</b>",
+    "reminder_minutes": "<b>{0}</b> will start in {1} minute(s)",
+    "reminder_time": "<b>{0}</b> today at {1}",
+    "reminder_date": "<b>{0}</b> on {1}",
+    "settings_notifCalendarTitle": "Calendar notifications",
+    "settings_notifCalendarHint": "Enable/disable all notifications for upcoming calendar events.",
+    "settings_notifCalendarCheckbox": "Enable calendar notifications",
+    "calendar_notifications": "Reminders",
+    "calendar_addNotification": "Add reminder",
+    "calendar_noNotification": "None"
 }