Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1

This commit is contained in:
Travis Ralston 2019-02-25 09:40:50 -07:00
commit 4801b25f77
16 changed files with 111 additions and 93 deletions

View file

@ -540,6 +540,7 @@
"Labs": "Labs",
"Notifications": "Notifications",
"Start automatically after system login": "Start automatically after system login",
"Close button should minimize window to tray": "Close button should minimize window to tray",
"Preferences": "Preferences",
"Composer": "Composer",
"Timeline": "Timeline",
@ -1202,6 +1203,7 @@
"View Decrypted Source": "View Decrypted Source",
"Unhide Preview": "Unhide Preview",
"Share Message": "Share Message",
"Share Permalink": "Share Permalink",
"Quote": "Quote",
"Source URL": "Source URL",
"Collapse Reply Thread": "Collapse Reply Thread",