Merge branch 'staging' into reminders

pull/1/head
yflory 4 years ago
commit be45337d11

@ -135,10 +135,6 @@ define([
Exports.mergeAnonDrive = 1;
};
var setCreateReadme = function () {
Exports.createReadme = 1;
};
Exports.loginOrRegister = function (uname, passwd, isRegister, shouldImport, cb) {
if (typeof(cb) !== 'function') { return; }
@ -372,7 +368,6 @@ define([
proxy.curvePrivate = opt.curvePrivate;
proxy.login_name = uname;
proxy[Constants.displayNameKey] = uname;
setCreateReadme();
if (shouldImport) {
setMergeAnonDrive();
} else {
@ -436,9 +431,6 @@ define([
if (Exports.mergeAnonDrive) {
loginOpts.mergeAnonDrive = 1;
}
if (Exports.createReadme) {
loginOpts.createReadme = 1;
}
h = Hash.getLoginURL(h, loginOpts);
var parser = document.createElement('a');

@ -120,10 +120,6 @@ define(req, function(AppConfig, Default, Language) {
}
};
messages.driveReadme = '["BODY",{"class":"cke_editable cke_editable_themed cke_contents_ltr cke_show_borders","contenteditable":"true","spellcheck":"false","style":"color: rgb(51, 51, 51);"},' +
'[["H1",{},["'+messages.readme_welcome+'"]],["P",{},["'+messages.readme_p1+'"]],["P",{},["'+messages.readme_p2+'"]],["HR",{},[]],["H2",{},["'+messages.readme_cat1+'",["BR",{},[]]]],["UL",{},[["LI",{},["'+messages._getKey("readme_cat1_l1", ['",["STRONG",{},["'+messages.newButton+'"]],"', '",["STRONG",{},["'+messages.type.pad+'"]],"'])+'"]],["LI",{},["'+messages.readme_cat1_l2+'"]],["LI",{},["'+messages._getKey("readme_cat1_l3", ['",["STRONG",{},["'+messages.fm_unsortedName+'"]],"'])+'",["UL",{},[["LI",{},["'+messages._getKey("readme_cat1_l3_l1", ['",["STRONG",{},["'+messages.fm_rootName+'"]],"'])+'"]],["LI",{},["'+messages.readme_cat1_l3_l2+'"]]]]]],["LI",{},["'+messages._getKey("readme_cat1_l4", ['",["STRONG",{},["'+messages.fm_trashName+'"]],"'])+'",["BR",{},[]]]]]],["P",{},[["BR",{},[]]]],["H2",{},["'+messages.readme_cat2+'",["BR",{},[]]]],["UL",{},[["LI",{},["'+messages._getKey("readme_cat2_l1", ['",["STRONG",{},["'+messages.shareButton+'"]],"', '",["STRONG",{},["'+messages.edit+'"]],"', '",["STRONG",{},["'+messages.view+'"]],"'])+'"]],["LI",{},["'+messages.readme_cat2_l2+'"]]]],["P",{},[["BR",{},[]]]],["H2",{},["'+messages.readme_cat3+'"]],["UL",{},[["LI",{},["'+messages.readme_cat3_l1+'"]],["LI",{},["'+messages.readme_cat3_l2+'"]],["LI",{},["'+messages.readme_cat3_l3+'",["BR",{},[]]]]]]],' +
'{"metadata":{"defaultTitle":"' + messages.driveReadmeTitle + '","title":"' + messages.driveReadmeTitle + '"}}]';
return messages;
});

@ -108,6 +108,7 @@ define([
// only display the legal part of the footer if it has content
if (terms || Pages.privacyLink || Pages.imprintLink) {
legalFooter = footerCol('footer_legal', [
terms,
Pages.privacyLink,
Pages.imprintLink,
]);

@ -61,7 +61,7 @@ server {
# add_header X-Frame-Options "SAMEORIGIN";
set $coop '';
if ($uri ~ ^\/sheet\/.*$) { set $coop 'same-origin'; }
if ($uri ~ ^\/(sheet|presentation|doc)\/.*$) { set $coop 'same-origin'; }
# Enable SharedArrayBuffer in Firefox (for .xlsx export)
add_header Cross-Origin-Resource-Policy cross-origin;
@ -116,7 +116,7 @@ server {
set $unsafe 0;
# the following assets are loaded via the sandbox domain
# they unfortunately still require exceptions to the sandboxing to work correctly.
if ($uri = "/sheet/inner.html") { set $unsafe 1; }
if ($uri ~ ^\/(sheet|doc|presentation)\/inner.html.*$) { set $unsafe 1; }
if ($uri ~ ^\/common\/onlyoffice\/.*\/index\.html.*$) { set $unsafe 1; }
# everything except the sandbox domain is a privileged scope, as they might be used to handle keys
@ -159,7 +159,7 @@ server {
# /api/config is loaded once per page load and is used to retrieve
# the caching variable which is applied to every other resource
# which is loaded during that session.
location = /api/config {
location ~ ^/api/(config|broadcast).*$ {
proxy_pass http://localhost:3000;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
@ -204,7 +204,7 @@ server {
# The nodejs server has some built-in forwarding rules to prevent
# URLs like /pad from resulting in a 404. This simply adds a trailing slash
# to a variety of applications.
location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams)$ {
location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc)$ {
rewrite ^(.*)$ $1/ redirect;
}

@ -43,7 +43,6 @@ define(function() {
/* You can display a link to your own privacy policy in the static pages footer.
* To do so, set the following value to the absolute URL of your privacy policy.
*/
//config.privacy = '/privacy.html';
// config.privacy = 'https://xwiki.com/en/company/PrivacyPolicy';
/* Cryptpad apps use a common API to display notifications to users

@ -2552,16 +2552,6 @@ define([
console.log('onLogout: disconnect');
postMessage("DISCONNECT");
});
}).nThen(function (waitFor) {
if (common.createReadme || sessionStorage.createReadme) {
var data = {
driveReadme: Messages.driveReadme,
driveReadmeTitle: Messages.driveReadmeTitle,
};
postMessage("CREATE_README", data, waitFor(function (e) {
if (e && e.error) { return void console.error(e.error); }
}));
}
}).nThen(function (waitFor) {
if (common.migrateAnonDrive || sessionStorage.migrateAnonDrive) {
common.mergeAnonDrive(waitFor());

@ -879,38 +879,6 @@ define([
});
};
/**
* add a "What is CryptPad?" pad in the drive
* data
* - driveReadme
* - driveReadmeTitle
*/
Store.createReadme = function (clientId, data, cb) {
require(['/common/cryptget.js'], function (Crypt) {
var hash = Hash.createRandomHash('pad');
Crypt.put(hash, data.driveReadme, function (e) {
if (e) {
return void cb({ error: "Error while creating the default pad:"+ e});
}
var href = '/pad/#' + hash;
var channel = Hash.hrefToHexChannelId(href, null);
var fileData = {
href: href,
channel: channel,
title: data.driveReadmeTitle,
owners: [ store.proxy.edPublic ],
readme: true
};
Store.addPad(clientId, fileData, cb);
}, {
metadata: {
owners: [ store.proxy.edPublic ],
},
});
});
};
/**
* Merge the anonymous drive into the user drive at registration
* data

@ -11,7 +11,6 @@ define([
// Ready
CONNECT: Store.init,
DISCONNECT: Store.disconnect,
CREATE_README: Store.createReadme,
MIGRATE_ANON_DRIVE: Store.migrateAnonDrive,
PING: function (cId, data, cb) { cb(); },
CACHE_DISABLE: Store.disableCache,

@ -830,7 +830,7 @@ define([
}
}
if (!Hash.isValidChannel(el.channel)) {
// XXX delete channel?
// XXX delete channel? replace with parsed.channel?
console.error('Remove invalid channel', el.channel, el);
// toClean.push(id);
}

@ -212,7 +212,6 @@ define([
var options = parsed.getOptions();
if (options.loginOpts) {
var loginOpts = Utils.Hash.decodeDataOptions(options.loginOpts);
if (loginOpts.createReadme) { Cryptpad.createReadme = true; }
if (loginOpts.mergeAnonDrive) { Cryptpad.migrateAnonDrive = true; }
// Remove newPadOpts from the hash
delete options.loginOpts;

@ -243,7 +243,6 @@
"contacts_online": "En aquesta sala hi ha una altra persona en línia",
"fm_rootName": "Documents",
"fm_trashName": "Paperera",
"fm_unsortedName": "Fitxers desordenats",
"fm_filesDataName": "Tots els fitxers",
"fm_templateName": "Plantilles",
"fm_searchName": "Cerca",

@ -239,7 +239,6 @@
"contacts_online": "Ein anderer Benutzer dieses Raumes ist online",
"fm_rootName": "Dokumente",
"fm_trashName": "Papierkorb",
"fm_unsortedName": "Unsortierte Dateien",
"fm_filesDataName": "Alle Dateien",
"fm_templateName": "Vorlagen",
"fm_searchName": "Suchen",
@ -541,25 +540,8 @@
"header_homeTitle": "Zur CryptPad-Hauptseite",
"help_genericMore": "Erfahre mehr über die Nutzung von CryptPad, indem du unsere <a>Documentation</a> liest.",
"driveReadmeTitle": "Was ist CryptPad?",
"readme_welcome": "Willkommen zu CryptPad!",
"readme_p1": "Willkommen zu CryptPad, hier kannst du deine Notizen aufschreiben, allein oder mit Kontakten.",
"readme_p2": "Dieses Dokument gibt dir einen kurzen Überblick, wie du CryptPad verwenden kannst, um Notizen zu schreiben, sie zu organisieren und mit anderen zusammen zu arbeiten.",
"readme_cat1": "Lerne dein CryptDrive kennen",
"readme_cat1_l1": "Ein Pad erstellen: Klicke in deinem CryptDrive auf {0} und dann auf {1}.",
"readme_cat1_l2": "Ein Pad deines CryptDrives öffnen: Doppelklicke auf das Symbol eines Pads, um es zu öffnen.",
"readme_cat1_l3": "Deine Pads organisieren: Wenn du eingeloggt bist, wird jedes geöffnete Pad im Bereich {0} deines CryptDrives angezeigt.",
"readme_cat1_l3_l1": "Im Bereich {0} deines CryptDrives kannst du Dateien zwischen Ordnern verschieben oder neue Ordner anlegen.",
"readme_cat1_l3_l2": "Ein Rechtsklick auf die Symbole zeigt zusätzliche Menüfunktionen.",
"readme_cat1_l4": "Verschiebe deine alten Pads in den Papierkorb: Du kannst deine Pads in den {0} verschieben, genauso wie du es bei einem Ordner machst.",
"readme_cat2": "Pads wie ein Profi gestalten",
"edit": "Bearbeiten",
"view": "Ansehen",
"readme_cat2_l1": "Die Schaltfläche {0} in deinem Pad erlaubt dir, anderen einen Zugang für die Mitarbeit zu geben (entweder zum {1} oder zum {2}).",
"readme_cat2_l2": "Der Titel eines Pads kann mit einem Klick auf den Stift geändert werden",
"readme_cat3": "Entdecke CryptPad-Anwendungen",
"readme_cat3_l1": "Mit dem CryptPad Codeeditor kannst du Code wie JavaScript, Markdown oder HTML bearbeiten",
"readme_cat3_l2": "Mit dem CryptPad Präsentationseditor kannst du schnell Vorträge mit Hilfe von Markdown gestalten",
"readme_cat3_l3": "Mit der CryptPad Umfrage kannst du schnell Abstimmungen durchführen, insbesondere, um Meetings zu planen, die in den Kalender von allen passen",
"feedback_about": "Wenn du das liest, fragst du dich wahrscheinlich, weshalb dein Browser bei der Ausführung mancher Aktionen Anfragen an Webseiten sendet.",
"feedback_privacy": "Wir respektieren deine Datenschutz, aber gleichzeitig wollen wir, dass die Benutzung von CryptPad sehr leicht ist. Deshalb wollen wir erfahren, welche Funktion am wichtigsten für unsere Benutzer ist, indem wir diese mit einer genauen Parameterbeschreibung anfordern.",
"feedback_optout": "Wenn du das nicht möchtest, kannst du es in <a>deinen Einstellungen</a> deaktivieren.",

@ -191,7 +191,6 @@
"contacts_fetchHistory": "Ανάκτηση παλαιότερου ιστορικού",
"fm_rootName": "Έγγραφα",
"fm_trashName": "Σκουπίδια",
"fm_unsortedName": "Αταξινόμητα",
"fm_filesDataName": "Όλα τα αρχεία",
"fm_templateName": "Πρότυπα",
"fm_searchName": "Αναζήτηση",
@ -360,25 +359,8 @@
"header_logoTitle": "Μετάβαση στο CryptDrive σας",
"header_homeTitle": "Μετάβαση στην αρχική σελίδα του CryptPad",
"driveReadmeTitle": "Τι είναι το CryptPad;",
"readme_welcome": "Καλωσήρθατε στο CryptPad!",
"readme_p1": "Καλωσήρθατε στο CryptPad, όπου μπορείτε να έχετε τις σημειώσεις σας μόνοι σας ή με φίλους.",
"readme_p2": "Αυτό το pad έχει έναν γρήγορο οδηγό χρήσης του πως να χρησιμοποιήσετε το CryptPad για να κρατάτε σημειώσεις, να τις έχετε οργανωμένες και να δουλέψετε πάνω τους συνεργατικά.",
"readme_cat1": "Μάθετε το CryptDrive σας",
"readme_cat1_l1": "Δημιούργηστε ένα pad: Στο CryptDrive σας, κάντε \"κλικ\" στο {0} και έπειτα στο {1} και μπορείτε να δημιουργήσετε ένα pad.",
"readme_cat1_l2": "Ανοίξτε pads από το CryptDrive σας: κάντε διπλό \"κλικ\" σε ένα εικονίδιο pad για να το ανοίξετε.",
"readme_cat1_l3": "Οργάνωστε τα pads σας: Όταν είσαστε συνδεδεμένοι, κάθε pad στο οποίο έχετε πρόσβαση θα εμφανίζεται ως {0} στο τμήμα του δίσκου σας.",
"readme_cat1_l3_l1": "Μπορείτε να κάνετε \"κλικ\" και να σύρετε αρχεία μέσα σε φακέλους στον τομέα {0} του δίσκου σας και να δημιουργήσετε καινούρια αρχεία.",
"readme_cat1_l3_l2": "Θυμηθείτε να δοκιμάζετε το δεξί \"κλικ\" στα εικονίδια διότι συχνά υπάρχουν επιπρόσθετα μενού.",
"readme_cat1_l4": "Πετάξτε τα παλιά pads στα σκουπίδια: Μπορείτε να κάνετε \"κλικ\" και να σύρετε τα pads μέσα στα {0} με τον ίδιο τρόπο που τα σύρετε μέσα στους φακέλους.",
"readme_cat2": "Δημιουργείστε pads σαν επαγγελματίας",
"edit": "επεξεργασία",
"view": "προβολή",
"readme_cat2_l1": "Το κουμπί {0} στο pad σας επιτρέπει να δίνετε πρόσβαση στους συνεργάτες σας είτε να κάνουν {1} είτε να κάνουν {2} το pad.",
"readme_cat2_l2": "Αλλάξτε τον τίτλο του pad κάνοντας \"κλικ\" στο μολύβι",
"readme_cat3": "Ανακαλύψτε CryptPad εφαρμογές",
"readme_cat3_l1": "Με το CryptPad code editor, μπορείτε να συνεργαστείτε σε κώδικα όπως οι γλώσσες προγραμματισμού Javascript και markdown ή HTML και Markdown",
"readme_cat3_l2": "Με το CryptPad slide editor, μπορείτε να κάνετε γρήγορες παρουσιάσεις χρησιμοποιώντας γλώσσα Markdown",
"readme_cat3_l3": "Με το CryptPoll μπορείτε να ψηφίζετε γρήγορα, ειδικά για να ορίζετε συναντήσεις σε ημερομηνίες που ταιριάζουν με το πρόγραμμα όλων",
"feedback_about": "Εάν το διαβάζετε αυτό, πιθανότατα ήσασταν περίεργοι για ποιο λόγο το CryptPad ζητά ιστοσελίδες όταν κάνετε συγκεκριμένες ενέργειες",
"feedback_privacy": "Ενδιαφερόμαστε για την ιδιωτικότητά σας και ταυτόχρονα θέλουμε το CryptPad να είναι πολύ εύκολο στην χρήση. Χρησιμοποιούμε αυτό το αρχείο για να καταλάβουμε ποια χαρακτηριστικά του περιβάλλοντος διάδρασης ενδιαφέρουν τους χρήστες μας, με το να το ζητήσουμε σε συνδυασμό με μια παράμετρο η οποία μας δείχνει συγκεκριμένα ποια ενέργεια έγινε.",
"feedback_optout": "Εάν θα θέλατε να απέχετε, επισκεφθείτε <a href='/settings/'>τη σελίδα ρυθμίσεων</a> του λογαριασμού σας, όπου θα βρείτε ένα κουτί στο οποίο μπορείτε να ενεργοποιήσετε ή να απενεργοποιήσετε την αναπληροφόρηση"

@ -75,7 +75,6 @@
"poll_commit": "Validar",
"fm_rootName": "Documentos",
"fm_trashName": "Papelera",
"fm_unsortedName": "Sin organizar",
"fm_filesDataName": "Todos los archivos",
"fm_templateName": "Plantilla",
"fm_newButton": "Nuevo",
@ -154,25 +153,8 @@
"settings_anonymous": "No has iniciado sesión. Tus ajustes se aplicarán sólo a este navegador.",
"blog": "Blog",
"driveReadmeTitle": "¿Qué es CryptPad?",
"readme_welcome": "¡Bienvenido a CryptPad!",
"readme_p1": "Bienvenido a CryptPad, aquí es donde puedes tomar nota de las cosas solo y con tus contactos.",
"readme_p2": "Este pad es una guía rápida para aprender a usar a CryptPad para tomar notas, organizarlas y trabajar con más personas.",
"readme_cat1": "Conoce tu CryptDrive",
"readme_cat1_l1": "Crea un pad: En CryptDrive, haz clic en {0} y luego en {1} para crear un pad.",
"readme_cat1_l2": "Abrir pads desde CryptDrive: haz doble clic en un icono para abrirlo.",
"readme_cat1_l3": "Organiza tus pads: Cuando has iniciado sesión, cada pad al que accedes se quedará en tu drive en {0}.",
"readme_cat1_l3_l1": "Puedes hacer clic y arrastrar archivos en carpetas desde {0}, y crear nuevas carpetas.",
"readme_cat1_l3_l2": "Recuerda hacer clic derecho en los iconos, ya que suele haber menús adicionales.",
"readme_cat1_l4": "Elimina tus viejos pads: Haz clic y arrastra tus pads en la {0} de la misma manera que lo harías con carpetas.",
"readme_cat2": "Haz pads como un pro",
"edit": "editar",
"view": "ver",
"readme_cat2_l1": "El botón {0} en tu pad te permite dar acceso a colaboradores para {1} o {2} el pad.",
"readme_cat2_l2": "Cambia el título del pad haciendo clic en el lápiz",
"readme_cat3": "Descubre las apps CryptPad",
"readme_cat3_l1": "Con el editor de código CryptPad, puedes colaborar en código fuente, como por ejemplo JavaScript y Markdown",
"readme_cat3_l2": "Con los slides CryptPad, puedes hacer presentaciones rápidas con Markdown",
"readme_cat3_l3": "Con CryptPoll puedes hacer una encuesta rápida, especialmente útil para programar un horario que conviene a todo el mundo",
"settings_resetError": "Verificación no válida. Tu CryptDrive no fue cambiado.",
"saved": "Guardado",
"printButton": "Imprimir",

@ -246,7 +246,6 @@
"contacts_online": "Toinen käyttäjä tästä keskusteluhuoneesta on online-tilassa",
"fm_rootName": "Asiakirjat",
"fm_trashName": "Roskakori",
"fm_unsortedName": "Järjestelemättömät tiedostot",
"fm_filesDataName": "Kaikki tiedostot",
"fm_templateName": "Mallipohjat",
"fm_searchName": "Haku",
@ -716,8 +715,6 @@
"header_homeTitle": "Siirry CryptPad-kotisivulle",
"help_genericMore": "Tutustu CryptPadin toimintaan ja ominaisuuksiin <a>dokumentaatiosivuillamme</a>.",
"driveReadmeTitle": "Mikä on CryptPad?",
"readme_welcome": "Tervetuloa CryptPadiin!",
"readme_p1": "Tervetuloa CryptPadiin, täällä voit tehdä muistiinpanoja yksin tai yhteystietojesi kanssa.",
"settings_kanbanTagsOr": "TAI",
"settings_kanbanTagsAnd": "JA",
"settings_kanbanTagsHint": "Valitse, miten haluat tunnistesuodattimen toimivan useita tunnisteita käytettäessä: näytä kortit, jotka sisältävät kaikki valitut tunnisteet (JA) tai näytä kortit, jotka sisältävät jonkun tai jotkin valituista tunnisteista (TAI)",
@ -990,9 +987,6 @@
"feedback_optout": "Jos haluat jättäytyä pois tästä toiminnallisuudesta, voit tehdä sen <a>Käyttäjäasetukset</a>-sivulta löytyvän käyttäjäpalautevalintaruudun avulla.",
"feedback_privacy": "Välitämme yksityisyydestäsi, ja haluamme samalla tehdä CryptPadista mahdollisimman helppokäyttöisen. Käytämme tätä tiedostoa selvittääksemme, mitkä käyttöliittymätoiminnot ovat tärkeitä käyttäjillemme, pyytämällä sitä tehdyn toiminnon kertovan parametrin yhteydessä.",
"feedback_about": "Jos luet tätä, haluat todennäköisesti tietää, miksi CryptPad lähettää pyyntöjä web-sivuille tiettyjen toimintojen yhteydessä",
"readme_cat3_l3": "CryptPad-kyselyilä voit pitää nopeita äänestyksiä esimerkiksi kokouksien aikataulujen yhteensovittamiseksi",
"readme_cat3_l2": "CryptPad-diaeditorilla voit luoda nopeasti diaesityksiä Markdown-kielellä",
"readme_cat3_l1": "CryptPad-koodieditorilla voit työskennellä yhdessä muiden kanssa koodin, kuten Javascriptin ja Markdownin parissa",
"settings_cat_kanban": "Kanban",
"kanban_body": "Sisältö",
"logoutEverywhere": "Kirjaudu ulos kaikkialta",
@ -1000,20 +994,8 @@
"safeLinks_error": "Tämä linkki kopioitiin selaimen osoiteriviltä, eikä se anna käyttöoikeutta asiakirjaan. Ole hyvä ja käytä <i></i> <b>Jaa</b> -valikkoa jakaaksesi yhteystietojen kanssa tai kopioidaksesi linkin. <a> Lue lisää Turvalliset linkit-ominaisuudesta</a>.",
"burnAfterReading_warningAccess": "Tämä asiakirja tuhoaa itsensä. Kun napsautat allaolevaa painiketta, näet sisällön kerran, jonka jälkeen se poistetaan pysyvästi. Kun suljet tämän ikkunan, et pääse enää käyttämään asiakirjan sisältöä. Jos et ole valmis jatkamaan, voit sulkea tämän ikkunan ja tulla myöhemmin takaisin.",
"profile_info": "Muut käyttäjät voivat löytää käyttäjäprofiilisi asiakirjojen käyttäjälistoissa näkyvän avatarin avulla.",
"readme_cat3": "Löydä CryptPad-sovellukset",
"readme_cat2_l2": "Vaihda padin otsikkoa napsauttamalla lyijykynää",
"readme_cat2_l1": "Padistasi löytyvä {0}-painike antaa sinun jakaa yhteistyökumppaneillesi oikeuden [1} tai {2} padia.",
"edit": "muokata",
"view": "katsella",
"readme_cat2": "Luo padeja kuin ammattilainen",
"readme_cat1_l4": "Laita vanhat padit roskakoriin: Voit napsauttaa ja raahata padeja {0}in samalla tavalla kuin raahaisit niitä kansioihin.",
"readme_cat1_l3_l2": "Muista kokeilla hiiren oikeaa painiketta kuvakkeiden päällä, sillä niistä aukeaa usein lisävalikoita.",
"readme_cat1_l3_l1": "Voit napsauttaa ja raahata tiedostoja kansioihin CryptDrivesi {0}-osiossa ja luoda uusia kansioita.",
"readme_cat1_l3": "Järjestele padejasi: Kun olet kirjautuneena sisään, kaikki käyttämäsi padit näytetään CryptDrivesi {0}-osiossa.",
"readme_cat1_l2": "Avaa padeja CryptDrivestasi: kaksoisnapsauta padin kuvaketta avataksesi sen.",
"readme_cat1_l1": "Luo padi: Siirry CryptDriveesi, napsauta {0} ja sitten {1}, ja voit luoda padin.",
"readme_cat1": "Tutustu CryptDriveesi",
"readme_p2": "Tämä padi toimii pikaisena perehdytyksenä CryptPadin ominaisuuksiin - kuinka tehdä muistiinpanoja, järjestellä niitä ja tehdä yhteistyötä niiden parissa.",
"fm_shareFolderPassword": "Suojaa kansio salasanalla (vapaaehtoinen)",
"access_destroyPad": "Tuhoa tämä asiakirja tai kansio lopullisesti",
"fm_deletedFolder": "Poistettu kansio",

@ -243,7 +243,6 @@
"contacts_online": "Un autre utilisateur est en ligne dans ce salon",
"fm_rootName": "Documents",
"fm_trashName": "Corbeille",
"fm_unsortedName": "Fichiers non triés",
"fm_filesDataName": "Tous les fichiers",
"fm_templateName": "Modèles",
"fm_searchName": "Recherche",
@ -548,25 +547,8 @@
"header_homeTitle": "Aller sur la page d'accueil",
"help_genericMore": "Découvrez toutes les fonctionalités de CryptPad en lisant la <a>Documentation</a>.",
"driveReadmeTitle": "Qu'est-ce que CryptPad ?",
"readme_welcome": "Bienvenue dans CryptPad !",
"readme_p1": "Bienvenue dans CryptPad, le lieu où vous pouvez prendre des notes seul ou avec des contacts.",
"readme_p2": "Ce pad va vous donner un aperçu de la manière dont vous pouvez utiliser CryptPad pour prendre des notes, les organiser et travailler en groupe sur celles-ci.",
"readme_cat1": "Découvrez votre CryptDrive",
"readme_cat1_l1": "Créer un pad : Dans votre CryptDrive, cliquez sur {0} puis {1} et vous obtenez un nouveau pad.",
"readme_cat1_l2": "Ouvrir des pads depuis votre CryptDrive : Double-cliquez sur l'icone d'un pad pour l'ouvrir.",
"readme_cat1_l3": "Organiser vos pads : Quand vous êtes connecté, tous les pads auquel vous accédez sont ajoutés dans la section {0} de votre CryptDrive.",
"readme_cat1_l3_l1": "Vous pouvez cliquer et faire glisser des fichiers dans des dossiers dans la section {0} de votre CryptDrive, et créer de nouveaux dossiers.",
"readme_cat1_l3_l2": "N'hésitez pas à utiliser le clic droit sur les icones puisque des menus sont souvent disponibles.",
"readme_cat1_l4": "Déplacer des pads vers la corbeille : Vous pouvez cliquer et faire glisser vos pads dans la {0} de la même manière que vous pouvez les déposer dans des dossiers.",
"readme_cat2": "Créer des pads comme un pro",
"edit": "éditer",
"view": "voir",
"readme_cat2_l1": "Le bouton {0} dans votre pad vous permet de donner l'accès à vos collaborateurs que ce soit pour l'{1} ou pour le {2}.",
"readme_cat2_l2": "Vous pouvez changer le titre d'un pad en cliquant sur le crayon",
"readme_cat3": "Découvrez les autres applications CryptPad",
"readme_cat3_l1": "Avec l'éditeur de code de CryptPad, vous pouvez collaborer sur du code comme JavaScript ou des langages comme HTML ou Markdown",
"readme_cat3_l2": "Avec l'éditeur de présentations de CryptPad, vous pouvez réaliser des présentations rapides en utilisant Markdown",
"readme_cat3_l3": "Avec CryptPoll vous pouvez créer rapidement des sondages, et en particulier plannifier des meetings qui rentrent dans l'agenda de tout ceux qui souhaitent participer",
"feedback_about": "Si vous lisez ceci, vous vous demandez probablement pourquoi CryptPad envoie des requêtes vers des pages web quand vous réalisez certaines actions.",
"feedback_privacy": "Nous prenons au sérieux le respect de votre vie privée, et en même temps nous souhaitons rendre CryptPad très simple à utiliser. Nous utilisons cette page pour comprendre quelles fonctionnalités dans l'interface comptent le plus pour les utilisateurs, en l'appelant avec un paramètre spécifiant quelle action a été réalisée.",
"feedback_optout": "Si vous le souhaitez, vous pouvez désactiver ces requêtes en vous rendant dans <a>votre page de préférences</a>, où vous trouverez une case à cocher pour désactiver le retour d'expérience.",

@ -243,7 +243,6 @@
"contacts_online": "Un altro utente di questa stanza è online",
"fm_rootName": "Documenti",
"fm_trashName": "Cestino",
"fm_unsortedName": "File non catalogati",
"fm_filesDataName": "Tutti i file",
"fm_templateName": "Modelli",
"fm_searchName": "Cerca",
@ -418,7 +417,6 @@
"home_host": "Questa è un'istanza di CryptPad gestita indipendentemente dalla community.",
"features_f_file0": "Apri i file",
"help_genericMore": "Impara di più su cosa può fare CryptPad per te leggendo le nostre <a>FAQ</a>",
"readme_cat3_l1": "Con l'editor di codice di CryptPad, puoi collaborare su linguaggi di programmazione come Javascript e linguaggi di markdown come HTML o Markdown",
"settings_codeSpellcheckLabel": "Abilita il controllo ortografico nell'editor di codice",
"team_inviteLinkError": "Si è verificato un errore durante la creazione del link.",
"register_emailWarning1": "Puoi farlo se vuoi, ma non verrà inviato ai nostri server.",
@ -704,10 +702,7 @@
"canvas_select": "Seleziona",
"logoutEverywhere": "Esci ovunque",
"driveReadmeTitle": "Cos'è CryptPad?",
"readme_welcome": "Benvenuto in CryptPad!",
"edit": "modifica",
"readme_cat2_l2": "Modifica il titolo del pad cliccando sulla matita",
"readme_cat3": "Scopri le app di CryptPad",
"creation_passwordValue": "Password",
"password_submit": "Invia",
"properties_changePassword": "Modifica la password",
@ -755,7 +750,6 @@
"burnAfterReading_generateLink": "Clicca sul pulsante sottostante per generare un link.",
"burnAfterReading_proceed": "visualizza ed elimina",
"oo_sheetMigration_complete": "Versione aggiornata disponibile, premi OK per ricaricare.",
"readme_cat2": "Realizza pad come un professionista",
"view": "visualizza",
"timeoutError": "Un errore ha interrotto la tua connessione al server. <br>Premi <em>Esc</em> per ricaricare la pagina.",
"support_disabledTitle": "Il supporto non è abilitato",
@ -770,25 +764,13 @@
"creation_expireHours": "Ora(e)",
"creation_create": "Crea",
"convertFolderToSF_confirm": "Questa cartella deve essere convertita in una cartella condivisa perché altri possano vederla. Continuare?",
"readme_p2": "Questo pad ti mostrerà come puoi utilizzare CryptPad per prendere note, tenerle organizzate e lavorarci in modo collaborativo.",
"readme_cat1_l1": "Crea un pad: nel tuo CryptDrive clicca {0} poi {1} e poi creare un pad.",
"readme_cat1_l2": "Apri i pad dal tuo CryptDrive: fai doppio clic sull'icona di un pad per aprirlo.",
"readme_cat1_l3": "Organizza i tuoi pad: quando sei connesso ogni pad al quale accedi sarà mostrato come nella sezione {0} del tuo drive.",
"readme_cat1_l3_l2": "Ricordati di provare a cliccare con il tasto destro del mouse sulle icone perché spesso ci sono menu aggiuntivi.",
"readme_cat1_l4": "Metti i vecchi pad nel cestino: puoi cliccare e trascinare i tuoi pad nel {0} nello stesso modo nel quale li trascini nelle cartelle.",
"readme_cat3_l3": "Con CryptPoll puoi fare veloci sondaggi, soprattutto per programmare riunioni con date che vadano bene a tutti",
"creation_expire": "Pad effimero",
"creation_newPadModalDescription": "Clicca su un tipo di pad per crearlo. Puoi anche premere <b>Tab</b> per selezionare il tipo e premere <b>Invio</b> per confermare.",
"password_info": "Il pad che stai cercando di aprire non esiste più o è protetto con una password. Inserisci la password corretta per accedere al suo contenuto.",
"access_main": "Accesso",
"readme_p1": "Benvenuto in CryptPad, qui è dove puoi prendere nota di qualcosa da solo e con i tuoi contatti.",
"readme_cat1_l3_l1": "Puoi cliccare e trascinare i file nelle cartelle nella sezione {0} del tuo drive e creare nuove cartelle.",
"readme_cat2_l1": "Il pulsante {0} nel tuo pad ti permette di dare accesso ai collaboratori per {1} o per {2} il pad.",
"readme_cat3_l2": "Con l'editor di diapositive puoi creare veloci presentazioni utilizzando il Markdown",
"creation_expireFalse": "Illimitato",
"creation_expiration": "Scadenza",
"password_error": "Pad non trovato!<br>Questo errore può essere causato da due fattori: o la password è sbagliata o il pad è stato eliminato dal server.",
"readme_cat1": "Andiamo a conoscere il tuo CryptDrive",
"feedback_privacy": "Ci teniamo alla tua privacy e contemporaneamente vogliamo che CryptPad sia molto facile da usare. Usiamo questo file per capire quali caratteristiche dell'interfaccia utente contano per i nostri utenti, richiedendolo insieme a un parametro che specifica quale azione sia stata intrapresa.",
"creation_owned": "Pad di proprietà",
"creation_owned1": "Un pad <b>di proprietà</b> può essere eliminato dal server quando il proprietario vuole. Eliminando un pad lo si rimuove anche dai CryptDrive degli altri utenti.",

@ -141,7 +141,6 @@
"privacy": "プライバシー",
"blog": "ブログ",
"driveReadmeTitle": "CryptPad とは?",
"readme_welcome": "CryptPad へようこそ!",
"register_header": "CryptPad へようこそ",
"login_confirm": "パスワードの確認",
"login_register": "新規登録",

@ -246,7 +246,6 @@
"contacts_online": "Another user from this room is online",
"fm_rootName": "Documents",
"fm_trashName": "Trash",
"fm_unsortedName": "Unsorted files",
"fm_filesDataName": "All files",
"fm_templateName": "Templates",
"fm_searchName": "Search",
@ -563,25 +562,8 @@
"header_homeTitle": "Go to CryptPad homepage",
"help_genericMore": "Learn more about how CryptPad can work for you by reading our <a>Documentation</a>.",
"driveReadmeTitle": "What is CryptPad?",
"readme_welcome": "Welcome to CryptPad !",
"readme_p1": "Welcome to CryptPad, this is where you can take note of things alone and with contacts.",
"readme_p2": "This pad will give you a quick walk through of how you can use CryptPad to take notes, keep them organized and work together on them.",
"readme_cat1": "Get to know your CryptDrive",
"readme_cat1_l1": "Make a pad: In your CryptDrive, click {0} then {1} and you can make a pad.",
"readme_cat1_l2": "Open Pads from your CryptDrive: double-click on a pad icon to open it.",
"readme_cat1_l3": "Organize your pads: When you are logged in, every pad you access will be shown as in the {0} section of your drive.",
"readme_cat1_l3_l1": "You can click and drag files into folders in the {0} section of your drive and make new folders.",
"readme_cat1_l3_l2": "Remember to try right clicking on icons because there are often additional menus.",
"readme_cat1_l4": "Put old pads in the trash: You can click and drag your pads into the {0} the same way you drag them into folders.",
"readme_cat2": "Make pads like a pro",
"edit": "edit",
"view": "view",
"readme_cat2_l1": "The {0} button in your pad allows you to give access to collaborators to either {1} or to {2} the pad.",
"readme_cat2_l2": "Change the title of the pad by clicking on the pencil",
"readme_cat3": "Discover CryptPad apps",
"readme_cat3_l1": "With CryptPad code editor, you can collaborate on code like Javascript and markdown like HTML and Markdown",
"readme_cat3_l2": "With CryptPad slide editor, you can make quick presentations using Markdown",
"readme_cat3_l3": "With CryptPoll you can take quick votes, especially for scheduling meetings which fit with everybody's calendar",
"feedback_about": "If you're reading this, you were probably curious why CryptPad is requesting web pages when you perform certain actions.",
"feedback_privacy": "We care about your privacy, and at the same time we want CryptPad to be very easy to use. We use this file to figure out which UI features matter to our users, by requesting it along with a parameter specifying which action was taken.",
"feedback_optout": "If you would like to opt out, visit <a>your user settings page</a>, where you'll find a checkbox to enable or disable user feedback.",

@ -219,7 +219,6 @@
"contacts_online": "En annen bruker fra dette rommet er pålogget",
"fm_rootName": "Dokumenter",
"fm_trashName": "Papirkurv",
"fm_unsortedName": "Usorterte filer",
"fm_filesDataName": "Alle filer",
"fm_templateName": "Maler",
"fm_searchName": "Søk",
@ -318,7 +317,6 @@
"creation_expireFalse": "Ubegrenset",
"view": "vis",
"edit": "rediger",
"readme_welcome": "Velkommen til Cryptpad",
"driveReadmeTitle": "Hva er CryptPad?",
"header_homeTitle": "Gå til CryptPad-hjemmesiden",
"header_logoTitle": "Gå til din CryptDrive",

@ -252,7 +252,6 @@
"contacts_online": "Een andere gebruiker in deze kamer is online",
"fm_rootName": "Documenten",
"fm_trashName": "Prullenbak",
"fm_unsortedName": "Niet-gesorteerde bestanden",
"fm_filesDataName": "Alle bestanden",
"fm_templateName": "Sjablonen",
"fm_searchName": "Zoeken",

@ -108,7 +108,6 @@
"canvas_opacity": "Opacidade",
"fm_rootName": "Documentos",
"fm_trashName": "Lixeira",
"fm_unsortedName": "Arquivos não organizados",
"fm_filesDataName": "Todos os Arquivos",
"fm_templateName": "Temas",
"fm_searchName": "Busca",
@ -221,25 +220,8 @@
"tos_3rdparties": "Nós não disponibilizamos dados individuais para terceiros, salvo quando requisitado legalmente.",
"header_logoTitle": "Go to the main page",
"driveReadmeTitle": "What is CryptPad?",
"readme_welcome": "Welcome to CryptPad !",
"readme_p1": "Bem vindo ao CryptPad, onde você pode fazer anotações sozinho e com contatos.",
"readme_p2": "This pad will give you a quick walk through of how you can use CryptPad to take notes, keep them organized and work together on them.",
"readme_cat1": "Get to know your CryptDrive",
"readme_cat1_l1": "Make a pad: In your CryptDrive, click {0} then {1} and you can make a pad.",
"readme_cat1_l2": "Open Pads from your CryptDrive: double-click on a pad icon to open it.",
"readme_cat1_l3": "Organize your pads: When you are logged in, every pad you access will be shown as in the {0} section of your drive.",
"readme_cat1_l3_l1": "You can click and drag files into folders in the {0} section of your drive and make new folders.",
"readme_cat1_l3_l2": "Remember to try right clicking on icons because there are often additional menus.",
"readme_cat1_l4": "Put old pads in the trash: You can click and drag your pads into the {0} the same way you drag them into folders.",
"readme_cat2": "Make pads like a pro",
"edit": "edit",
"view": "view",
"readme_cat2_l1": "The {0} button in your pad allows you to give access to collaborators to either {1} or to {2} the pad.",
"readme_cat2_l2": "Change the title of the pad by clicking on the pencil",
"readme_cat3": "Discover CryptPad apps",
"readme_cat3_l1": "With CryptPad code editor, you can collaborate on code like Javascript and markdown like HTML and Markdown",
"readme_cat3_l2": "With CryptPad slide editor, you can make quick presentations using Markdown",
"readme_cat3_l3": "With CryptPoll you can take quick votes, especially for scheduling meetings which fit with everybody's calendar",
"feedback_about": "If you're reading this, you were probably curious why CryptPad is requesting web pages when you perform certain actions",
"feedback_privacy": "We care about your privacy, and at the same time we want CryptPad to be very easy to use. We use this file to figure out which UI features matter to our users, by requesting it along with a parameter specifying which action was taken.",
"feedback_optout": "If you would like to opt out, visit <a>your user settings page</a>, where you'll find a checkbox to enable or disable user feedback.",

@ -87,7 +87,6 @@
"canvas_opacity": "Opacitate",
"fm_rootName": "Documente",
"fm_trashName": "Gunoi",
"fm_unsortedName": "Fișiere nesortate",
"fm_filesDataName": "Toate fișierele",
"fm_templateName": "Șabloane",
"fm_searchName": "Caută",
@ -194,25 +193,8 @@
"tos_3rdparties": "Nu oferim date personale terților, decât dacă ne sunt solicitate prin lege.",
"header_logoTitle": "Mergi la pagina principală",
"driveReadmeTitle": "Ce este CryptPad?",
"readme_welcome": "Bine ai venit n CryptPad !",
"readme_p1": "Bine ai venit în CryptPad, acesta este locul unde îți poți lua notițe, singur sau cu prietenii.",
"readme_p2": "Acest pad o să îți ofere un scurt ghid în cum poți să folosești CryptPad pentru a lua notițe, a le ține organizate și a colabora pe ele.",
"readme_cat1": "Descoperă-ți CryptDrive-ul",
"readme_cat1_l1": "Crează un pad: În CryptDrive-ul tău, dă click {0} apoi {1} și poți să creezi un pad.",
"readme_cat1_l2": "Deschide pad-urile din CryptDrive-ul tău: doublu-click pe iconița unui pad pentru a-l deschide.",
"readme_cat1_l3": "Organizează-ți pad-urile: Când ești logat, orice pad accesezi va fi afișat ca în secțiunea {0} a drive-ului tău.",
"readme_cat1_l3_l1": "Poți să folosești funcția click and drag pentru a muta fișierele în folderele secțiunii {0} a drive-ului tău și pentru a crea noi foldere.",
"readme_cat1_l3_l2": "Ține minte să încerci click-dreapta pe iconițe pentru că există și meniuri adiționale.",
"readme_cat1_l4": "Pune pad-urile vechi în gunoi. Poți să folosești funcția click and drag pe pad-uri în categoria {0} la fel ca și în cazul folderelor.",
"readme_cat2": "Crează pad-uri ca un profesionist",
"edit": "editează",
"view": "vezi",
"readme_cat2_l1": "Butonul {0} din pad-ul tău dă accesul colaboratorilor tăi să {1} sau să {2} pad-ul.",
"readme_cat2_l2": "Schimbă titlul pad-ului dând click pe creion",
"readme_cat3": "Descoperă aplicațiile CryptPad",
"readme_cat3_l1": "Cu editorul de cod CryptPad, poți colabora pe cod ca Javascript și markdown ca HTML și Markdown",
"readme_cat3_l2": "Cu editorul de slide-uri CryptPad, poți să faci prezentări scurte folosind Markdown",
"readme_cat3_l3": "Cu CryptPoll poți să organizezi votări rapide, mai ales pentru a programa ntâlniri care se potrivesc calendarelor tuturor",
"feedback_about": "Dacă citești asta, probabil că ești curios de ce CryptPad cere pagini web atunci când întreprinzi anumite acțiuni",
"feedback_privacy": "Ne pasă de intimitatea ta, si în același timp vrem să păstrăm CryptPad ușor de folosit. Folosim acest fișier pentru a ne da seama care beneficii UI contează cel mai mult pentru utilizatori, cerându-l alături de un parametru specific atunci când acțiunea se desfășoară",
"feedback_optout": "Dacă vrei să ieși, vizitează <a>setările de pe pagina ta de user</a>, unde vei găsi o căsuță pentru a activa sau dezactiva feedback-ul de la user.",

@ -219,7 +219,6 @@
"contacts_leaveRoom": "Покинуть комнату",
"fm_rootName": "Документы",
"fm_trashName": "Корзина",
"fm_unsortedName": "Несортированные файлы",
"fm_filesDataName": "Все файлы",
"fm_templateName": "Образцы",
"fm_searchName": "Поиск",

@ -108,7 +108,6 @@
"canvas_opacity": "透明度",
"fm_rootName": "根目錄",
"fm_trashName": "垃圾桶",
"fm_unsortedName": "未整理的檔案",
"fm_filesDataName": "所有檔案",
"fm_templateName": "模版",
"fm_searchName": "搜尋",
@ -222,25 +221,8 @@
"tos_3rdparties": "除非法令要求,我們不會提供任何個人資料給第三方。",
"header_logoTitle": "回到主頁",
"driveReadmeTitle": "什麼是 CryptPad?",
"readme_welcome": "歡迎來到 CryptPad !",
"readme_p1": "欢迎来到 CryptPad在这里你可以单独或和联系人一起记录事情。",
"readme_p2": "這個工作檔案可以讓你快速地了解如何使用 CryptPad 作筆記,有效地整理管理文件工作檔案。",
"readme_cat1": "認識如何使用 CryptDrive",
"readme_cat1_l1": "建立一個工作檔案: 在 CryptDrive 底下, 點擊 {0} 然後 {1} 這樣就可以建立一個新的工作檔案。",
"readme_cat1_l2": "從 CryptDrive 開啟工作檔案: 雙擊工作檔案的圖示來開啟它。",
"readme_cat1_l3": "分類你的工作檔案:登入之後,每一個你能接取使用的工作檔案會顯示在你雲端硬碟中的 {0} 部份。",
"readme_cat1_l3_l1": "你可以點擊或是拉曳檔案到雲端硬碟 {0} 區,新增資料夾。",
"readme_cat1_l3_l2": "記得試著點擊圖示,以顯示更多的選項功能。",
"readme_cat1_l4": "把舊的工作檔案放到垃圾筒:點擊或是拉曳檔案到 {0} 如同把它們拉到文件目錄夾一樣的方法。",
"readme_cat2": "像個專業人士來編寫你的工作檔案",
"edit": "編輯",
"view": "檢視",
"readme_cat2_l1": "在工作檔案下的 {0} 按鍵可讓其它的協作者接取 {1} 或是 {2} 工作檔案",
"readme_cat2_l2": "若要更改工作檔案的名稱,只要點擊右上的鉛筆圖示即可",
"readme_cat3": "發現其它的 CryptPad 應用",
"readme_cat3_l1": "使用 CryptPad 代碼編輯器,你可以和其它人協作各種程式碼,如 Javascript、 markdown、 HTML 等等。",
"readme_cat3_l2": "使用 CryptPad 投影片編輯功能,你可以使用 Markdown 快速製作簡報檔。",
"readme_cat3_l3": "利用 CryptPoll 你可以快速作個線上調查,尤其是調查每個人有空的會議時間。",
"feedback_about": "如果你讀了這裏,也許會好奇為何當你執行某些動作時 CryptPad 會請求網頁資訊。",
"feedback_privacy": "我們注重你的隱私,同時也要讓 CryptPad 容易使用。我們利用這個檔案來了解哪一種介面設計為用戶所重視,透過它來請求特別的功能參數。",
"feedback_optout": "如果欲退出客戶資料收集, 請到 <a>用戶設定頁</a>, 可以找到勾選項目來啟用或關閉用戶回饋功能。",

Loading…
Cancel
Save