Merge branch 'develop' into client_auth_v3

cli/onionshare_cli/resources/templates/receive.html

@@ -21,11 +21,13 @@
 
     {% if not disable_text and not disable_files %}
     <p class="upload-header">Submit Files or Messages</p>
-    <p class="upload-description">You can submit files, a message, or both</p>
+    <p class="upload-description">You can submit files, a message, or both.</p>
+    <p class="upload-description">Remember, you are accessing this service anonymously! Provide contact info if you want a response to the message.</p>
     {% endif %}
     {% if not disable_text and disable_files %}
     <p class="upload-header">Submit Messages</p>
-    <p class="upload-description">You can submit a message</p>
+    <p class="upload-description">You can submit a message.</p>
+    <p class="upload-description">Remember, you are accessing this service anonymously! Provide contact info if you want a response to the message.</p>
     {% endif %}
     {% if disable_text and not disable_files %}
     <p class="upload-header">Submit Files</p>
@@ -61,4 +63,4 @@
   <script async src="{{ static_url_path }}/js/receive.js" id="receive-script"></script>
 </body>
 
-</html>
+</html>

cli/onionshare_cli/settings.py

@@ -64,12 +64,13 @@ class Settings(object):
             "da": "Dansk",  # Danish
             "nl": "Nederlands",  # Dutch
             "en": "English",  # English
-            "fi": "Suomi",  # Finnish
+            # "fi": "Suomi",  # Finnish
             "fr": "Français",  # French
             "gl": "Galego",  # Galician
             "de": "Deutsch",  # German
             "el": "Ελληνικά",  # Greek
             "is": "Íslenska",  # Icelandic
+            "id": "Bahasa Indonesia",  # Indonesian
             # "ga": "Gaeilge",  # Irish
             "it": "Italiano",  # Italian
             "ja": "日本語",  # Japanese
@@ -79,10 +80,10 @@ class Settings(object):
             "pl": "Polski",  # Polish
             "pt_BR": "Português (Brasil)",  # Portuguese Brazil
             "pt_PT": "Português (Portugal)",  # Portuguese Portugal
-            "sk": "Slovenčina",  # Slovak
             # "ro": "Română",  # Romanian
             "ru": "Русский",  # Russian
-            # "sr_Latn": "Srpska (latinica)",  #  Serbian (latin)
+            "sr_Latn": "Srpska (latinica)",  # Serbian (latin)
+            "sk": "Slovenčina",  # Slovak
             "es": "Español",  # Spanish
             "sv": "Svenska",  # Swedish
             # "te": "తెలుగు",  # Telugu

cli/pyproject.toml

@@ -20,7 +20,7 @@ python = "^3.6"
 click = "*"
 flask = "*"
 flask-httpauth = "*"
-flask-socketio = "*"
+flask-socketio = "5.0.1"
 psutil = "*"
 pysocks = "*"
 requests = {extras = ["socks"], version = "^2.25.1"}