Merge branch 'work/v1.10' into dev

# Conflicts:
#	CMakeLists.txt
#	Depends-Android.cmake
#	res/about/version.gmi
#	res/lang/cs.bin
#	res/lang/eo.bin
#	res/lang/es.bin
#	res/lang/fi.bin
#	res/lang/gl.bin
#	res/lang/ia.bin
#	res/lang/ie.bin
#	res/lang/ru.bin
#	res/lang/sr.bin
#	res/lang/tok.bin
#	res/lang/tr.bin
#	res/lang/uk.bin
#	res/lang/zh_Hant.bin
#	src/app.c
#	src/main.c
#	src/ui/documentwidget.c
#	src/ui/labelwidget.c
#	src/ui/sidebarwidget.c
#	src/ui/util.c

1 files changed, 135 insertions, 47 deletions

diff --git a/po/en.po b/po/en.po
index 066c4eca..687c4321 100644
--- a/po/en.po
+++ b/po/en.po
@@ -3,7 +3,7 @@ msgstr "Preformatted text without a caption"
 
 # Link download progress message.
 msgid "doc.fetching"
-msgstr "Fetching"
+msgstr "Loading"
 
 #, c-format
 msgid "doc.archive"
@@ -196,6 +196,9 @@ msgstr "Find on Page"
 msgid "macos.menu.find"
 msgstr "Find"
 
+msgid "menu.open.external"
+msgstr "Open in Another App"
+
 # Used on iOS. "Files" refers to Apple's iOS app where you can pick an iCloud folder.
 msgid "menu.save.files"
 msgstr "Save to Files"
@@ -321,6 +324,10 @@ msgstr "Show History"
 msgid "menu.show.identities"
 msgstr "Show Identities"
 
+# Active identity toolbar menu.
+msgid "menu.hide.identities"
+msgstr "Hide Identities"
+""
 # Used in the View menu on macOS. Shows sidebar and switches sidebar tab.
 msgid "menu.show.outline"
 msgstr "Show Page Outline"
@@ -337,6 +344,9 @@ msgstr "Go to Parent"
 msgid "menu.root"
 msgstr "Go to Root"
 
+msgid "menu.home"
+msgstr "Go Home"
+
 msgid "menu.reload"
 msgstr "Reload Page"
 
@@ -391,9 +401,15 @@ msgstr "New Identity…"
 msgid "menu.identity.import"
 msgstr "Import…"
 
+msgid "menu.identities"
+msgstr "Manage Identities"
+
 msgid "menu.identity.notactive"
 msgstr "No Active Identity"
 
+msgid "sidebar.close"
+msgstr "Done"
+
 msgid "sidebar.bookmarks"
 msgstr "Bookmarks"
 
@@ -409,6 +425,12 @@ msgstr "Identities"
 msgid "sidebar.outline"
 msgstr "Outline"
 
+msgid "sidebar.action.bookmarks.newfolder"
+msgstr "New Folder"
+
+msgid "sidebar.action.bookmarks.edit"
+msgstr "Edit"
+
 # This label should be fairly short so it fits in a button in the sidebar.
 msgid "sidebar.action.feeds.markallread"
 msgstr "Read All"
@@ -428,6 +450,9 @@ msgstr "New…"
 msgid "sidebar.action.ident.import"
 msgstr "Import…"
 
+msgid "sidebar.action.history.clear"
+msgstr "Clear"
+
 # Usage: "(count) Unread" in the sidebar tab title, referring to feed entries.
 msgid "sidebar.unread"
 msgid_plural "sidebar.unread.n"
@@ -548,7 +573,7 @@ msgid "history.clear"
 msgstr "Clear History…"
 
 msgid "heading.history.clear"
-msgstr "CLEAR HISTORY"
+msgstr "Clear History"
 
 msgid "dlg.confirm.history.clear"
 msgstr "Do you really want to erase the history of all visited pages?"
@@ -557,7 +582,7 @@ msgid "dlg.history.clear"
 msgstr "Clear History"
 
 msgid "heading.confirm.bookmarks.delete"
-msgstr "DELETE BOOKMARKS"
+msgstr "Delete Bookmarks"
 
 #, c-format
 msgid "dlg.confirm.bookmarks.delete"
@@ -629,14 +654,19 @@ msgstr "Stop Using Everywhere"
 msgid "ident.export"
 msgstr "Export"
 
+# The %s represents the name of an identity.
+#, c-format
+msgid "ident.switch"
+msgstr "Use %s"
+
 msgid "heading.ident.use"
-msgstr "IDENTITY USAGE"
+msgstr "Identity Usage"
 
 msgid "menu.edit.notes"
 msgstr "Edit Notes…"
 
 msgid "heading.ident.notes"
-msgstr "IDENTITY NOTES"
+msgstr "Identity Notes"
 
 # %s refers to name of an identity.
 #, c-format
@@ -650,7 +680,7 @@ msgid "ident.delete"
 msgstr "Delete Identity…"
 
 msgid "heading.ident.delete"
-msgstr "DELETE IDENTITY"
+msgstr "Delete Identity"
 
 #, c-format
 msgid "dlg.confirm.ident.delete"
@@ -662,13 +692,16 @@ msgstr "Delete Identity and Files"
 msgid "sidebar.empty.idents"
 msgstr "No Identities"
 
+msgid "sidebar.empty.unread"
+msgstr "No Unread Entries"
+
 # The %s format characters are used to highlight the word "Help" and must be used in the translation in same way as here.
 #, c-format
 msgid "ident.gotohelp"
 msgstr "See %sHelp%s for more information about TLS client certificates."
 
 msgid "heading.unsub"
-msgstr "UNSUBSCRIBE"
+msgstr "Unsubscribe"
 
 #, c-format
 msgid "dlg.confirm.unsub"
@@ -685,7 +718,7 @@ msgid "error.server.msg"
 msgstr "Server responded with the message:"
 
 msgid "heading.pageinfo"
-msgstr "PAGE INFORMATION"
+msgstr "Page Information"
 
 msgid "pageinfo.header.cached"
 msgstr "(cached content)"
@@ -733,11 +766,15 @@ msgstr "Line break"
 msgid "dlg.input.send"
 msgstr "Send"
 
+# Paste the line preceding the clicked link into the input prompt.
+msgid "menu.input.precedingline"
+msgstr "Paste Preceding Line"
+
 msgid "heading.save"
-msgstr "FILE SAVED"
+msgstr "File Saved"
 
 msgid "heading.save.incomplete"
-msgstr "PAGE INCOMPLETE"
+msgstr "Page Incomplete"
 
 msgid "dlg.save.incomplete"
 msgstr "The page contents are still being downloaded."
@@ -749,10 +786,10 @@ msgid "dlg.save.opendownload"
 msgstr "Open Downloaded File"
 
 msgid "heading.save.error"
-msgstr "ERROR SAVING FILE"
+msgstr "Error Saving File"
 
 msgid "heading.import.bookmarks"
-msgstr "IMPORT BOOKMARKS"
+msgstr "Import Bookmarks"
 
 #, c-format
 msgid "dlg.import.found"
@@ -770,7 +807,7 @@ msgid "dlg.import.notnew"
 msgstr "All links on this page are already bookmarked."
 
 msgid "heading.autoreload"
-msgstr "AUTO-RELOAD"
+msgstr "Auto-Reload"
 
 msgid "dlg.autoreload"
 msgstr "Select the auto-reload interval for this tab."
@@ -820,11 +857,18 @@ msgstr "Bookmark Link…"
 msgid "link.download"
 msgstr "Download Linked File"
 
+# Shows where a local file is using the Finder.
+msgid "menu.reveal.macos"
+msgstr "Show in Finder"
+
+msgid "menu.share"
+msgstr "Share"
+
 msgid "link.file.delete"
 msgstr "Delete File"
 
 msgid "heading.file.delete"
-msgstr "DELETE FILE"
+msgstr "Delete File"
 
 msgid "dlg.file.delete.confirm"
 msgstr "Are you sure you want to delete this file?"
@@ -833,7 +877,7 @@ msgid "dlg.file.delete"
 msgstr "Delete"
 
 msgid "heading.openlink"
-msgstr "OPEN LINK"
+msgstr "Open Link"
 
 #, c-format
 msgid "dlg.openlink.confirm"
@@ -865,7 +909,7 @@ msgid "dlg.certwarn.domain.expired"
 msgstr "The received certificate is expired AND for the wrong domain."
 
 msgid "heading.certimport"
-msgstr "IMPORT IDENTITY"
+msgstr "Import Identity"
 
 msgid "dlg.certimport.help"
 msgstr "Paste a PEM-encoded certificate and/or private key,\nor drop a .crt/.key file on the window."
@@ -877,10 +921,10 @@ msgid "dlg.certimport.notfound.page"
 msgstr "No certificate/key found on the current page."
 
 msgid "heading.certimport.pasted"
-msgstr "PASTED FROM CLIPBOARD"
+msgstr "Pasted from Clipboard"
 
 msgid "heading.certimport.dropped"
-msgstr "DROPPED FILE"
+msgstr "Dropped File"
 
 # button in the mobile New Identity dialog
 msgid "dlg.certimport.pickfile"
@@ -902,10 +946,10 @@ msgid "dlg.certimport.nokey"
 msgstr "No Private Key"
 
 msgid "link.hint.audio"
-msgstr "Play Audio"
+msgstr "Audio"
 
 msgid "link.hint.image"
-msgstr "View Image"
+msgstr "Image"
 
 msgid "bookmark.title.blank"
 msgstr "Blank Page"
@@ -970,14 +1014,20 @@ msgid "heading.lookup.other"
 msgstr "OTHER"
 
 msgid "menu.page.upload"
-msgstr "Upload Page with Titan…"
+msgstr "Upload with Titan…"
+
+msgid "menu.page.upload.edit"
+msgstr "Edit Page with Titan…"
 
 msgid "heading.upload"
-msgstr "UPLOAD WITH TITAN"
+msgstr "Upload with Titan"
 
 msgid "upload.id"
 msgstr "Identity:"
 
+msgid "heading.upload.id"
+msgstr "Authorization"
+
 msgid "dlg.upload.id.none"
 msgstr "None"
 
@@ -987,6 +1037,15 @@ msgstr "Default"
 msgid "heading.upload.text"
 msgstr "Text"
 
+msgid "menu.upload.export"
+msgstr "Export Text"
+
+msgid "menu.upload.delete"
+msgstr "Delete All"
+
+msgid "menu.upload.delete.confirm"
+msgstr "Really Delete All (No Undo)"
+
 msgid "hint.upload.text"
 msgstr "enter text to upload"
 
@@ -1008,9 +1067,23 @@ msgstr "MIME type:"
 msgid "upload.token"
 msgstr "Token:"
 
+# Mobile subheading in the Upload dialog.
+msgid "upload.url"
+msgstr "URL"
+
+# Mobile subheading: buttons for entering uploaded data.
+msgid "upload.content"
+msgstr "Content"
+
+msgid "hint.upload.path"
+msgstr "URL path"
+
 msgid "hint.upload.token"
 msgstr "see server's instructions"
 
+msgid "hint.upload.token.long"
+msgstr "token — see server's instructions"
+
 msgid "dlg.upload.send"
 msgstr "Upload"
 
@@ -1018,7 +1091,7 @@ msgid "upload.port"
 msgstr "Port…"
 
 msgid "heading.uploadport"
-msgstr "TITAN UPLOAD PORT"
+msgstr "Titan Upload Port"
 
 msgid "dlg.uploadport.msg"
 msgstr "Set the Titan server port to use for this URL. The port is saved in the site-specific configuration."
@@ -1039,7 +1112,7 @@ msgid "dlg.upload.pickfile"
 msgstr "Select File"
 
 msgid "heading.translate"
-msgstr "TRANSLATE PAGE"
+msgstr "Translate Page"
 
 msgid "dlg.translate.unavail"
 msgstr "Service Unavailable"
@@ -1101,7 +1174,7 @@ msgid "lang.es"
 msgstr "Spanish"
 
 msgid "heading.newident"
-msgstr "NEW IDENTITY"
+msgstr "New Identity"
 
 msgid "dlg.newident.rsa.selfsign"
 msgstr "Creating a self-signed 2048-bit RSA certificate."
@@ -1158,13 +1231,13 @@ msgid "dlg.newident.create"
 msgstr "Create Identity"
 
 msgid "heading.newident.missing"
-msgstr "MISSING INFO"
+msgstr "Missing Info"
 
 msgid "dlg.newindent.missing.commonname"
 msgstr "A \"Common name\" must be specified."
 
 msgid "heading.newident.date.bad"
-msgstr "INVALID DATE"
+msgstr "Invalid Date"
 
 msgid "dlg.newident.date.past"
 msgstr "Expiration date must be in the future."
@@ -1173,10 +1246,10 @@ msgid "dlg.newident.date.example"
 msgstr "Please check the \"Valid until\" date. Examples:\n• 2030\n• 2025-06-30\n• 2021-12-31 23:59:59"
 
 msgid "heading.feedcfg"
-msgstr "FEED SETTINGS"
+msgstr "Feed Settings"
 
 msgid "heading.subscribe"
-msgstr "SUBSCRIBE TO PAGE"
+msgstr "Subscribe to Page"
 
 msgid "dlg.feed.title"
 msgstr "Title:"
@@ -1200,10 +1273,10 @@ msgid "dlg.feed.sub"
 msgstr "Subscribe"
 
 msgid "heading.bookmark.add"
-msgstr "ADD BOOKMARK"
+msgstr "Add Bookmark"
 
 msgid "heading.bookmark.edit"
-msgstr "EDIT BOOKMARK"
+msgstr "Edit Bookmark"
 
 msgid "dlg.bookmark.save"
 msgstr "Save Bookmark"
@@ -1224,10 +1297,10 @@ msgid "dlg.bookmark.icon"
 msgstr "Icon:"
 
 msgid "heading.bookmark.tags"
-msgstr "SPECIAL TAGS"
+msgstr "Special Tags"
 
 msgid "heading.addfolder"
-msgstr "ADD FOLDER"
+msgstr "Add Folder"
 
 msgid "dlg.addfolder.defaulttitle"
 msgstr "New Folder"
@@ -1239,14 +1312,14 @@ msgid "dlg.addfolder"
 msgstr "Add Folder"
 
 msgid "heading.prefs"
-msgstr "PREFERENCES"
+msgstr "Preferences"
 
 # used on mobile
 msgid "heading.settings"
-msgstr "SETTINGS"
+msgstr "Settings"
 
 msgid "heading.prefs.certs"
-msgstr "CERTIFICATES"
+msgstr "Certificates"
 
 # tab button
 msgid "heading.prefs.colors"
@@ -1272,25 +1345,25 @@ msgid "heading.prefs.network"
 msgstr "Network"
 
 msgid "heading.prefs.paragraph"
-msgstr "PARAGRAPH"
+msgstr "Paragraph"
 
 msgid "heading.prefs.uitheme"
-msgstr "UI COLORS"
+msgstr "UI Colors"
 
 msgid "heading.prefs.pagecontent"
-msgstr "PAGE COLORS"
+msgstr "Page Colors"
 
 msgid "heading.prefs.proxies"
-msgstr "PROXIES"
+msgstr "Proxies"
 
 msgid "heading.prefs.scrolling"
-msgstr "SCROLLING"
+msgstr "Scrolling"
 
 msgid "heading.prefs.sizing"
-msgstr "SIZING"
+msgstr "Sizing"
 
 msgid "heading.prefs.widelayout"
-msgstr "WIDE LAYOUT"
+msgstr "Wide Layout"
 
 # tab button
 msgid "heading.prefs.style"
@@ -1349,6 +1422,15 @@ msgstr "Load image on scroll:"
 msgid "prefs.hidetoolbarscroll"
 msgstr "Hide toolbar on scroll:"
 
+msgid "heading.prefs.toolbaractions"
+msgstr "Toolbar Actions"
+
+msgid "prefs.toolbaraction1"
+msgstr "Button 1"
+
+msgid "prefs.toolbaraction2"
+msgstr "Button 2"
+
 msgid "prefs.ostheme"
 msgstr "Use system theme:"
 
@@ -1388,6 +1470,9 @@ msgstr "UI scale factor:"
 msgid "prefs.customframe"
 msgstr "Custom window frame:"
 
+msgid "prefs.blink"
+msgstr "Blinking cursor:"
+
 msgid "prefs.returnkey"
 msgstr "Return key behavior:"
 
@@ -1698,7 +1783,10 @@ msgid "keys.hoverurl"
 msgstr "Toggle show URL on hover"
 
 msgid "keys.upload"
-msgstr "Upload page with Titan"
+msgstr "Upload with Titan"
+
+msgid "keys.upload.edit"
+msgstr "Edit Page with Titan"
 
 msgid "error.badstatus"
 msgstr "Unknown Status Code"
@@ -1948,7 +2036,7 @@ msgid "fontpack.delete"
 msgstr "Permanently delete \"%s\""
 
 msgid "heading.fontpack.delete"
-msgstr "DELETE FONTPACK"
+msgstr "Delete Fontpack"
 
 #, c-format
 msgid "dlg.fontpack.delete.confirm"
@@ -1976,7 +2064,7 @@ msgid "truetype.help.installed"
 msgstr "This font is installed in the user fonts directory."
 
 msgid "heading.dismiss.warning"
-msgstr "DISMISS WARNING?"
+msgstr "Dismiss Warning?"
 
 #, c-format
 msgid "dlg.dismiss.ansi"
@@ -1986,7 +2074,7 @@ msgid "dlg.dismiss.warning"
 msgstr "Dismiss Warning"
 
 msgid "heading.fontpack.classic"
-msgstr "DOWNLOAD FONTPACK"
+msgstr "Download Fontpack"
 
 msgid "dlg.fontpack.classic.msg"
 msgstr "The fonts previously bundled with the app are now available as a separate download. Would you like to download the \"Classic set\" fontpack now?"