Merge branch 'master' into forward-with-attachments

elementary · Jul 3, 2023 · 42f5f21 · 42f5f21
2 parents 6976a14 + 62cc928
commit 42f5f21
Show file tree

Hide file tree

Showing 410 changed files with 19,401 additions and 12,856 deletions.
diff --git a/.github/workflows/flatpak-x-checker.yml b/.github/workflows/flatpak-x-checker.yml
@@ -0,0 +1,22 @@
+name: Check for updates
+on:
+  schedule: # for scheduling to work this file must be in the default branch
+  - cron: "0 0 * * 1" # run weekly
+  workflow_dispatch: # can be manually dispatched under GitHub's "Actions" tab
+
+jobs:
+  flatpak-external-data-checker:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest
+        env:
+          GIT_AUTHOR_NAME: elementaryBot
+          GIT_COMMITTER_NAME: elementaryBot
+          GIT_AUTHOR_EMAIL: builds@elementary.io
+          GIT_COMMITTER_EMAIL: builds@elementary.io
+          EMAIL: builds@elementary.io
+          GITHUB_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
+        with:
+          args: --update --never-fork io.elementary.mail.json
diff --git a/data/blank-message-template.html b/data/blank-message-template.html
@@ -37,11 +37,21 @@
         body.plain a {
             cursor: text;
         }
-        #message-body {
+        #elementary-message-body {
             box-sizing: border-box;
             padding: 6px;
             outline: 0px solid transparent;
-            min-height: 100%;
+        }
+        #elementary-message-signature {
+            box-sizing: border-box;
+            padding: 6px;
+            outline: 0px solid transparent;
+        }
+        #elementary-message-quote {
+            box-sizing: border-box;
+            padding: 6px;
+            padding-top: 12px !important;
+            outline: 0px solid transparent;
         }
         blockquote {
             margin-top: 0px;
@@ -62,6 +72,8 @@
     </style>
 </head>
 <body>
-    <div contenteditable="true" id="message-body" dir="auto"></div>
+    <div contenteditable="true" style="height:100%;" id="elementary-message-body" dir="auto"></div>
+    <div contenteditable="true" hidden="true" id="elementary-message-signature" dir="auto"></div>
+    <div contenteditable="true" hidden="true" id="elementary-message-quote" dir="auto"></div>
 </body>
 </html>
diff --git a/po/POTFILES b/po/POTFILES
@@ -1,5 +1,6 @@
 src/Application.vala
 src/Composer.vala
+src/EditorToolbar.vala
 src/InboxMonitor.vala
 src/MainWindow.vala
 src/Utils.vala

diff --git a/po/aa.po b/po/aa.po
@@ -2,187 +2,217 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-01 21:56+0000\n"
+"POT-Creation-Date: 2023-06-16 17:05+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: src/Composer.vala:99 src/MessageList/MessageListItem.vala:100
+#: src/Application.vala:208
+msgid ""
+"Mail will automatically start when this device turns on and run when its "
+"window is closed so that it can send notifications when new mail arrives."
+msgstr ""
+
+#: src/Composer.vala:86 src/MessageList/MessageListItem.vala:100
 msgid "From:"
 msgstr ""
 
-#: src/Composer.vala:118 src/MessageList/MessageListItem.vala:106
+#: src/Composer.vala:105 src/MessageList/MessageListItem.vala:106
 msgid "To:"
 msgstr ""
 
-#: src/Composer.vala:123 src/MessageList/MessageListItem.vala:112
+#: src/Composer.vala:110 src/MessageList/MessageListItem.vala:112
 msgid "Subject:"
 msgstr ""
 
-#: src/Composer.vala:132
+#: src/Composer.vala:119
 msgid "Cc"
 msgstr ""
 
-#: src/Composer.vala:134
+#: src/Composer.vala:121
 msgid "Bcc"
 msgstr ""
 
-#: src/Composer.vala:141 src/MessageList/MessageListItem.vala:146
+#: src/Composer.vala:128 src/MessageList/MessageListItem.vala:146
 msgid "Cc:"
 msgstr ""
 
-#: src/Composer.vala:159
+#: src/Composer.vala:146
 msgid "Bcc:"
 msgstr ""
 
-#: src/Composer.vala:211
-msgid "Bold"
+#: src/Composer.vala:196
+msgid "Insert Image"
 msgstr ""
 
-#: src/Composer.vala:218
-msgid "Italic"
+#: src/Composer.vala:222
+msgid "Delete draft"
 msgstr ""
 
-#: src/Composer.vala:227
-msgid "Underline"
+#: src/Composer.vala:230
+msgid "Attach file"
 msgstr ""
 
 #: src/Composer.vala:237
-msgid "Strikethrough"
+msgid "Send"
 msgstr ""
 
-#: src/Composer.vala:245
-msgid "Remove formatting"
+#: src/Composer.vala:274
+msgid "New Message"
 msgstr ""
 
-#: src/Composer.vala:260 src/Dialogs/InsertLinkDialog.vala:68
-msgid "Insert Link"
+#: src/Composer.vala:418
+msgid "Choose a file"
 msgstr ""
 
-#: src/Composer.vala:293
-msgid "Delete draft"
+#: src/Composer.vala:421
+msgid "Attach"
 msgstr ""
 
-#: src/Composer.vala:301
-msgid "Attach file"
+#: src/Composer.vala:422 src/Composer.vala:446 src/Composer.vala:658
+#: src/Dialogs/InsertLinkDialog.vala:66
+#: src/MessageList/AttachmentButton.vala:139
+msgid "Cancel"
 msgstr ""
 
-#: src/Composer.vala:308
-msgid "Send"
+#: src/Composer.vala:438
+msgid "Images"
 msgstr ""
 
-#: src/Composer.vala:345
-msgid "New Message"
+#: src/Composer.vala:442
+msgid "Choose an image"
 msgstr ""
 
-#: src/Composer.vala:492
-msgid "Choose a file"
+#: src/Composer.vala:445
+msgid "Insert"
 msgstr ""
 
-#: src/Composer.vala:495
-msgid "Attach"
+#: src/Composer.vala:474
+msgid "Unable to insert image"
 msgstr ""
 
-#: src/Composer.vala:496 src/Composer.vala:729
-#: src/Dialogs/InsertLinkDialog.vala:66
-#: src/MessageList/AttachmentButton.vala:139
-msgid "Cancel"
+#: src/Composer.vala:475
+msgid "There was an unexpected error while trying to insert the image."
 msgstr ""
 
-#: src/Composer.vala:639
+#: src/Composer.vala:594
 msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgstr ""
 
-#: src/Composer.vala:669
+#: src/Composer.vala:624
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
-#: src/Composer.vala:673
+#: src/Composer.vala:628
 msgid "---------- Forwarded message ----------"
 msgstr ""
 
-#: src/Composer.vala:675
+#: src/Composer.vala:630
 #, c-format
 msgid "From: %s<br/>"
 msgstr ""
 
-#: src/Composer.vala:676
+#: src/Composer.vala:631
 #, c-format
 msgid "Subject: %s<br/>"
 msgstr ""
 
-#: src/Composer.vala:677
+#: src/Composer.vala:632
 #, c-format
 msgid "Date: %s<br/>"
 msgstr ""
 
-#: src/Composer.vala:678
+#: src/Composer.vala:633
 #, c-format
 msgid "To: %s<br/>"
 msgstr ""
 
-#: src/Composer.vala:680
+#: src/Composer.vala:635
 #, c-format
 msgid "Cc: %s<br/>"
 msgstr ""
 
-#: src/Composer.vala:720
+#: src/Composer.vala:649
 msgid "Permanently delete this draft?"
 msgstr ""
 
-#: src/Composer.vala:721
+#: src/Composer.vala:650
 msgid ""
 "You cannot undo this action, nor recover your draft once it has been deleted."
 msgstr ""
 
-#: src/Composer.vala:731
+#: src/Composer.vala:660
 msgid "Delete Draft"
 msgstr ""
 
-#: src/Composer.vala:755
+#: src/Composer.vala:684
 msgid "Send without subject?"
 msgstr ""
 
-#: src/Composer.vala:756
+#: src/Composer.vala:685
 msgid ""
 "This message has an empty subject field. The recipient may be unable to "
 "infer its scope or importance."
 msgstr ""
 
-#: src/Composer.vala:763
+#: src/Composer.vala:692
 msgid "Don't Send"
 msgstr ""
 
-#: src/Composer.vala:765
+#: src/Composer.vala:694
 msgid "Send Anyway"
 msgstr ""
 
-#: src/Composer.vala:790
+#: src/Composer.vala:719
 msgid "Sent message was not saved"
 msgstr ""
 
-#: src/Composer.vala:791
+#: src/Composer.vala:720
 msgid ""
 "The message was sent, however a copy was not saved to the Sent message "
 "folder."
 msgstr ""
 
-#: src/Composer.vala:806
+#: src/Composer.vala:735
 msgid "Unable to send message"
 msgstr ""
 
-#: src/Composer.vala:807
+#: src/Composer.vala:736
 msgid "There was an unexpected error while sending your message."
 msgstr ""
 
-#: src/Composer.vala:1027
+#: src/Composer.vala:980
 msgid "Unable to save draft"
 msgstr ""
 
-#: src/Composer.vala:1028
+#: src/Composer.vala:981
 msgid "There was an unexpected error while saving your draft."
 msgstr ""
 
+#: src/EditorToolbar.vala:55
+msgid "Bold"
+msgstr ""
+
+#: src/EditorToolbar.vala:62
+msgid "Italic"
+msgstr ""
+
+#: src/EditorToolbar.vala:73
+msgid "Underline"
+msgstr ""
+
+#: src/EditorToolbar.vala:85
+msgid "Strikethrough"
+msgstr ""
+
+#: src/EditorToolbar.vala:100
+msgid "Remove formatting"
+msgstr ""
+
+#: src/EditorToolbar.vala:108 src/Dialogs/InsertLinkDialog.vala:68
+msgid "Insert Link"
+msgstr ""
+
 #: src/InboxMonitor.vala:158 src/InboxMonitor.vala:170
 #, c-format
 msgid "%s to %s"
@@ -213,24 +243,24 @@ msgstr ""
 msgid "Undo"
 msgstr ""
 
-#: src/MainWindow.vala:271
+#: src/MainWindow.vala:277
 msgid "Message Archived"
 msgid_plural "Messages Archived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/MainWindow.vala:274 src/MainWindow.vala:288 src/MainWindow.vala:302
+#: src/MainWindow.vala:280 src/MainWindow.vala:294 src/MainWindow.vala:308
 #, c-format
 msgid "Failed to move messages: %s"
 msgstr ""
 
-#: src/MainWindow.vala:285
+#: src/MainWindow.vala:291
 msgid "Message Moved"
 msgid_plural "Messages Moved"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/MainWindow.vala:299
+#: src/MainWindow.vala:305
 msgid "Message Deleted"
 msgid_plural "Messages Deleted"
 msgstr[0] ""
@@ -373,7 +403,7 @@ msgid ""
 "Open System Settings manually or install Evolution to set up online accounts."
 msgstr ""
 
-#: src/FoldersView/FolderSourceItem.vala:38
+#: src/FoldersView/FolderSourceItem.vala:40
 msgid "Refresh folder"
 msgstr ""