Merge branch 'develop' into 910_flatpak

4 files changed, 10 insertions, 34 deletions

diff --git a/install/org.onionshare.OnionShare.desktop b/install/org.onionshare.OnionShare.desktop
index 536d73c6..02592a72 100644
--- a/install/org.onionshare.OnionShare.desktop
+++ b/install/org.onionshare.OnionShare.desktop
@@ -4,6 +4,7 @@ GenericName=OnionShare Client
 Comment=Share a file securely and anonymously over Tor
 Comment[da]=Del en fil sikkert og anonymt over Tor
 Comment[de]=Teile Dateien sicher und anonym über das Tor-Netzwerk
+Comment[hr]=Dijeli datoteku sigurno i anonimno preko Tora
 Exec=/usr/bin/onionshare-gui
 Terminal=false
 Type=Application
@@ -12,5 +13,6 @@ Categories=Network;FileTransfer;
 Keywords=tor;anonymity;privacy;onion service;file sharing;file hosting;
 Keywords[da]=tor;anonymitet;privatliv;onion-tjeneste;fildeling;filhosting;
 Keywords[de]=tor;Anonymität;Privatsphäre;Onion-Service;File-Sharing;File-Hosting;
+Keywords[hr]=tor;anonimnost;privatnost;Onion usluga;dijeljenje datoteka;hosting datoteka;
 StartupNotify=true
 StartupWMClass=onionshare
diff --git a/install/requirements-tests.txt b/install/requirements-tests.txt
deleted file mode 100644
index 4cb2106a..00000000
--- a/install/requirements-tests.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-atomicwrites==1.3.0
-attrs==19.1.0
-more-itertools==7.2.0
-pluggy==0.13.0
-py==1.8.0
-pytest==5.1.2
-pytest-faulthandler==2.0.1
-pytest-qt==3.2.2
-six==1.12.0
-urllib3==1.25.3
\ No newline at end of file
diff --git a/install/requirements.txt b/install/requirements.txt
deleted file mode 100644
index 36b9fa4f..00000000
--- a/install/requirements.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-altgraph==0.16.1
-certifi==2019.9.11
-chardet==3.0.4
-Click==7.0
-Flask==1.1.1
-Flask-HTTPAuth==3.3.0
-future==0.17.1
-idna==2.8
-itsdangerous==1.1.0
-Jinja2==2.10.1
-macholib==1.11
-MarkupSafe==1.1.1
-pefile==2019.4.18
-pycryptodome==3.9.0
-PyInstaller==3.5
-PyQt5==5.13.1
-PyQt5-sip==4.19.19
-PySocks==1.7.0
-requests==2.22.0
-stem==1.7.1
-urllib3==1.25.3
-Werkzeug==0.15.6
diff --git a/install/scripts/onionshare-nautilus.py b/install/scripts/onionshare-nautilus.py
index dad2330c..776ca5de 100644
--- a/install/scripts/onionshare-nautilus.py
+++ b/install/scripts/onionshare-nautilus.py
@@ -3,7 +3,10 @@ import sys
 import json
 import locale
 import subprocess
-import urllib
+try:
+    import urllib.request
+except:
+    import urllib
 import gi
 
 gi.require_version("Nautilus", "3.0")
@@ -67,7 +70,10 @@ class OnionShareExtension(GObject.GObject, Nautilus.MenuProvider):
     def url2path(self, url):
         file_uri = url.get_activation_uri()
         arg_uri = file_uri[7:]
-        path = urllib.url2pathname(arg_uri)
+        try:
+            path = urllib.request.url2pathname(arg_uri)
+        except:
+            path = urllib.url2pathname(arg_uri)
         return path
 
     def exec_onionshare(self, filenames):