diff --git a/www/admin/inner.js b/www/admin/inner.js index 7b88fcbdf..c1f2ccb9d 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -109,19 +109,6 @@ define([ }); return $div; }; - Messages.admin_archiveTitle = "Archive documents"; // XXX - Messages.admin_archiveHint = "Make a document unavailable without deleting it permanently. It will be placed in an 'archive' directory and deleted after a few days (configurable in the server configuration file)."; // XXX - Messages.admin_archiveButton = "Archive"; - - Messages.admin_unarchiveTitle = "Restore archived documents"; // XXX - Messages.admin_unarchiveHint = "Restore a document that has previously been archived"; - Messages.admin_unarchiveButton = "Restore"; - - Messages.admin_archiveInput = "Document URL"; - Messages.admin_archiveInput2 = "Document password"; - Messages.admin_archiveInval = "Invalid document"; - Messages.restoredFromServer = "Document restored"; - Messages.archivedFromServer = "Document archived"; var archiveForm = function (archive, $div, $button) { var label = h('label', { for: 'cp-admin-archive' }, Messages.admin_archiveInput); diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js index bbc149d5b..80195c71c 100644 --- a/www/common/inner/common-mediatag.js +++ b/www/common/inner/common-mediatag.js @@ -22,8 +22,6 @@ define([ MediaTag.setDefaultConfig('pdf', { viewer: '/common/pdfjs/web/viewer.html' }); - Messages.mediatag_saveButton = "Save"; // XXX - Messages.mediatag_loadButton = "Load attachment"; // XXX MediaTag.setDefaultConfig('download', { text: Messages.mediatag_saveButton, textDl: Messages.mediatag_loadButton, @@ -373,10 +371,6 @@ define([ }); }; - Messages.pad_mediatagShare = "Share file"; // XXX - Messages.pad_mediatagOpen = "Open file"; // XXX - Messages.mediatag_notReady = "Not ready"; // XXX - var mediatagContextMenu; MT.importMediaTagMenu = function (common) { if (mediatagContextMenu) { return mediatagContextMenu; } diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js index c10af2770..7b8601f13 100644 --- a/www/common/sframe-common-file.js +++ b/www/common/sframe-common-file.js @@ -47,7 +47,6 @@ define([ return 'cp-fileupload-element-' + String(Math.random()).substring(2); }; - Messages.fileTableHeader = "Downloads and uploads"; // XXX var tableHeader = h('div.cp-fileupload-header', [ h('div.cp-fileupload-header-title', h('span', Messages.fileTableHeader)), h('div.cp-fileupload-header-close', h('span.fa.fa-times')), @@ -626,8 +625,6 @@ define([ * As updateDLProgress but for folders * @param {number} progressValue Progression of download, between 0 and 1 */ - Messages.download_zip = "Building ZIP file..."; // XXX - Messages.download_zip_file = "File {0}/{1}"; // XXX var updateProgress = function (progressValue) { var text = Math.round(progressValue*100) + '%'; if (Array.isArray(data.list)) { diff --git a/www/common/toolbar.js b/www/common/toolbar.js index 761ecce78..20cac8337 100644 --- a/www/common/toolbar.js +++ b/www/common/toolbar.js @@ -994,7 +994,6 @@ MessengerUI, Messages) { var metadataMgr = config.metadataMgr; var privateData = metadataMgr.getPrivateData(); if (!privateData.notifications) { - Messages.allowNotifications = "Allow notifications"; // XXX var allowNotif = h('div.cp-notifications-gotoapp', h('p', Messages.allowNotifications)); pads_options.unshift(h("hr")); pads_options.unshift(allowNotif); @@ -1395,7 +1394,6 @@ MessengerUI, Messages) { toolbar.isErrorState = bool; // Stop kickSpinner toolbar.title.toggleClass('cp-toolbar-unsync', bool); // "read only" next to the title if (bool && toolbar.spinner) { - Messages.offline = "OFFLINE"; // XXX toolbar.spinner.text(Messages.offline); } else { kickSpinner(toolbar, config); diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index fe873ea34..f7e9ce178 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1469,5 +1469,7 @@ "loading_state_0": "Oberfläche vorbereiten", "loading_state_5": "Dokument rekonstruieren", "error_unhelpfulScriptError": "Skriptfehler: Siehe Konsole im Browser für Details", - "documentID": "Kennung des Dokuments" + "documentID": "Kennung des Dokuments", + "errorPopupBlocked": "Für die Funktionsweise von CryptPad ist es erforderlich, dass neue Tabs geöffnet werden können. Bitte erlaube Pop-up-Fenster in der Adressleiste deines Browsers. Diese Fenster werden niemals dafür verwendet, dir Werbung anzuzeigen.", + "unableToDisplay": "Das Dokument kann nicht angezeigt werden. Drücke ESC, um die Seite neu zu laden." } diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 195814bf5..ef5bfe47d 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -41,7 +41,7 @@ "saved": "Enregistré", "synced": "Tout est enregistré", "deleted": "Supprimé", - "deletedFromServer": "Pad supprimé du serveur", + "deletedFromServer": "Document supprimé", "mustLogin": "Vous devez être enregistré pour avoir accès à cette page", "disabledApp": "Cette application a été désactivée. Pour plus d'information, veuillez contacter l'administrateur de ce CryptPad.", "realtime_unrecoverableError": "Une erreur critique est survenue. Cliquez sur OK pour recharger la page.", @@ -554,7 +554,7 @@ "upload_notEnoughSpace": "Il n'y a pas assez d'espace libre dans votre CryptDrive pour ce fichier.", "upload_notEnoughSpaceBrief": "Pas assez d'espace", "upload_tooLarge": "Ce fichier dépasse la taille maximale autorisée pour votre compte.", - "upload_tooLargeBrief": "Fichier trop volumineux", + "upload_tooLargeBrief": "Le fichier dépasse la limite de {0} Mo", "upload_choose": "Choisir un fichier", "upload_pending": "En attente", "upload_cancelled": "Annulé", @@ -1470,6 +1470,30 @@ "tag_add": "Ajouter", "error_unhelpfulScriptError": "Erreur de script : consultez la console du navigateur pour plus de détails", "documentID": "Référence du document", - "unableToDisplay": "Impossible d'afficher le document. Veuillez recharger la page avec la touche Échap.", - "errorPopupBlocked": "CryptPad doit pouvoir ouvrir de nouveaux onglets pour fonctionner. Veuillez autoriser les fenêtres pop-up dans la barre d'adresse de votre navigateur. Ces fenêtres ne seront jamais utilisées pour vous montrer de la publicité." + "unableToDisplay": "Impossible d'afficher le document. Veuillez recharger la page avec la touche Échap. Si le problème persiste, veuillez contacter le support.", + "errorPopupBlocked": "CryptPad doit pouvoir ouvrir de nouveaux onglets pour fonctionner. Veuillez autoriser les fenêtres pop-up dans la barre d'adresse de votre navigateur. Ces fenêtres ne seront jamais utilisées pour vous montrer de la publicité.", + "settings_mediatagSizeHint": "Taille maximale en mégaoctets (Mo) pour le chargement automatique des pièces jointes (images, vidéos, pdf) intégrés dans les documents. Les pièces jointes dont la taille est supérieure à la taille spécifiée peuvent être chargés manuellement. Utilisez \"-1\" pour toujours charger automatiquement les pièces jointes.", + "settings_mediatagSizeTitle": "Limite de téléchargement automatique", + "mediatag_notReady": "Merci de compléter le téléchargement", + "pad_mediatagOpen": "Ouvrir ce fichier", + "pad_mediatagShare": "Partager ce fichier", + "mediatag_saveButton": "Sauvegarder", + "Offline": "Déconnecté", + "download_zip_file": "Fichier {0}/{1}", + "download_zip": "Construction du fichier ZIP...", + "fileTableHeader": "Téléchargements et imports", + "allowNotifications": "Autoriser les notifications", + "archivedFromServer": "Document archivé", + "restoredFromServer": "Document restauré", + "admin_archiveInval": "Document invalide", + "admin_archiveInput2": "Mot de passe du document", + "admin_archiveInput": "URL du document", + "admin_unarchiveButton": "Restaurer", + "admin_unarchiveHint": "Restaurer un document qui avait été précédemment archivé", + "admin_unarchiveTitle": "Restaurer les documents", + "admin_archiveButton": "Archiver", + "admin_archiveHint": "Rendre un document indisponible sans le supprimer définitivement. Il sera placé dans un répertoire \"archive\" et supprimé après quelques jours (configurable dans le fichier de configuration du serveur).", + "admin_archiveTitle": "Archiver les documents", + "braveWarning": "Il semble que vous utilisiez actuellement le navigateur Brave. Nous avons reçu des rapports d'utilisateurs ne pouvant pas confirmer le formulaire de paiement en raison de paramètres de confidentialité stricts sur ce navigateur. Si le bouton de paiement ne fonctionne pas, vous pouvez essayer avec un autre navigateur ou nous contacter avec le formulaire de support pour trouver une solution alternative.", + "mediatag_loadButton": "Charger la pièce jointe" } diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 3657d6b58..3e7869ee2 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -43,7 +43,7 @@ "saved": "Saved", "synced": "Everything is saved", "deleted": "Deleted", - "deletedFromServer": "Pad deleted from the server", + "deletedFromServer": "Document destroyed", "mustLogin": "You must be logged in to access this page", "disabledApp": "This application has been disabled. Contact the administrator of this CryptPad for more information.", "realtime_unrecoverableError": "An unrecoverable error has occured. Click OK to reload.", @@ -571,7 +571,7 @@ "upload_notEnoughSpace": "There is not enough space for this file in your CryptDrive.", "upload_notEnoughSpaceBrief": "Not enough space", "upload_tooLarge": "This file exceeds the maximum upload size allowed for your account.", - "upload_tooLargeBrief": "File too large", + "upload_tooLargeBrief": "File exceeds the {0}MB limit", "upload_choose": "Choose a file", "upload_pending": "Pending", "upload_cancelled": "Cancelled", @@ -1470,6 +1470,30 @@ "tag_edit": "Edit", "error_unhelpfulScriptError": "Script Error: See browser console for details", "documentID": "Document identifier", - "unableToDisplay": "Unable to display the document. Please press Esc to reload the page.", - "errorPopupBlocked": "CryptPad needs to be able to open new tabs to operate. Please allow popup windows in your browser's address bar. These windows will never be used to show you advertising." + "unableToDisplay": "Unable to display the document. Please press Esc to reload the page. If the problem persists, please contact support.", + "errorPopupBlocked": "CryptPad needs to be able to open new tabs to operate. Please allow popup windows in your browser's address bar. These windows will never be used to show you advertising.", + "braveWarning": "It seems you are currently using the Brave browser. We have received reports of users being unable to confirm the payment form due to strict privacy settings on this browser. If the payment button does not work, you can try with a different browser or contact us with the Support form to find an alternative solution.", + "admin_archiveTitle": "Archive documents", + "admin_archiveHint": "Make a document unavailable without deleting it permanently. It will be placed in an 'archive' directory and deleted after a few days (configurable in the server configuration file).", + "admin_archiveButton": "Archive", + "admin_unarchiveTitle": "Restore documents", + "admin_unarchiveHint": "Restore a document that had previously been archived", + "admin_unarchiveButton": "Restore", + "admin_archiveInput": "Document URL", + "admin_archiveInput2": "Document password", + "admin_archiveInval": "Invalid document", + "restoredFromServer": "Document restored", + "archivedFromServer": "Document archived", + "allowNotifications": "Allow notifications", + "fileTableHeader": "Downloads and uploads", + "download_zip": "Building ZIP file...", + "download_zip_file": "File {0}/{1}", + "Offline": "Offline", + "mediatag_saveButton": "Save", + "pad_mediatagShare": "Share file", + "pad_mediatagOpen": "Open file", + "mediatag_notReady": "Please complete the download", + "settings_mediatagSizeTitle": "Automatic download limit", + "settings_mediatagSizeHint": "Maximum size in megabytes (MB) for automatically loading media elements (images, videos, pdf) embedded into documents. Elements bigger than the specified size can be loaded manually. Use \"-1\" to always load the media elements automatically.", + "mediatag_loadButton": "Load attachment" } diff --git a/www/settings/inner.js b/www/settings/inner.js index 9051d3c34..8b5095cba 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -577,8 +577,6 @@ define([ cb(form); }, true); - Messages.settings_mediatagSizeTitle = "Autodownload size in MegaBytes (MB)"; // XXX - Messages.settings_mediatagSizeHint = 'Maximum size for automatically loading media elements (images, videos, pdf) embedded into the pads. Elements bigger than the specified size can be loaded manually. Use "-1" to always load the media elements automatically.'; // XXX makeBlock('mediatag-size', function(cb) { var $inputBlock = $('
', { 'class': 'cp-sidebarlayout-input-block', diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js index bab1603dc..30c43aef1 100644 --- a/www/whiteboard/inner.js +++ b/www/whiteboard/inner.js @@ -335,7 +335,7 @@ define([ var maxSizeStr = Messages._getKey('formattedMB', [Util.bytesToMegabytes(MAX_IMAGE_SIZE)]); var addImageToCanvas = function (img) { if (img.src && img.src.length > MAX_IMAGE_SIZE) { - UI.warn(Messages._getKey('upload_tooLargeBrief', [maxSizeStr])); // XXX update key + UI.warn(Messages._getKey('upload_tooLargeBrief', [maxSizeStr])); return; } var w = img.width;