Merge branch 'dev' into work/typesetter

# Conflicts:
#	src/gmdocument.c
#	src/ui/documentwidget.c
#	src/ui/inputwidget.h

1 files changed, 3 insertions, 1 deletions

diff --git a/src/ui/translation.c b/src/ui/translation.c
index 4102fcb9..88edc48b 100644
--- a/src/ui/translation.c
+++ b/src/ui/translation.c
@@ -460,6 +460,7 @@ iBool handleCommand_Translation(iTranslation *d, const char *cmd) {
     if (equalWidget_Command(cmd, w, "translation.finished")) {
         if (!isFinished_Translation(d)) {
             if (processResult_Translation_(d)) {
+                setupSheetTransition_Mobile(d->dlg, iFalse);
                 destroy_Widget(d->dlg);
                 d->dlg = NULL;
             }
@@ -472,10 +473,11 @@ iBool handleCommand_Translation(iTranslation *d, const char *cmd) {
             updateTextCStr_LabelWidget(
                 findMenuItem_Widget(findChild_Widget(d->dlg, "dialogbuttons"),
                                     "translation.cancel"),
-                "${dismiss}");
+                "${close}");
             cancel_TlsRequest(d->request);
         }
         else {
+            setupSheetTransition_Mobile(d->dlg, iFalse);
             destroy_Widget(d->dlg);
             d->dlg = NULL;
         }