web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
ansuz
2017-05-29 19:04:47 +02:00
parent a15ef44a12 6518b56945
commit 92a7970eb8
7 changed files with 126 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
customize.dist/translations/messages.es.js
View File

@@ -451,5 +451,10 @@ define(function () {
out.download_button = "Descifrar y descargar";
out.warn_notPinned = "Este pad no está en ningun CryptDrive. Expirará después de 3 meses. <a href='/about.html#pinning'>Acerca de...</a>";
out.poll_remove = "Quitar";
out.poll_edit = "Editar";
out.poll_locked = "Cerrado";
out.poll_unlocked = "Abierto";
return out;
});

5
customize.dist/translations/messages.fr.js
View File

@@ -193,6 +193,11 @@ define(function () {
out.poll_titleHint = "Titre";
out.poll_descriptionHint = "Description";
out.poll_remove = "Supprimer";
out.poll_edit = "Modifier";
out.poll_locked = "Verrouillé";
out.poll_unlocked = "Déverrouillé";
// Canvas
out.canvas_clear = "Nettoyer";
out.canvas_delete = "Supprimer la sélection";

5
customize.dist/translations/messages.js
View File

@@ -196,6 +196,11 @@ define(function () {
out.poll_titleHint = "Title";
out.poll_descriptionHint = "Describe your poll, and use the 'publish' button when you're done. Anyone with the link can change the description, but this is discouraged.";
out.poll_remove = "Remove";
out.poll_edit = "Edit";
out.poll_locked = "Locked";
out.poll_unlocked = "Unlocked";
// Canvas
out.canvas_clear = "Clear";
out.canvas_delete = "Delete selection";