diff --git a/README.md b/README.md index 5e54b0e..e73303a 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Lufi means Let's Upload that FIle. It stores files and allows you to download them. -Is that all? No. All the files are encrypted **by the browser**! It means that your files **never** leave your computer unencrypted. -The administrator of the Lufi instance you use will not be able to see what is in your file, and your network administrator neither. Neither can do your ISP. +Is that all? No. All the files are encrypted **by the browser**! It means that your files **never** leave your computer unencrypted. +The administrator of the Lufi instance you use will not be able to see what is in your file, neither will your network administrator, or your ISP. ## License @@ -35,9 +35,9 @@ git clone https://git.framasoft.org/luc/lufi.wiki.git ## Encryption -All the encryption/decryption process takes place on your browser. The encryption key never go on the network. +All the encryption/decryption process takes place in your browser. The encryption key is never sent over the network. -But please, notice that some meta-datas are send unencrypted: +However please note that some metadata are sent unencrypted: * the file name * its size @@ -55,11 +55,11 @@ See [AUTHORS.md](AUTHORS.md) file. ## Contribute! -Please consider contributing, either by [reporting issues](https://git.framasoft.org/luc/lufi/issues) or by helping the [internationalization](https://pootle.framasoft.org/projects/lufi/). And of course, code contribution are welcome! +Please consider contributing, either by [reporting issues](https://git.framasoft.org/luc/lufi/issues) or by helping the internationalization. And of course, code contributions are welcome! The details on how to contribute are on the [wiki](https://git.framasoft.org/luc/lufi/wikis/contribute). -## Others projects dependancies +## Other dependencies Lufi is written in Perl with the [Mojolicious](http://mojolicio.us) framework. diff --git a/lib/Lufi/Controller/Files.pm b/lib/Lufi/Controller/Files.pm index 2c100c1..3b99d86 100644 --- a/lib/Lufi/Controller/Files.pm +++ b/lib/Lufi/Controller/Files.pm @@ -159,7 +159,7 @@ sub download { $c->on( message => sub { my ($ws, $json) = @_; - $c->send('{"success": false, "msg": "'.$c->l('Error: the file existed but has been deleted.').'"}'); + $c->send('{"success": false, "msg": "'.$c->l('Error: the file existed but was deleted.').'"}'); } ); } elsif ($record->complete) { @@ -200,7 +200,7 @@ sub download { $c->on( message => sub { my ($ws, $json) = @_; - $c->send('{"success": false, "msg": "'.$c->l('Error: the file has not been send entirely.').'"}'); + $c->send('{"success": false, "msg": "'.$c->l('Error: the file has not been sent entirely.').'"}'); } ); } @@ -250,7 +250,7 @@ sub get_counter { success => false, missing => false, short => $short, - msg => $c->l('Unable to get counter for %1. The token is unvalid.', $short) + msg => $c->l('Unable to get counter for %1. The token is invalid.', $short) } ); } diff --git a/themes/default/lib/Lufi/I18N/en.po b/themes/default/lib/Lufi/I18N/en.po index a131ed8..8f0f609 100644 --- a/themes/default/lib/Lufi/I18N/en.po +++ b/themes/default/lib/Lufi/I18N/en.po @@ -107,7 +107,7 @@ msgid "Download link" msgstr "" #: themes/default/templates/about.html.ep:10 -msgid "Drag and drop files in the appropriate area or use the traditional way to send files and the files will be chunked, encrypted and sent to the server. You will get two links per file: a download link, that you give to the people you want to share the file with and a deletion link, allowing you to delete the file when you want." +msgid "Drag and drop files in the appropriate area or use the traditional way to send files and the files will be chunked, encrypted and sent to the server. You will get two links per file: a download link, that you give to the people you want to share the file with and a deletion link, allowing you to delete the file whenever you want." msgstr "" #: themes/default/templates/index.html.ep:69 @@ -131,11 +131,11 @@ msgid "Encrypting part XX1 of XX2" msgstr "" #: lib/Lufi/Controller/Files.pm:162 -msgid "Error: the file existed but has been deleted." +msgid "Error: the file existed but was deleted." msgstr "" #: lib/Lufi/Controller/Files.pm:203 -msgid "Error: the file has not been send entirely." +msgid "Error: the file has not been sent entirely." msgstr "" #: lib/Lufi/Controller/Files.pm:208 @@ -183,7 +183,7 @@ msgid "Hit Enter, then Ctrl+C to copy the download link" msgstr "" #: themes/default/templates/about.html.ep:9 -msgid "How does it works?" +msgid "How does it work?" msgstr "" #: themes/default/templates/about.html.ep:17 @@ -199,7 +199,7 @@ msgid "If you choose a delay, the file will be deleted after that delay." msgstr "" #: themes/default/templates/mail.html.ep:15 -msgid "If you send the mail from this server, the links will be send to the server, which may lower your privacy protection." +msgid "If you send the mail from this server, the links will be sent to the server, which may lower your privacy protection." msgstr "" #: themes/default/templates/files.html.ep:14 @@ -240,7 +240,7 @@ msgid "No expiration delay" msgstr "" #: themes/default/templates/files.html.ep:8 -msgid "Only the files sent with this browser will be listed here. The informations are stored in localStorage: if you delete your localStorage data, you'll loose this informations." +msgid "Only the files sent with this browser will be listed here. This list is stored in localStorage: if you delete your localStorage data, you'll lose this list." msgstr "" #. (config('contact') @@ -261,7 +261,7 @@ msgid "Purge expired files from localStorage" msgstr "" #: themes/default/templates/files.html.ep:9 -msgid "Rows in red means that the file has expired and is no longer available." +msgid "Rows in red mean that the files have expired and are no longer available." msgstr "" #: themes/default/templates/index.html.ep:103 @@ -332,7 +332,7 @@ msgstr "" #. (url_for('/') #: themes/default/templates/about.html.ep:15 -msgid "The original (and only for now) author is Luc Didry. If you want to support him, you can to it via Flattr or with Bitcoin." +msgid "The original (and only for now) author is Luc Didry. If you want to support him, you can do it via Flattr or with Bitcoin." msgstr "" #: lib/Lufi/Controller/Files.pm:122 @@ -354,7 +354,7 @@ msgstr "" #. ($short) #: lib/Lufi/Controller/Files.pm:253 -msgid "Unable to get counter for %1. The token is unvalid." +msgid "Unable to get counter for %1. The token is invalid." msgstr "" #: themes/default/templates/layouts/default.html.ep:34 themes/default/templates/layouts/default.html.ep:39 @@ -386,7 +386,7 @@ msgid "You can see the list of your files by clicking on the \"My files\" link a msgstr "" #: themes/default/templates/about.html.ep:8 -msgid "You don't need to register yourself to upload files but be aware that, for legal reasons, your IP address will be stored when you send a file. Don't panic, it is normally the case of all sites on which you send files." +msgid "You don't need to register yourself to upload files but be aware that, for legal reasons, your IP address will be stored when you send a file. Don't panic, this is normally the case for all sites on which you send files." msgstr "" #: themes/default/templates/render.html.ep:40 diff --git a/themes/default/lib/Lufi/I18N/fr.po b/themes/default/lib/Lufi/I18N/fr.po index fd51702..7214bad 100644 --- a/themes/default/lib/Lufi/I18N/fr.po +++ b/themes/default/lib/Lufi/I18N/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2015-10-05 23:06+0200\n" +"PO-Revision-Date: 2015-10-15 14:00-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -35,10 +35,6 @@ msgstr "24 heures" msgid ":" msgstr " :" -#: -msgid ": Error while trying to get the counter." -msgstr " : erreur en essayant de récupérer le compteur" - #: themes/default/templates/about.html.ep:16 msgid "A thank you with a photo of kitten on Diaspora* or Twitter is cool too ;-)" msgstr "Un merci avec une photo de chaton sur Diaspora* ou Twitter fait aussi l’affaire ;-)" @@ -113,7 +109,7 @@ msgid "Download link" msgstr "Lien de téléchargement" #: themes/default/templates/about.html.ep:10 -msgid "Drag and drop files in the appropriate area or use the traditional way to send files and the files will be chunked, encrypted and sent to the server. You will get two links per file: a download link, that you give to the people you want to share the file with and a deletion link, allowing you to delete the file when you want." +msgid "Drag and drop files in the appropriate area or use the traditional way to send files and the files will be chunked, encrypted and sent to the server. You will get two links per file: a download link, that you give to the people you want to share the file with and a deletion link, allowing you to delete the file whenever you want." msgstr "Faites glisser des fichiers dans la zone prévue à cet effet ou sélectionnez un fichier de façon classique et les fichiers seront découpés en morceaux, chiffrés et envoyés au serveur. Vous récupérerez deux liens par fichier : un lien de téléchargement et un lien pour supprimer le fichier quand vous le souhaitez." #: themes/default/templates/index.html.ep:69 @@ -137,11 +133,11 @@ msgid "Encrypting part XX1 of XX2" msgstr "Chiffrement du fragment XX1 sur XX2" #: lib/Lufi/Controller/Files.pm:162 -msgid "Error: the file existed but has been deleted." +msgid "Error: the file existed but was deleted." msgstr "Erreur : le fichier existait mais a été supprimé" #: lib/Lufi/Controller/Files.pm:203 -msgid "Error: the file has not been send entirely." +msgid "Error: the file has not been sent entirely." msgstr "Erreur : le fichier n’a pas été envoyé dans son intégralité" #: lib/Lufi/Controller/Files.pm:208 @@ -189,7 +185,7 @@ msgid "Hit Enter, then Ctrl+C to copy the download link" msgstr "Appuyez sur la touche Entrée puis faites Ctrl+C pour copier le lien de téléchargement" #: themes/default/templates/about.html.ep:9 -msgid "How does it works?" +msgid "How does it work?" msgstr "Comment ça marche ?" #: themes/default/templates/about.html.ep:17 @@ -205,7 +201,7 @@ msgid "If you choose a delay, the file will be deleted after that delay." msgstr "Si vous choisissez un délai, le fichier sera supprimé après ce délai." #: themes/default/templates/mail.html.ep:15 -msgid "If you send the mail from this server, the links will be send to the server, which may lower your privacy protection." +msgid "If you send the mail from this server, the links will be sent to the server, which may lower your privacy protection." msgstr "Si vous envoyez le mail depuis ce serveur, les liens seront envoyés au serveur, ce qui peut diminuer la protection de la confidentialité." #: themes/default/templates/files.html.ep:14 @@ -245,12 +241,8 @@ msgstr "Espace disque insuffisant sur le serveur pour ce fichier (taille du fich msgid "No expiration delay" msgstr "Pas de délai d’expiration" -#: -msgid "No limit" -msgstr "Aucune limite" - #: themes/default/templates/files.html.ep:8 -msgid "Only the files sent with this browser will be listed here. The informations are stored in localStorage: if you delete your localStorage data, you'll loose this informations." +msgid "Only the files sent with this browser will be listed here. This list is stored in localStorage: if you delete your localStorage data, you'll lose this list." msgstr "Seuls les fichiers envoyés avec ce navigateur web sont listés ici. Les informations sont stockées en localStorage : si vous supprimez vos données localStorage, vous perdrez ces informations." #. (config('contact') @@ -271,7 +263,7 @@ msgid "Purge expired files from localStorage" msgstr "Supprimer du localStorage les fichiers expirés" #: themes/default/templates/files.html.ep:9 -msgid "Rows in red means that the file has expired and is no longer available." +msgid "Rows in red mean that the files have expired and are no longer available." msgstr "Les lignes en rouge indiquent que le fichier a expiré et n’est plus disponible." #: themes/default/templates/index.html.ep:103 @@ -342,7 +334,7 @@ msgstr "Le mail a été envoyé." #. (url_for('/') #: themes/default/templates/about.html.ep:15 -msgid "The original (and only for now) author is Luc Didry. If you want to support him, you can to it via Flattr or with Bitcoin." +msgid "The original (and only for now) author is Luc Didry. If you want to support him, you can do it via Flattr or with Bitcoin." msgstr "L’auteur originel (et pour l’instant, le seul) est Luc Didry. Si vous avez envie de le supporter, vous pouvez le faire via Flattr ou en Bitcoin." #: lib/Lufi/Controller/Files.pm:122 @@ -357,10 +349,6 @@ msgstr "Ce serveur impose des limitations selon la taille des fichiers. Le déla msgid "Unable to copy the link(s) to your clipboard" msgstr "Impossible de copier le(s) lien(s) dans votre presse-papier" -#: -msgid "Unable to get counter for %1. The file does not exists." -msgstr "Impossible de récupérer le compteur de %1. Le fichier n’existe pas." - #. ($short) #: lib/Lufi/Controller/Files.pm:263 msgid "Unable to get counter for %1. The file does not exists. It will be removed from your localStorage." @@ -368,7 +356,7 @@ msgstr "Impossible de récupérer le compteur pour %1. Le fichier n’existe pas #. ($short) #: lib/Lufi/Controller/Files.pm:253 -msgid "Unable to get counter for %1. The token is unvalid." +msgid "Unable to get counter for %1. The token is invalid." msgstr "Impossible de récupérer le compteur pour %1. Le jeton est invalide." #: themes/default/templates/layouts/default.html.ep:34 themes/default/templates/layouts/default.html.ep:39 @@ -400,7 +388,7 @@ msgid "You can see the list of your files by clicking on the \"My files\" link a msgstr "Vous pouvez voir la liste de vos fichiers en cliquant sur le lien « Mes fichiers » en haut à droite de cette page." #: themes/default/templates/about.html.ep:8 -msgid "You don't need to register yourself to upload files but be aware that, for legal reasons, your IP address will be stored when you send a file. Don't panic, it is normally the case of all sites on which you send files." +msgid "You don't need to register yourself to upload files but be aware that, for legal reasons, your IP address will be stored when you send a file. Don't panic, this is normally the case for all sites on which you send files." msgstr "Vous n’avez pas besoin de vous enregistrer pour envoyer des fichiers mais notez que, pour des raisons légales, votre adresse IP sera enregistrée quand vous envoyez un fichier. Ne paniquez pas, c’est normalement le cas pour tous les sites où vous envoyez des fichiers." #: themes/default/templates/render.html.ep:40 diff --git a/themes/default/templates/about.html.ep b/themes/default/templates/about.html.ep index a72a199..c7bd209 100644 --- a/themes/default/templates/about.html.ep +++ b/themes/default/templates/about.html.ep @@ -5,14 +5,14 @@

<%= l('Privacy') %>

<%= l('The files uploaded on a Lufi instance are encrypted before the upload to the server: the administrator of the server can not see the file\'s content.') %>
<%= l('The administrator can only see the file\'s name, its size and its mimetype (what kind of file it is: video, text, etc).') %>

-

<%= l('You don\'t need to register yourself to upload files but be aware that, for legal reasons, your IP address will be stored when you send a file. Don\'t panic, it is normally the case of all sites on which you send files.') %>

-

<%= l('How does it works?') %>

-

<%= l('Drag and drop files in the appropriate area or use the traditional way to send files and the files will be chunked, encrypted and sent to the server. You will get two links per file: a download link, that you give to the people you want to share the file with and a deletion link, allowing you to delete the file when you want.') %>

+

<%= l('You don\'t need to register yourself to upload files but be aware that, for legal reasons, your IP address will be stored when you send a file. Don\'t panic, this is normally the case for all sites on which you send files.') %>

+

<%= l('How does it work?') %>

+

<%= l('Drag and drop files in the appropriate area or use the traditional way to send files and the files will be chunked, encrypted and sent to the server. You will get two links per file: a download link, that you give to the people you want to share the file with and a deletion link, allowing you to delete the file whenever you want.') %>

<%= l('You can see the list of your files by clicking on the "My files" link at the top right of this page.') %>

<%= l('How to report an illegal file?') %>

<%= l('Please contact the administrator: %1', config('contact')) %>

<%= l('Who wrote this software?') %>

-

<%== l('The original (and only for now) author is Luc Didry. If you want to support him, you can to it via Flattr or with Bitcoin.', url_for('/')->to_abs()) %>
+

<%== l('The original (and only for now) author is Luc Didry. If you want to support him, you can do it via Flattr or with Bitcoin.', url_for('/')->to_abs()) %>
<%== l('A thank you with a photo of kitten on Diaspora* or Twitter is cool too ;-)') %>

<%= l('How to install the software on my server?') %>

<%== l('As Lufi is a free software licensed under of the terms of the AGPLv3, you can install it on you own server. Have a look on the Wiki for the procedure.') %>
diff --git a/themes/default/templates/files.html.ep b/themes/default/templates/files.html.ep index 27b53cc..213364e 100644 --- a/themes/default/templates/files.html.ep +++ b/themes/default/templates/files.html.ep @@ -5,8 +5,8 @@

- <%= l('Only the files sent with this browser will be listed here. The informations are stored in localStorage: if you delete your localStorage data, you\'ll loose this informations.') %>
- <%= l('Rows in red means that the file has expired and is no longer available.') %> + <%= l('Only the files sent with this browser will be listed here. This list is stored in localStorage: if you delete your localStorage data, you\'ll lose this list.') %>
+ <%= l('Rows in red mean that the files have expired and are no longer available.') %>

<%= l('Export localStorage data') %> diff --git a/themes/default/templates/mail.html.ep b/themes/default/templates/mail.html.ep index 789d2dd..c70a45e 100644 --- a/themes/default/templates/mail.html.ep +++ b/themes/default/templates/mail.html.ep @@ -12,7 +12,7 @@
-

<%= l('If you send the mail from this server, the links will be send to the server, which may lower your privacy protection.') %>

+

<%= l('If you send the mail from this server, the links will be sent to the server, which may lower your privacy protection.') %>