diff options
| author | Micah Lee <micah@micahflee.com> | 2019-04-19 09:48:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-19 09:48:39 -0700 |
| commit | e5366bdf0b77f53363349e76ad594a6d457775fa (patch) | |
| tree | 3c2035875023a1074c4f59c869e3ba6c2566dba5 | |
| parent | 6ffa91fcee406cb0a67177da233b371b2fbbfc2e (diff) | |
| parent | e3357192ba2c52aaf9e233f0349ccbb3868b122c (diff) | |
| download | onionshare-e5366bdf0b77f53363349e76ad594a6d457775fa.tar.gz onionshare-e5366bdf0b77f53363349e76ad594a6d457775fa.zip | |
Merge pull request #959 from micahflee/958_verbose
Rename --debug to --verbose
50 files changed, 65 insertions, 65 deletions
diff --git a/onionshare/__init__.py b/onionshare/__init__.py index db97f46d..248ab68c 100644 --- a/onionshare/__init__.py +++ b/onionshare/__init__.py @@ -61,7 +61,7 @@ def main(cwd=None): parser.add_argument('--stealth', action='store_true', dest='stealth', help=strings._("help_stealth")) parser.add_argument('--receive', action='store_true', dest='receive', help=strings._("help_receive")) parser.add_argument('--config', metavar='config', default=False, help=strings._('help_config')) - parser.add_argument('--debug', action='store_true', dest='debug', help=strings._("help_debug")) + parser.add_argument('-v', '--verbose', action='store_true', dest='verbose', help=strings._("help_verbose")) parser.add_argument('filename', metavar='filename', nargs='*', help=strings._('help_filename')) args = parser.parse_args() @@ -70,7 +70,7 @@ def main(cwd=None): filenames[i] = os.path.abspath(filenames[i]) local_only = bool(args.local_only) - debug = bool(args.debug) + verbose = bool(args.verbose) stay_open = bool(args.stay_open) autostart_timer = int(args.autostart_timer) autostop_timer = int(args.autostop_timer) @@ -108,8 +108,8 @@ def main(cwd=None): # Re-load the strings, in case the provided config has changed locale strings.load_strings(common) - # Debug mode? - common.debug = debug + # Verbose mode? + common.verbose = verbose # Create the Web object web = Web(common, False, mode) diff --git a/onionshare/common.py b/onionshare/common.py index 02668507..325f11d4 100644 --- a/onionshare/common.py +++ b/onionshare/common.py @@ -36,8 +36,8 @@ class Common(object): """ The Common object is shared amongst all parts of OnionShare. """ - def __init__(self, debug=False): - self.debug = debug + def __init__(self, verbose=False): + self.verbose = verbose # The platform OnionShare is running on self.platform = platform.system() @@ -57,9 +57,9 @@ class Common(object): def log(self, module, func, msg=None): """ - If debug mode is on, log error messages to stdout + If verbose mode is on, log error messages to stdout """ - if self.debug: + if self.verbose: timestamp = time.strftime("%b %d %Y %X") final_msg = "[{}] {}.{}".format(timestamp, module, func) diff --git a/onionshare/web/web.py b/onionshare/web/web.py index b61d2fb3..ebfff2f3 100644 --- a/onionshare/web/web.py +++ b/onionshare/web/web.py @@ -54,9 +54,9 @@ class Web(object): template_folder=self.common.get_resource_path('templates')) self.app.secret_key = self.common.random_string(8) - # Debug mode? - if self.common.debug: - self.debug_mode() + # Verbose mode? + if self.common.verbose: + self.verbose_mode() # Are we running in GUI mode? self.is_gui = is_gui @@ -196,12 +196,12 @@ class Web(object): self.slug = self.common.build_slug() self.common.log('Web', 'generate_slug', 'built random slug: "{}"'.format(self.slug)) - def debug_mode(self): + def verbose_mode(self): """ - Turn on debugging mode, which will log flask errors to a debug file. + Turn on verbose mode, which will log flask errors to a file. """ - flask_debug_filename = os.path.join(self.common.build_data_dir(), 'flask_debug.log') - log_handler = logging.FileHandler(flask_debug_filename) + flask_log_filename = os.path.join(self.common.build_data_dir(), 'flask.log') + log_handler = logging.FileHandler(flask_log_filename) log_handler.setLevel(logging.WARNING) self.app.logger.addHandler(log_handler) diff --git a/onionshare_gui/__init__.py b/onionshare_gui/__init__.py index 675bb52d..828d5ee3 100644 --- a/onionshare_gui/__init__.py +++ b/onionshare_gui/__init__.py @@ -81,7 +81,7 @@ def main(): # Parse arguments parser = argparse.ArgumentParser(formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=48)) parser.add_argument('--local-only', action='store_true', dest='local_only', help=strings._("help_local_only")) - parser.add_argument('--debug', action='store_true', dest='debug', help=strings._("help_debug")) + parser.add_argument('-v', '--verbose', action='store_true', dest='verbose', help=strings._("help_verbose")) parser.add_argument('--filenames', metavar='filenames', nargs='+', help=strings._('help_filename')) parser.add_argument('--config', metavar='config', default=False, help=strings._('help_config')) args = parser.parse_args() @@ -98,10 +98,10 @@ def main(): strings.load_strings(common) local_only = bool(args.local_only) - debug = bool(args.debug) + verbose = bool(args.verbose) - # Debug mode? - common.debug = debug + # Verbose mode? + common.verbose = verbose # Validation if filenames: diff --git a/share/locale/am.json b/share/locale/am.json index a911a5a4..b787a617 100644 --- a/share/locale/am.json +++ b/share/locale/am.json @@ -29,7 +29,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/ar.json b/share/locale/ar.json index 059a68f5..ae6487e8 100644 --- a/share/locale/ar.json +++ b/share/locale/ar.json @@ -28,7 +28,7 @@ "help_autostop_timer": "أوقف المشاركة بعد ثواني محددة", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "قائمة الملفات أو المجلدات للمشاركة", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/bg.json b/share/locale/bg.json index dc5b3cfa..9a579ce6 100644 --- a/share/locale/bg.json +++ b/share/locale/bg.json @@ -29,7 +29,7 @@ "help_autostop_timer": "Спри споделянето след дадено количество секунди", "help_stealth": "Използвай клиент авторизация (напреднал)", "help_receive": "Получаване на дялове вместо изпращане", - "help_debug": "Протоколирай OnionShare грешки на stdout и уеб грешки на диск", + "help_verbose": "Протоколирай OnionShare грешки на stdout и уеб грешки на диск", "help_filename": "Списък на документи или папки за споделяне", "help_config": "Персонализирано местоположение на JSON конфигурационен файл (незадължително)", "gui_drag_and_drop": "Плъзнете и пуснете файлове и папки, \nза да започнете споделяне", diff --git a/share/locale/bn.json b/share/locale/bn.json index 590295c3..f4560c9c 100644 --- a/share/locale/bn.json +++ b/share/locale/bn.json @@ -29,7 +29,7 @@ "help_autostop_timer": "নির্দিষ্ট সেকেন্ডের পর শেয়ার করা বন্ধ করে দিও", "help_stealth": "ক্লায়েন্ট অনুমোদন ব্যবহার করুন (উন্নততর)", "help_receive": "কোনকিছু শেয়ার না করে শুধু গ্রহণ করবে", - "help_debug": "OnionShare-এর এররগুলো stdout-এ দেখাও, আর ওয়েব এররগুলো ডিস্কে লগ করো", + "help_verbose": "OnionShare-এর এররগুলো stdout-এ দেখাও, আর ওয়েব এররগুলো ডিস্কে লগ করো", "help_filename": "শেয়ার করার জন্য ফাইল বা ফোল্ডারের লিস্ট", "help_config": "কাস্টম JSON কনফিগারেশন ফাইলের লোকেশন (যদি থাকে)", "gui_drag_and_drop": "শেয়ার করা শুরু করতে\nফাইল এবং ফোল্ডারগুলো ড্র্যাগ করে ড্রপ করুন", diff --git a/share/locale/ca.json b/share/locale/ca.json index 83260905..1fb4cccc 100644 --- a/share/locale/ca.json +++ b/share/locale/ca.json @@ -28,7 +28,7 @@ "help_autostop_timer": "Deixa de compartir al cap de tants segons", "help_stealth": "Fes servir autorització de client (avançat)", "help_receive": "Rep recursos en comptes d'enviar-los", - "help_debug": "Envia els errors d'OnionShare a stdout i els errors web al disc", + "help_verbose": "Envia els errors d'OnionShare a stdout i els errors web al disc", "help_filename": "Llista d'arxius o carpetes a compartir", "help_config": "Ubicació de la configuració JSON personalitzada", "gui_drag_and_drop": "Arrossega arxius i carpetes\nper començar a compartir", diff --git a/share/locale/cs.json b/share/locale/cs.json index 0b30e162..6654f9c6 100644 --- a/share/locale/cs.json +++ b/share/locale/cs.json @@ -11,7 +11,7 @@ "help_local_only": "Nepoužívat Tor: jen pro vývoj", "help_stay_open": "Nechat běžet onion service po skončení stahování", "help_stealth": "Create stealth onion service (advanced)", - "help_debug": "Zaznamenat chyby na disk", + "help_verbose": "Zaznamenat chyby na disk", "help_filename": "Seznam souborů a složek ke sdílení", "gui_drag_and_drop": "Táhni a pusť\nsoubory sem", "gui_add": "Přidat", diff --git a/share/locale/da.json b/share/locale/da.json index 375e20c8..8029b28d 100644 --- a/share/locale/da.json +++ b/share/locale/da.json @@ -23,7 +23,7 @@ "help_stay_open": "Fortsæt deling efter filerne er blevet sendt", "help_autostop_timer": "Stop deling efter et vist antal sekunder", "help_stealth": "Brug klientautentifikation (avanceret)", - "help_debug": "Log OnionShare-fejl til stdout, og webfejl til disk", + "help_verbose": "Log OnionShare-fejl til stdout, og webfejl til disk", "help_filename": "Liste over filer eller mapper som skal deles", "help_config": "Tilpasset placering af JSON-konfigurationsfil (valgfri)", "gui_drag_and_drop": "Træk og slip filer og mapper her\nfor at starte deling", diff --git a/share/locale/de.json b/share/locale/de.json index 88f85065..6bcc1847 100644 --- a/share/locale/de.json +++ b/share/locale/de.json @@ -8,7 +8,7 @@ "large_filesize": "Warnung: Das Hochladen von großen Dateien kann Stunden dauern", "help_local_only": "Tor nicht verwenden (nur für Entwicklung)", "help_stay_open": "Den Server weiterlaufen lassen, nachdem die Dateien verschickt wurden", - "help_debug": "Schreibe Fehler von OnionShare nach stdout und Webfehler auf die Festplatte", + "help_verbose": "Schreibe Fehler von OnionShare nach stdout und Webfehler auf die Festplatte", "help_filename": "Liste der zu teilenden Dateien oder Ordner", "gui_drag_and_drop": "Dateien und Ordner hierher ziehen\num sie zu teilen", "gui_add": "Hinzufügen", diff --git a/share/locale/el.json b/share/locale/el.json index 0c517d4a..06388a92 100644 --- a/share/locale/el.json +++ b/share/locale/el.json @@ -28,7 +28,7 @@ "help_autostop_timer": "Να τερματιστεί ο διαμοιρασμός μετά από ένα συγκεκριμένο αριθμό δευτερολέπτων", "help_stealth": "Κάντε χρήση εξουσιοδότησης πελάτη (Για προχωρημένους)", "help_receive": "Λάβετε διαμοιρασμένα αρχεία αντι να τα στέλνετε", - "help_debug": "Κατέγραψε τα σφάλματα του OnionShare στο stdout (συνήθως οθόνη) και τα σφάλματα web στον δίσκο", + "help_verbose": "Κατέγραψε τα σφάλματα του OnionShare στο stdout (συνήθως οθόνη) και τα σφάλματα web στον δίσκο", "help_filename": "Λίστα αρχείων ή φακέλων για μοίρασμα", "help_config": "Ορίστε σημείο αποθήκευσης αρχείου JSON", "gui_drag_and_drop": "Σύρτε και αφήστε αρχεία και φακέλους\nγια να αρχίσετε να τα μοιράζεστε", diff --git a/share/locale/en.json b/share/locale/en.json index 196894e9..d4886844 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -25,7 +25,7 @@ "help_connect_timeout": "Give up connecting to Tor after a given amount of seconds (default: 120)", "help_stealth": "Use client authorization (advanced)", "help_receive": "Receive shares instead of sending them", - "help_debug": "Log OnionShare errors to stdout, and web errors to disk", + "help_verbose": "Log OnionShare errors to stdout, and web errors to disk", "help_filename": "List of files or folders to share", "help_config": "Custom JSON config file location (optional)", "gui_drag_and_drop": "Drag and drop files and folders\nto start sharing", diff --git a/share/locale/eo.json b/share/locale/eo.json index bf578276..ea3cef9c 100644 --- a/share/locale/eo.json +++ b/share/locale/eo.json @@ -11,7 +11,7 @@ "help_local_only": "Ne strebu uzi tor: nur por evoluado", "help_stay_open": "Lasu onion service funkcii post fino de elŝuto", "help_stealth": "Create stealth onion service (advanced)", - "help_debug": "Protokoli erarojn sur disko", + "help_verbose": "Protokoli erarojn sur disko", "help_filename": "Listo de dosieroj aŭ dosierujoj por kundividi", "gui_drag_and_drop": "Ŝovu kaj metu\nla dosierojn ĉi tien", "gui_add": "Aldoni", diff --git a/share/locale/es.json b/share/locale/es.json index 18426a20..3f588322 100644 --- a/share/locale/es.json +++ b/share/locale/es.json @@ -7,7 +7,7 @@ "closing_automatically": "Detenido porque la transferencia se completó", "help_local_only": "No usar Tor (sólo para desarrollo)", "help_stay_open": "Continuar compartiendo luego que los archivos hayan sido enviados", - "help_debug": "Enviar los errores de OnionShare a stdout, y los errores web al disco", + "help_verbose": "Enviar los errores de OnionShare a stdout, y los errores web al disco", "help_filename": "Lista de archivos o carpetas para compartir", "gui_drag_and_drop": "Arrastra y suelta archivos y carpetas\npara empezar a compartir", "gui_add": "Añadir", diff --git a/share/locale/fa.json b/share/locale/fa.json index 5f389610..1f2d327e 100644 --- a/share/locale/fa.json +++ b/share/locale/fa.json @@ -28,7 +28,7 @@ "help_autostop_timer": "توقف به اشتراک گذاری پس از میزان ثانیه ای مشخص", "help_stealth": "استفاده از احراز هویت کلاینت (پیشرفته)", "help_receive": "دریافت اشتراک به جای ارسال آن", - "help_debug": "لاگ کردن خطاهای OnionShare روی stdout، و خطاهای وب بر روی دیسک", + "help_verbose": "لاگ کردن خطاهای OnionShare روی stdout، و خطاهای وب بر روی دیسک", "help_filename": "لیست فایل ها یا فولدر ها برای به اشتراک گذاری", "help_config": "مکان فایل کانفیگ JSON کاستوم (اختیاری)", "gui_drag_and_drop": "فایل ها و پوشه ها را بکشید و رها کنید\nتا اشتراک گذاری آغاز شود", diff --git a/share/locale/fi.json b/share/locale/fi.json index 5965d78a..aa203a55 100644 --- a/share/locale/fi.json +++ b/share/locale/fi.json @@ -8,7 +8,7 @@ "large_filesize": "Varoitus: Ison tiedoston lähetys saattaa kestää tunteja", "help_local_only": "Älä käytä Toria (vain kehitykseen)", "help_stay_open": "Jatka jakoa tiedostojen lähetyksen jälkeen", - "help_debug": "Kirjaa OnionShare virheet stdout:tiin, ja verkko virheet levylle", + "help_verbose": "Kirjaa OnionShare virheet stdout:tiin, ja verkko virheet levylle", "help_filename": "Luettele jaettavat tiedostot tai kansiot", "gui_drag_and_drop": "Vedä ja pudota\ntiedostot tänne", "gui_add": "Lisää", diff --git a/share/locale/fr.json b/share/locale/fr.json index edc5c370..3c4fa7fe 100644 --- a/share/locale/fr.json +++ b/share/locale/fr.json @@ -13,7 +13,7 @@ "systray_download_canceled_message": "La personne a annulé le téléchargement", "help_local_only": "Ne pas utiliser Tor (uniquement pour le développement)", "help_stay_open": "Continuer le partage après l’envoi des fichiers", - "help_debug": "Journaliser les erreurs d’OnionShare sur la sortie standard et les erreurs Web sur le disque", + "help_verbose": "Journaliser les erreurs d’OnionShare sur la sortie standard et les erreurs Web sur le disque", "help_filename": "Liste des fichiers ou dossiers à partager", "gui_drag_and_drop": "Glisser-déposer des fichiers et dossiers\npour commencer le partage", "gui_add": "Ajouter", diff --git a/share/locale/ga.json b/share/locale/ga.json index 40dbc446..0be0acde 100644 --- a/share/locale/ga.json +++ b/share/locale/ga.json @@ -28,7 +28,7 @@ "help_autostop_timer": "Stop ag comhroinnt tar éis líon áirithe soicindí", "help_stealth": "Úsáid údarú cliaint (ardleibhéal)", "help_receive": "Glac le comhaid chomhroinnte in áit iad a sheoladh", - "help_debug": "Déan tuairisc ar earráidí OnionShare ar stdout, agus earráidí Gréasáin ar an diosca", + "help_verbose": "Déan tuairisc ar earráidí OnionShare ar stdout, agus earráidí Gréasáin ar an diosca", "help_filename": "Liosta comhad nó fillteán le comhroinnt", "help_config": "Suíomh saincheaptha don chomhad cumraíochta JSON (roghnach)", "gui_drag_and_drop": "Tarraing agus scaoil comhaid agus fillteáin\nchun iad a chomhroinnt", diff --git a/share/locale/gu.json b/share/locale/gu.json index 4926eed3..bd855bf9 100644 --- a/share/locale/gu.json +++ b/share/locale/gu.json @@ -29,7 +29,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/he.json b/share/locale/he.json index ecc7755f..4ee1a03b 100644 --- a/share/locale/he.json +++ b/share/locale/he.json @@ -29,7 +29,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/hi.json b/share/locale/hi.json index 5499eeed..8cc4612c 100644 --- a/share/locale/hi.json +++ b/share/locale/hi.json @@ -18,7 +18,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/hu.json b/share/locale/hu.json index cbd71217..e84d0e64 100644 --- a/share/locale/hu.json +++ b/share/locale/hu.json @@ -28,7 +28,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/id.json b/share/locale/id.json index 93677f44..a94d374f 100644 --- a/share/locale/id.json +++ b/share/locale/id.json @@ -28,7 +28,7 @@ "help_autostop_timer": "Berhenti berbagi setelah beberapa detik", "help_stealth": "Gunakan otorisasi klien (lanjutan)", "help_receive": "", - "help_debug": "Catat kesalahan OnionShare ke stdout, dan kesalahan web ke disk", + "help_verbose": "Catat kesalahan OnionShare ke stdout, dan kesalahan web ke disk", "help_filename": "Daftar berkas atau folder untuk dibagikan", "help_config": "", "gui_drag_and_drop": "Seret dan lepas berkas dan folder\nuntuk mulai berbagi", diff --git a/share/locale/is.json b/share/locale/is.json index 201c7ac7..c8a30966 100644 --- a/share/locale/is.json +++ b/share/locale/is.json @@ -28,7 +28,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/it.json b/share/locale/it.json index c882bea3..b717882d 100644 --- a/share/locale/it.json +++ b/share/locale/it.json @@ -8,7 +8,7 @@ "large_filesize": "Attenzione: inviare file di grandi dimensioni può richiedere ore", "help_local_only": "Non usare Tor (solo per lo sviluppo)", "help_stay_open": "Mantieni la condivisione attiva anche dopo che i file sono stati inviati", - "help_debug": "Registra gli errori sul disco", + "help_verbose": "Registra gli errori sul disco", "help_filename": "Lista dei file o cartelle da condividere", "gui_drag_and_drop": "Trascina e rilascia i file e le cartelle per iniziare la condivisione", "gui_add": "Aggiungi", diff --git a/share/locale/ja.json b/share/locale/ja.json index 3c4b4369..0f5bf6e1 100644 --- a/share/locale/ja.json +++ b/share/locale/ja.json @@ -29,7 +29,7 @@ "help_autostop_timer": "数秒後に共有が停止されます", "help_stealth": "クライアント認証を使う（上級者向け）", "help_receive": "共有を送信する代わりに受信する", - "help_debug": "OnionShareのエラーを標準出力に、Webのエラーをディスクに記録する", + "help_verbose": "OnionShareのエラーを標準出力に、Webのエラーをディスクに記録する", "help_filename": "共有するファイルとフォルダの一覧", "help_config": "カスタムJSON設定ファイルの位置（任意）", "gui_drag_and_drop": "共有を始めるにはファイルやフォルダをドラッグアンドドロップしてください", diff --git a/share/locale/ka.json b/share/locale/ka.json index 2755e452..2a04d46a 100644 --- a/share/locale/ka.json +++ b/share/locale/ka.json @@ -28,7 +28,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/ko.json b/share/locale/ko.json index 84498176..adda3a69 100644 --- a/share/locale/ko.json +++ b/share/locale/ko.json @@ -29,7 +29,7 @@ "help_autostop_timer": "정해진 초단위의 시간이 지난후 공유하는 것을 멈추시오", "help_stealth": "고객 허가를 사용 (고급 수준의)", "help_receive": "그것들을 보내는것 대신 공유를 받으시오", - "help_debug": "어니언쉐어 에러들은 표준 출력 장치로 접속하고, 웹 에러들은 디스크로 접속 ", + "help_verbose": "어니언쉐어 에러들은 표준 출력 장치로 접속하고, 웹 에러들은 디스크로 접속 ", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/lg.json b/share/locale/lg.json index 7dbce74b..96b5a0d1 100644 --- a/share/locale/lg.json +++ b/share/locale/lg.json @@ -29,7 +29,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/mk.json b/share/locale/mk.json index 7302d465..b389c2a0 100644 --- a/share/locale/mk.json +++ b/share/locale/mk.json @@ -28,7 +28,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/ms.json b/share/locale/ms.json index 7ddf4396..77a441e8 100644 --- a/share/locale/ms.json +++ b/share/locale/ms.json @@ -18,7 +18,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/nl.json b/share/locale/nl.json index 55596663..93ed9472 100644 --- a/share/locale/nl.json +++ b/share/locale/nl.json @@ -23,7 +23,7 @@ "help_stay_open": "Blijven delen na afronden van eerste download", "help_autostop_timer": "Stoppen met delen na het opgegeven aantal seconden", "help_stealth": "Client-authorisatie gebruiken (geavanceerd)", - "help_debug": "Log OnionShare fouten naar stdout, en web fouten naar disk", + "help_verbose": "Log OnionShare fouten naar stdout, en web fouten naar disk", "help_filename": "Lijst van bestanden of mappen om te delen", "help_config": "Instelbaar pad naar JSON configuratie bestand (optioneel)", "gui_drag_and_drop": "Sleep en zet\nbestanden hier neer om het delen te starten", diff --git a/share/locale/no.json b/share/locale/no.json index d46bba67..b80d82e8 100644 --- a/share/locale/no.json +++ b/share/locale/no.json @@ -29,7 +29,7 @@ "help_autostop_timer": "Stopp deling etter et gitt antall sekunder", "help_stealth": "Bruk klientidentifisering (avansert)", "help_receive": "Motta delinger istedenfor å sende dem", - "help_debug": "Log OnionShare-feil til stdout, og vev-feil til disk", + "help_verbose": "Log OnionShare-feil til stdout, og vev-feil til disk", "help_filename": "Liste over filer eller mapper å dele", "help_config": "Egendefinert JSON-oppsettsfil (valgfri)", "gui_drag_and_drop": "Dra og slipp filer og mapper\nfor å starte deling", diff --git a/share/locale/pa.json b/share/locale/pa.json index 57712ca0..165e297b 100644 --- a/share/locale/pa.json +++ b/share/locale/pa.json @@ -28,7 +28,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/pl.json b/share/locale/pl.json index 94d8dd9e..28534e49 100644 --- a/share/locale/pl.json +++ b/share/locale/pl.json @@ -28,7 +28,7 @@ "help_autostop_timer": "Przestań udostępniać po określonym czasie w sekundach", "help_stealth": "Korzystaj z weryfikacji klienta (zaawansowane)", "help_receive": "Odbieraj dane zamiast je wysyłać", - "help_debug": "Zapisz błędy OnionShare do stdout i zapisz błędy sieciowe na dysku", + "help_verbose": "Zapisz błędy OnionShare do stdout i zapisz błędy sieciowe na dysku", "help_filename": "Lista plików i folderów do udostępnienia", "help_config": "Lokalizacja niestandarowego pliku konfiguracyjnego JSON (opcjonalne)", "gui_drag_and_drop": "Przeciągnij i upuść pliki i foldery\naby je udostępnić", diff --git a/share/locale/pt_BR.json b/share/locale/pt_BR.json index 69dfeb62..589a755c 100644 --- a/share/locale/pt_BR.json +++ b/share/locale/pt_BR.json @@ -28,7 +28,7 @@ "help_autostop_timer": "Parar de compartilhar após um número determinado de segundos", "help_stealth": "Usar autorização de cliente (avançado)", "help_receive": "Receber compartilhamentos ao invés de enviá-los", - "help_debug": "Registrar erros do OnionShare no stdout e erros de rede, no disco", + "help_verbose": "Registrar erros do OnionShare no stdout e erros de rede, no disco", "help_filename": "Lista de arquivos ou pastas a compartilhar", "help_config": "Personalizar a configuração JSON de localização de arquivos (opcional)", "gui_drag_and_drop": "Arrastar arquivos e pastas\npara começar a compartilhá-los", diff --git a/share/locale/pt_PT.json b/share/locale/pt_PT.json index 5e3b81f8..a04c4818 100644 --- a/share/locale/pt_PT.json +++ b/share/locale/pt_PT.json @@ -28,7 +28,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/ro.json b/share/locale/ro.json index f176d374..36daf7dc 100644 --- a/share/locale/ro.json +++ b/share/locale/ro.json @@ -28,7 +28,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/ru.json b/share/locale/ru.json index 54aa66a0..282be0c4 100644 --- a/share/locale/ru.json +++ b/share/locale/ru.json @@ -54,7 +54,7 @@ "help_autostop_timer": "Остановить отправку после заданного количества секунд", "help_stealth": "Использовать авторизацию клиента (дополнительно)", "help_receive": "Получать загрузки вместо их отправки", - "help_debug": "Направлять сообщения об ошибках OnionShare в stdout, ошибки сети сохранять на диск", + "help_verbose": "Направлять сообщения об ошибках OnionShare в stdout, ошибки сети сохранять на диск", "help_filename": "Список файлов или папок для отправки", "help_config": "Расположение пользовательского конфигурационного JSON-файла (необязательно)", "gui_drag_and_drop": "Перетащите сюда файлы и/или папки,\nкоторые хотите отправить.", diff --git a/share/locale/sl.json b/share/locale/sl.json index 3fd265f6..29680bbb 100644 --- a/share/locale/sl.json +++ b/share/locale/sl.json @@ -28,7 +28,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/sn.json b/share/locale/sn.json index ecc7755f..4ee1a03b 100644 --- a/share/locale/sn.json +++ b/share/locale/sn.json @@ -29,7 +29,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/sv.json b/share/locale/sv.json index 3b2254a5..6e21f62a 100644 --- a/share/locale/sv.json +++ b/share/locale/sv.json @@ -29,7 +29,7 @@ "help_autostop_timer": "Sluta dela efter ett bestämt antal sekunder", "help_stealth": "Använd klient-auktorisering (avancerat)", "help_receive": "Ta emot delningar istället för att skicka dem", - "help_debug": "Logga OnionShare fel till stdout och webbfel till hårddisken", + "help_verbose": "Logga OnionShare fel till stdout och webbfel till hårddisken", "help_filename": "Lista filer och mappar att dela", "help_config": "Egenvald sökväg för JSON konfigurationsfil (valfri)", "gui_drag_and_drop": "Dra och släpp filer och mappar\nför att börja delning", diff --git a/share/locale/tr.json b/share/locale/tr.json index 7e9832e0..c840b6b4 100644 --- a/share/locale/tr.json +++ b/share/locale/tr.json @@ -8,7 +8,7 @@ "large_filesize": "Uyarı: Büyük dosyaların gönderimi saatler sürebilir", "help_local_only": "Tor kullanmaya kalkışmayın: sadece geliştirme için", "help_stay_open": "İndirme tamamlandıktan sonra gizli hizmeti çalıştırmaya devam et", - "help_debug": "Hata kayıtlarını diske kaydet", + "help_verbose": "Hata kayıtlarını diske kaydet", "help_filename": "Paylaşmak için dosya ve klasörler listesi", "gui_drag_and_drop": "Dosyaları buraya\n Sürükle ve Bırak", "gui_add": "Ekle", diff --git a/share/locale/wo.json b/share/locale/wo.json index 1d60545f..89d732b3 100644 --- a/share/locale/wo.json +++ b/share/locale/wo.json @@ -28,7 +28,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/yo.json b/share/locale/yo.json index 7dbce74b..96b5a0d1 100644 --- a/share/locale/yo.json +++ b/share/locale/yo.json @@ -29,7 +29,7 @@ "help_autostop_timer": "", "help_stealth": "", "help_receive": "", - "help_debug": "", + "help_verbose": "", "help_filename": "", "help_config": "", "gui_drag_and_drop": "", diff --git a/share/locale/zh_Hans.json b/share/locale/zh_Hans.json index 1c71fafe..570c123f 100644 --- a/share/locale/zh_Hans.json +++ b/share/locale/zh_Hans.json @@ -28,7 +28,7 @@ "help_autostop_timer": "超过给定时间（秒）后终止分享", "help_stealth": "使用服务端认证(高级选项)", "help_receive": "仅接收分享的文件，不发送", - "help_debug": "将OnionShare错误日志记录到stdout，将web错误日志记录到磁盘", + "help_verbose": "将OnionShare错误日志记录到stdout，将web错误日志记录到磁盘", "help_filename": "要分享的文件或文件夹的列表", "help_config": "自定义JSON配置文件的路径(可选)", "gui_drag_and_drop": "将文件或文件夹拖动到这里来开始分享", diff --git a/share/locale/zh_Hant.json b/share/locale/zh_Hant.json index 032ed353..ab40d326 100644 --- a/share/locale/zh_Hant.json +++ b/share/locale/zh_Hant.json @@ -28,7 +28,7 @@ "help_autostop_timer": "在所給定的秒數後停止分享", "help_stealth": "使用客戶端認證 (進階選項)", "help_receive": "接收分享的檔案而不是傳送他們", - "help_debug": "將OnionShare的錯誤日誌輸出到stdout, 並且將網路錯誤輸出到硬碟", + "help_verbose": "將OnionShare的錯誤日誌輸出到stdout, 並且將網路錯誤輸出到硬碟", "help_filename": "列舉所要分享的檔案或資料夾", "help_config": "自定義的JSON設置檔路徑(選擇性)", "gui_drag_and_drop": "拖曳檔案及資料夾來開始分享", diff --git a/tests/test_onionshare_common.py b/tests/test_onionshare_common.py index d70f2c0e..f975dce7 100644 --- a/tests/test_onionshare_common.py +++ b/tests/test_onionshare_common.py @@ -268,7 +268,7 @@ class TestLog: def dummy_func(): pass - common_obj.debug = True + common_obj.verbose = True # From: https://stackoverflow.com/questions/1218933 with io.StringIO() as buf, contextlib.redirect_stdout(buf): |