28 files changed, 22 insertions, 2 deletions

diff --git a/po/en.po b/po/en.po
index 425243cc..a4b83dcc 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1011,7 +1011,10 @@ 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"
@@ -1768,7 +1771,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"
diff --git a/res/lang/cs.bin b/res/lang/cs.bin
index 47a5496f..bc34d7e8 100644
--- a/res/lang/cs.bin
+++ b/res/lang/cs.bin
diff --git a/res/lang/de.bin b/res/lang/de.bin
index b0967918..5fb9eb03 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index a918af83..114fa684 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index 5f5a056a..3d16450c 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index 91c1a9e6..fe6bdbb5 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index baf7e294..c96da0b0 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index 67ed5398..d06dfc9c 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index b4ecf798..4cda45d8 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 005feca3..7ffb40ec 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/hu.bin b/res/lang/hu.bin
index 4f9b6d8b..e698c7ac 100644
--- a/res/lang/hu.bin
+++ b/res/lang/hu.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index d29bcee8..f951f0c5 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index b648a56c..c4671e06 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 32b2cb39..2788dc3f 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 20fa1621..29260245 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 6c2be568..712d8a01 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index 0604ebab..79b1208f 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 38b56ffa..79e76d20 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index c8097f29..31f9536e 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/tr.bin b/res/lang/tr.bin
index 587774cc..758dba68 100644
--- a/res/lang/tr.bin
+++ b/res/lang/tr.bin
diff --git a/res/lang/uk.bin b/res/lang/uk.bin
index 18707608..6aedfe5f 100644
--- a/res/lang/uk.bin
+++ b/res/lang/uk.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 39024cdc..036ecca3 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 59c4dcea..d2aa482d 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index f9efdd28..e63e4636 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -4116,6 +4116,12 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             setResponseViewer_UploadWidget(upload, d);
             addChild_Widget(get_Root()->widget, iClob(upload));
             setupSheetTransition_Mobile(as_Widget(upload), iTrue);
+            if (argLabel_Command(cmd, "copy") && isUtf8_Rangecc(range_Block(&d->sourceContent))) {
+                iString text;
+                initBlock_String(&text, &d->sourceContent);
+                setText_UploadWidget(upload, &text);
+                deinit_String(&text);
+            }
             postRefresh_App();
         }
         return iTrue;
@@ -5080,6 +5086,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                             { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
                             { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
+                            { "${menu.page.upload.edit}", 0, 0, "document.upload copy:1" },
                             { "---" },
                             { "${menu.page.copyurl}", 0, 0, "document.copylink" } },
                         16);
diff --git a/src/ui/keys.c b/src/ui/keys.c
index 30072572..d4d9320e 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -240,6 +240,7 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] =
     { 100,{ "${keys.hoverurl}",             '/', KMOD_PRIMARY,              "prefs.hoverlink.toggle"            }, 0 },
     { 110,{ "${menu.save.downloads}",       SDLK_s, KMOD_PRIMARY,           "document.save"                     }, 0 },
     { 120,{ "${keys.upload}",               SDLK_u, KMOD_PRIMARY,           "document.upload"                   }, 0 },
+    { 121,{ "${keys.upload.edit}",          SDLK_e, KMOD_PRIMARY,           "document.upload copy:1"            }, 0 },
     /* The following cannot currently be changed (built-in duplicates). */
 #if defined (iPlatformApple)
     { 1002, { NULL, SDLK_LEFTBRACKET,  KMOD_PRIMARY,             "navigate.back"        }, 0 },
diff --git a/src/ui/root.c b/src/ui/root.c
index 3e0124d8..bc2bc0fb 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1402,6 +1402,7 @@ void createUserInterface_Root(iRoot *d) {
                         { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                         { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
                         { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
+                        { "${menu.page.upload.edit}", 0, 0, "document.upload copy:1" },
                         { "---" },
                         { "${menu.page.copyurl}", 0, 0, "document.copylink" },
                         { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 28a35668..ae777a68 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -406,6 +406,10 @@ void setResponseViewer_UploadWidget(iUploadWidget *d, iDocumentWidget *doc) {
     d->viewer = doc;
 }
 
+void setText_UploadWidget(iUploadWidget *d, const iString *text) {
+    setText_InputWidget(findChild_Widget(as_Widget(d), "upload.text"), text);    
+}
+
 static iWidget *acceptButton_UploadWidget_(iUploadWidget *d) {
     return lastChild_Widget(findChild_Widget(as_Widget(d), "dialogbuttons"));
 }
diff --git a/src/ui/uploadwidget.h b/src/ui/uploadwidget.h
index 5a7de45e..1cc1f193 100644
--- a/src/ui/uploadwidget.h
+++ b/src/ui/uploadwidget.h
@@ -31,3 +31,4 @@ iDeclareType(DocumentWidget)
     
 void    setUrl_UploadWidget             (iUploadWidget *, const iString *url);
 void    setResponseViewer_UploadWidget  (iUploadWidget *, iDocumentWidget *doc);
+void    setText_UploadWidget            (iUploadWidget *, const iString *text);