summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorhiro <hiro@torproject.org>2019-04-23 16:20:33 +0200
committerhiro <hiro@torproject.org>2019-04-23 16:20:33 +0200
commit357374c147071b217f1480dbda67d3dfa6a091c2 (patch)
tree6baa9f20fd1beb31693a62fdb2078b6e5d3253e0 /share
parent0c6dbe4c8a08c3372fa1707a4afc2611e2bdd535 (diff)
downloadonionshare-357374c147071b217f1480dbda67d3dfa6a091c2.tar.gz
onionshare-357374c147071b217f1480dbda67d3dfa6a091c2.zip
Fix merge conflicts with upstream
Diffstat (limited to 'share')
-rw-r--r--share/locale/en.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/locale/en.json b/share/locale/en.json
index dafd20d1..de6639a6 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -147,6 +147,8 @@
"systray_menu_exit": "Quit",
"systray_page_loaded_title": "Page Loaded",
"systray_page_loaded_message": "OnionShare address loaded",
+ "systray_site_loaded_title": "Site Loaded",
+ "systray_site_loaded_message": "OnionShare site loaded",
"systray_share_started_title": "Sharing Started",
"systray_share_started_message": "Starting to send files to someone",
"systray_share_completed_title": "Sharing Complete",