Merge branch 'housekeeping' into 'master'

General housekeeping

Correct various typos.
Change GitLab URL to framagit.org.

See merge request !6

README.md

@@ -11,7 +11,7 @@ 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, neither will your network administrator, or your ISP.
 
-The encryption key part of the URL is a anchor (Cf. [Fragment Identifier](https://en.wikipedia.org/wiki/Fragment_identifier)), that means this part is only processed client-side and does not reached the server. :-)
+The encryption key part of the URL is a anchor (Cf. [Fragment Identifier](https://en.wikipedia.org/wiki/Fragment_identifier)), that means this part is only processed client-side and does not reach the server. :-)
 
 ## License
 
@@ -21,7 +21,7 @@ Lufi is licensed under the terms of the AGPL. See the [LICENSE](LICENSE) file.
 
 There is a demonstration site, available at <https://demo.lufi.io>, with strong limitations on time and file size.
 
-To really use Lufi, you can go to <https://framadrop.org>, provided by the [Framasoft association](http://framasoft.org) (you can help them to keep providing free services at <https://soutenir.framasoft.org>).
+To really use Lufi, you can go to <https://framadrop.org>, provided by the [Framasoft association](https://framasoft.org) (you can help them to keep providing free services at <https://soutenir.framasoft.org>).
 
 ## Logo
 
@@ -29,15 +29,15 @@ Because Lufi is quite similar to Luffy, like in "[Monkey D. Luffy](https://en.wi
 
 ## Wiki (work in progress)
 
-The official wiki will contain all what you need to know about Lufi (installation, configuration, etc). Go to <https://git.framasoft.org/luc/lufi/wikis/home> or clone it:
+The official wiki will contain all you need to know about Lufi (installation, configuration, etc.). Go to <https://framagit.org/luc/lufi/wikis/home> or clone it:
 
 ```
-git clone https://git.framasoft.org/luc/lufi.wiki.git
+git clone https://framagit.org/luc/lufi.wiki.git
 ```
 
 ## Encryption
 
-All the encryption/decryption process takes place in your browser. The encryption key is never sent over the network.
+All the encryption/decryption processes take place in your browser. The encryption key is never sent over the network.
 
 However please note that some metadata are sent unencrypted:
 
@@ -57,9 +57,9 @@ 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. And of course, code contributions are welcome!
+Please consider contributing, either by [reporting issues](https://framagit.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).
+The details on how to contribute are on the [wiki](https://framagit.org/luc/lufi/wikis/contribute).
 
 ## Make a donation
 
@@ -76,4 +76,3 @@ It uses:
 * [Stanford Javascript Crypto Library](http://bitwiseshiftleft.github.com/sjcl/)
 * [Moment.js](http://momentjs.com/) for displaying real dates instead of unix timestamps.
 * [Filesize.js](http://filesizejs.com/) for displaying file sizes
-

lufi.conf.template

@@ -132,7 +132,7 @@
     #    user_filter => '!(uid=ldap_user)'
     #},
 
-    # if you setted ldap above, the session will last `session_duration` seconds before
+    # if you've set ldap above, the session will last `session_duration` seconds before
     # the user needs to reauthenticate
     # optional, default is 3600
     #session_duration => 3600,

themes/default/lib/Lufi/I18N/en.po

@@ -334,7 +334,7 @@ msgid "Sorry, uploading is disabled."
 msgstr ""
 
 #: themes/default/templates/about.html.ep:7
-msgid "The administrator can only see the file's name, its size and its mimetype (what kind of file it is: video, text, etc)."
+msgid "The administrator can only see the file's name, its size and its mimetype (what kind of file it is: video, text, etc.)."
 msgstr ""
 
 #: themes/default/templates/files.html.ep:43

themes/default/lib/Lufi/I18N/fr.po

@@ -336,8 +336,8 @@ msgid "Sorry, uploading is disabled."
 msgstr "Désolé, l’envoi de fichier est désactivé."
 
 #: themes/default/templates/about.html.ep:7
-msgid "The administrator can only see the file's name, its size and its mimetype (what kind of file it is: video, text, etc)."
-msgstr "L’administrateur ne peut voir que le nom du fichier, sa taille et son type mime (son type de fichier : vidéo, texte, etc)."
+msgid "The administrator can only see the file's name, its size and its mimetype (what kind of file it is: video, text, etc.)."
+msgstr "L’administrateur ne peut voir que le nom du fichier, sa taille et son type mime (son type de fichier : vidéo, texte, etc.)."
 
 #: themes/default/templates/files.html.ep:43
 msgid "The data has been successfully imported."

themes/default/lib/Lufi/I18N/it.po

@@ -336,8 +336,8 @@ msgid "Sorry, uploading is disabled."
 msgstr "L'invio del file è attualemente disattivato."
 
 #: themes/default/templates/about.html.ep:7
-msgid "The administrator can only see the file's name, its size and its mimetype (what kind of file it is: video, text, etc)."
-msgstr "L'amministratore pu vedere solo il nome del file, la sua dimensione e il suo mimetype (video, testo, etc)."
+msgid "The administrator can only see the file's name, its size and its mimetype (what kind of file it is: video, text, etc.)."
+msgstr "L'amministratore pu vedere solo il nome del file, la sua dimensione e il suo mimetype (video, testo, etc.)."
 
 #: themes/default/templates/files.html.ep:43
 msgid "The data has been successfully imported."

themes/default/templates/about.html.ep

@@ -4,7 +4,7 @@
     <p><%= l('Lufi is a free (as in free speech) file hosting software.') %></p>
     <h3><%= l('Privacy') %></h3>
     <p><%= 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.') %><br>
-    <%= l('The administrator can only see the file\'s name, its size and its mimetype (what kind of file it is: video, text, etc).') %></p>
+    <%= l('The administrator can only see the file\'s name, its size and its mimetype (what kind of file it is: video, text, etc.).') %></p>
     <p><%= 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.') %></p>
     <h3><%= l('How does it work?') %></h3>
     <p><%= 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.') %></p>

utilities/lufi.default

@@ -1,6 +1,6 @@
-# LDIR is the path where you installed Lutim
+# LDIR is the path where you installed Lufi
 # It has to end with a final /
 LDIR=/var/www/lufi/
 
-# USER is the user who will launch Lutim
+# USER is the user who will launch Lufi
 USER=www-data

utilities/lufi.init

@@ -160,7 +160,7 @@ case "$1" in
     reload)
         log_daemon_msg "Reloading $NAME"
         do_start
-	sleep 1
+        sleep 1
         case "$?" in
             0|1)
                 log_progress_msg "done"

utilities/lufi.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=File hosting service with encryption
-Documentation=https://git.framasoft.org/luc/lufi
+Documentation=https://framagit.org/luc/lufi
 Requires=network.target
 After=network.target