From bfae7215b1c5d3be7956fc52faf145c726699471 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 19 Jun 2020 17:23:54 +0200 Subject: [PATCH 1/5] Translated using Weblate (English) Currently translated at 100.0% (1298 of 1298 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1297 of 1297 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1296 of 1296 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1295 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 50ca92b93..2aee6cc19 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1391,5 +1391,8 @@ "support_addAttachment": "Add attachment", "notification_padSharedTeam": "{0} has shared a pad with the team {2}: {1}", "notification_fileSharedTeam": "{0} has shared a file with the team {2}: {1}", - "notification_folderSharedTeam": "{0} has shared a pad with the team {2}: {1}" + "notification_folderSharedTeam": "{0} has shared a folder with the team {2}: {1}", + "oo_refresh": "Refresh", + "oo_refreshText": "This document has been updated", + "support_category": "Choose a category" } From 571a0ccae7115640370e99acf9850ab91694da51 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 19 Jun 2020 17:23:54 +0200 Subject: [PATCH 2/5] Translated using Weblate (German) Currently translated at 100.0% (1295 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ Translated using Weblate (German) Currently translated at 99.2% (1285 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ --- www/common/translations/messages.de.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index e792c6cc8..a2d09ca8c 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -21,7 +21,7 @@ "button_newslide": "Neue Präsentation", "button_newwhiteboard": "Neues Whiteboard", "button_newkanban": "Neues Kanban", - "common_connectionLost": "Die Verbindung zum Server ist abgebrochen
Du verwendest jetzt das Dokument schreibgeschützt, bis die Verbindung wieder funktioniert.", + "common_connectionLost": "Die Verbindung zum Server ist abgebrochen
Du kannst das Dokument nicht bearbeiten, bis die Verbindung wieder funktioniert.", "websocketError": "Verbindung zum Websocket fehlgeschlagen...", "typeError": "Dieses Dokument ist nicht mit der ausgewählten Anwendung kompatibel", "onLogout": "Du bist ausgeloggt. {0}Klicke hier{1}, um dich wieder einzuloggen,
oder drücke Escape, um dein Pad schreibgeschützt zu benutzen.", @@ -1123,7 +1123,7 @@ "properties_unknownUser": "{0} unbekannte(r) Benutzer", "fm_morePads": "Mehr", "fc_openInCode": "Im Code-Editor öffnen", - "uploadFolder_modal_title": "Optionen für Ordnerupload", + "uploadFolder_modal_title": "Optionen für Hochladen des Ordners", "uploadFolder_modal_filesPassword": "Passwort für Dateien", "uploadFolder_modal_owner": "Eigene Dateien", "uploadFolder_modal_forceSave": "Dateien im CryptDrive speichern", @@ -1181,7 +1181,7 @@ "team_rosterPromote": "Befördern", "team_rosterDemote": "Degradieren", "team_rosterKick": "Aus dem Team entfernen", - "team_inviteButton": "Kontakte einladen", + "team_inviteButton": "Mitglieder einladen", "team_leaveButton": "Dieses Team verlassen", "team_leaveConfirm": "Wenn du dieses Team verlässt, verlierst du den Zugriff auf das dazugehörige CryptDrive, den Chatverlauf und andere Inhalte. Bist du sicher?", "team_owner": "Eigentümer", @@ -1381,5 +1381,15 @@ "settings_safeLinkDefault": "Sichere Links sind nun standardmäßig aktiviert. Bitte verwende zum Kopieren von Links das Menü Teilen und nicht die Adressleiste des Browsers.", "info_imprintFlavour": "Rechtliche Informationen über die Administratoren dieses Servers.", "info_privacyFlavour": "Unsere Datenschutzerklärung beschreibt, wie wir deine Daten verarbeiten.", - "user_about": "Über CryptPad" + "user_about": "Über CryptPad", + "support_cat_all": "Alle", + "support_cat_other": "Anderes", + "support_cat_account": "Benutzerkonto", + "support_cat_data": "Datenverlust", + "notification_folderSharedTeam": "{0} hat einen Ordner mit dem Team {2} geteilt: {1}", + "notification_fileSharedTeam": "{0} hat eine Datei mit dem Team {2} geteilt: {1}", + "notification_padSharedTeam": "{0} hat ein Pad mit dem Team {2} geteilt: {1}", + "support_addAttachment": "Anhang hinzufügen", + "support_attachments": "Anhänge", + "support_cat_bug": "Fehlerbericht" } From f71e31beafb63693c89c0c093314b98d9d59529d Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 19 Jun 2020 17:23:54 +0200 Subject: [PATCH 3/5] Translated using Weblate (French) Currently translated at 100.0% (1298 of 1298 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ Translated using Weblate (French) Currently translated at 100.0% (1297 of 1297 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ Translated using Weblate (French) Currently translated at 100.0% (1295 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ Translated using Weblate (French) Currently translated at 100.0% (1295 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ Translated using Weblate (French) Currently translated at 99.6% (1290 of 1295 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 3a4536b1c..ef33ad144 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1164,7 +1164,7 @@ "team_inviteModalButton": "Inviter", "team_pcsSelectLabel": "Sauver dans", "team_pcsSelectHelp": "Créer un pad dans le drive d'une équipe rend cette équipe propriétaire du pad si l'option est cochée.", - "team_invitedToTeam": "{0} vous à inviter à rejoindre l'équipe : {1}", + "team_invitedToTeam": "{0} vous a invité à rejoindre l'équipe : {1}", "team_kickedFromTeam": "{0} vous a exclu de l'équipe : {1}", "team_acceptInvitation": "{0} a accepté votre offre de rejoindre l'équipe : {1}", "team_declineInvitation": "{0} a refusé votre offre de rejoindre l'équipe : {1}", @@ -1381,5 +1381,18 @@ "support_languagesPreamble": "L'équipe de support parle les langues suivantes :", "info_privacyFlavour": "Description de la confidentialité de vos données.", "user_about": "À propos de CryptPad", - "info_imprintFlavour": "Informations légales sur les administateurs de cette instance." + "info_imprintFlavour": "Informations légales sur les administateurs de cette instance.", + "support_cat_all": "Tout", + "support_cat_other": "Autre", + "support_cat_bug": "Rapport de bug", + "support_cat_data": "Perte de données", + "support_cat_account": "Compte utilisateur", + "notification_folderSharedTeam": "{0} a partagé un dossier avec l'équipe {2} : {1}", + "notification_fileSharedTeam": "{0} a partagé un fichier avec l'équipe {2} : {1}", + "notification_padSharedTeam": "{0} a partagé un pad avec l'équipe {2} : {1}", + "support_addAttachment": "Ajouter une pièce jointe", + "support_attachments": "Pièces jointes", + "oo_refreshText": "Ce document a été mis à jour", + "oo_refresh": "Recharger", + "support_category": "Choisir une catégorie" } From 4eb38f531b496deba2c4c872adbecee9c7e07268 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 19 Jun 2020 19:53:49 +0200 Subject: [PATCH 4/5] Translated using Weblate (German) Currently translated at 100.0% (1298 of 1298 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ --- www/common/translations/messages.de.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index a2d09ca8c..d40c9e552 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1391,5 +1391,8 @@ "notification_padSharedTeam": "{0} hat ein Pad mit dem Team {2} geteilt: {1}", "support_addAttachment": "Anhang hinzufügen", "support_attachments": "Anhänge", - "support_cat_bug": "Fehlerbericht" + "support_cat_bug": "Fehlerbericht", + "oo_refresh": "Neu laden", + "support_category": "Wähle eine Kategorie", + "oo_refreshText": "Dieses Dokument wurde aktualisiert" } From 2dd0dd36c5d748998c79f10bbe444ed2b520a719 Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 19 Jun 2020 14:10:46 -0400 Subject: [PATCH 5/5] remove hardcoded translations and tweak a hardcoded timeout value --- www/common/onlyoffice/inner.js | 9 ++++----- www/support/ui.js | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index a995752fb..9e6e1c972 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -55,7 +55,8 @@ define([ var CHECKPOINT_INTERVAL = 100; var DISPLAY_RESTORE_BUTTON = false; var NEW_VERSION = 2; - var PENDING_TIMEOUT = 30000; // XXX it feels like maybe this should be shorter + var PENDING_TIMEOUT = 30000; + var READ_ONLY_REFRESH_DATA_DELAY = 15000; var debug = function (x) { if (!window.CP_DEV_MODE) { return; } @@ -558,8 +559,6 @@ define([ xhr.send(null); }; -Messages.oo_refresh = "Refresh"; // XXX read-only corner popup when receiving remote updates -Messages.oo_refreshText = "out of date"; // XXX read-only corner popup when receiving remote updates var refreshReadOnly = function () { var cancel = h('button.cp-corner-cancel', Messages.cancel); var reload = h('button.cp-corner-primary', [ @@ -619,8 +618,8 @@ Messages.oo_refreshText = "out of date"; // XXX read-only corner popup when rece APP.refreshPopup = true; // Don't "spam" the user instantly and no more than - // 1 popup every 30s - setTimeout(refreshReadOnly, 30000); + // 1 popup every 15s + setTimeout(refreshReadOnly, READ_ONLY_REFRESH_DATA_DELAY); return; } ooChannel.send(obj.data.msg); diff --git a/www/support/ui.js b/www/support/ui.js index 2be5cff1e..c17bd9f5b 100644 --- a/www/support/ui.js +++ b/www/support/ui.js @@ -103,8 +103,6 @@ define([ return true; }; -Messages.support_category = "Category"; // XXX - var makeCategoryDropdown = function (ctx, container, onChange, all) { var categories = ['account', 'data', 'bug', 'other']; if (all) { categories.push('all'); }