Merge lp:~nathandyer/elementaryos/os-patch-geary-headerbar into lp:~elementary-os/elementaryos/geary-freya

[Nathan Dyer]

This branch is updated to the newest version of Geary (0.8) and has been fully patched to be consistent with the other elementary apps. Icons in the HeaderBar now use the LARGE_TOOLBAR iconsize, and all the icons (including the HeaderBar, side bar, and compose window) now use the system defaults.

[Cody Garver (codygarver)]

0.8 is probably going to get merged into utopic (then this branch automatically) any day now so let's not import it here manually just yet.

For the sake of maintenance, posterity & legibility, these changes should be cleanly separated commits. In this branch, not separate merge requests.

Maybe leave the 0.8 code in there as the first commit then build on it.

Best case scenario we get 0.8 imported from upstream for free and we will still be able to use each commit of this branch as the diffs of clearly separated, more-likely-to-remain-conflict-free patches. Worst case scenario I branch and push this (cleaned up) branch directly to the target trunk.

review: Needs Fixing

[Cody Garver (codygarver)]

yorbajim says geary will probably not make it into utopic so we just need these commits cleaned up and it's good to go

[Nathan Dyer (nathandyer)]

OK, cool! I should have some time tomorrow to clean everything up.

[lp:~nathandyer/elementaryos/os-patch-geary-headerbar]

3. By Nathan Dyer <email address hidden> on 2014-10-02

Initial update to 0.8

4. By Nathan Dyer <email address hidden> on 2014-10-02

Added new files that weren't present in the previous version.

5. By Nathan Dyer <email address hidden> on 2014-10-02

Changed all the icons in the headerbar to standard elementary icons.

6. By Nathan Dyer <email address hidden> on 2014-10-02

Moved the trash/archive/delete buttons back to the left side as they normally are.

7. By Nathan Dyer <email address hidden> on 2014-10-02

Changed the size of the icons in the headerbar from MENU to LARGE_TOOLBAR

8. By Nathan Dyer <email address hidden> on 2014-10-02

Changed all the icons in the sidebar to standard icons.

9. By Nathan Dyer <email address hidden> on 2014-10-02

Changed the composer toolbar icons to standard icon names.

[Nathan Dyer (nathandyer)]

I have cleaned up the code and made separate commits for each change. It should be ready for review again.

=== modified file 'bindings/vapi/gmime-2.6.vapi'
--- bindings/vapi/gmime-2.6.vapi	2014-07-26 10:08:43 +0000
+++ bindings/vapi/gmime-2.6.vapi	2014-10-02 03:11:35 +0000
@@ -173,7 +173,7 @@
 		[CCode (cname = "g_mime_content_type_set_params")]
 		public void set_params (GMime.Param @params);
 		[CCode (cname = "g_mime_content_type_to_string")]
-		public unowned string to_string ();
+		public string to_string ();
 	}
 	[CCode (cheader_filename = "gmime/gmime.h")]
 	public class CryptoContext : GLib.Object {
@@ -546,7 +546,7 @@
 		[CCode (cname = "g_mime_message_get_date")]
 		public void get_date (out ulong date, out int tz_offset);
 		[CCode (cname = "g_mime_message_get_date_as_string")]
-		public unowned string get_date_as_string ();
+		public string get_date_as_string ();
 		[CCode (cname = "g_mime_message_get_message_id")]
 		public unowned string get_message_id ();
 		[CCode (cname = "g_mime_message_get_mime_part")]
@@ -639,9 +639,9 @@
 		[CCode (cname = "g_mime_multipart_remove")]
 		public virtual bool remove (GMime.Object part);
 		[CCode (cname = "g_mime_multipart_remove_at")]
-		public virtual unowned GMime.Object remove_at (int index);
+		public virtual GMime.Object remove_at (int index);
 		[CCode (cname = "g_mime_multipart_replace")]
-		public unowned GMime.Object replace (int index, GMime.Object replacement);
+		public GMime.Object replace (int index, GMime.Object replacement);
 		[CCode (cname = "g_mime_multipart_set_boundary")]
 		public virtual void set_boundary (string boundary);
 		[CCode (cname = "g_mime_multipart_set_postface")]
@@ -698,7 +698,7 @@
 		[CCode (cname = "g_mime_object_get_header_list")]
 		public unowned GMime.HeaderList get_header_list ();
 		[CCode (cname = "g_mime_object_get_headers")]
-		public virtual unowned string get_headers ();
+		public virtual string get_headers ();
 		[CCode (cname = "g_mime_object_prepend_header")]
 		public virtual void prepend_header (string header, string value);
 		[CCode (cname = "g_mime_object_register_type")]
@@ -758,9 +758,9 @@
 		[CCode (cname = "g_mime_parser_new", has_construct_function = false)]
 		public Parser ();
 		[CCode (cname = "g_mime_parser_construct_message")]
-		public unowned GMime.Message? construct_message ();
+		public GMime.Message? construct_message ();
 		[CCode (cname = "g_mime_parser_construct_part")]
-		public unowned GMime.Object construct_part ();
+		public GMime.Object? construct_part ();
 		[CCode (cname = "g_mime_parser_eos")]
 		public bool eos ();
 		[CCode (cname = "g_mime_parser_get_from")]
@@ -1016,6 +1016,8 @@
 		public bool owner;
 		[CCode (cname = "g_mime_stream_file_new", has_construct_function = false, type = "GMimeStream*")]
 		public StreamFile (GLib.FileStream fp);
+		[CCode (cname = "g_mime_stream_file_new_for_path", has_construct_function = false, type = "GMimeStream*")]
+		public StreamFile.for_path (string path, string mode);
 		[CCode (cname = "g_mime_stream_file_get_owner")]
 		public bool get_owner ();
 		[CCode (cname = "g_mime_stream_file_set_owner")]
@@ -1040,6 +1042,8 @@
 		public bool owner;
 		[CCode (cname = "g_mime_stream_fs_new", has_construct_function = false, type = "GMimeStream*")]
 		public StreamFs (int fd);
+		[CCode (cname = "g_mime_stream_fs_new_for_path", has_construct_function = false, type = "GMimeStream*")]
+		public StreamFs.for_path (string path, int flags, int mode);
 		[CCode (cname = "g_mime_stream_fs_get_owner")]
 		public bool get_owner ();
 		[CCode (cname = "g_mime_stream_fs_set_owner")]
@@ -1352,7 +1356,7 @@
 	[CCode (cheader_filename = "gmime/gmime.h", cname = "g_mime_utils_generate_message_id")]
 	public static string utils_generate_message_id (string fqdn);
 	[CCode (cheader_filename = "gmime/gmime.h", cname = "g_mime_utils_header_decode_date")]
-	public static time_t utils_header_decode_date (string str, out unowned int? tz_offset);
+	public static time_t utils_header_decode_date (string str, out int tz_offset);
 	[CCode (cheader_filename = "gmime/gmime.h", cname = "g_mime_utils_header_decode_phrase")]
 	public static string utils_header_decode_phrase (string phrase);
 	[CCode (cheader_filename = "gmime/gmime.h", cname = "g_mime_utils_header_decode_text")]

=== modified file 'bindings/vapi/gmime-2.6/gmime-2.6.files'
--- bindings/vapi/gmime-2.6/gmime-2.6.files	2014-07-26 10:08:43 +0000
+++ bindings/vapi/gmime-2.6/gmime-2.6.files	2014-10-02 03:11:35 +0000
@@ -1,2 +1,2 @@
 include/gmime-2.6/
-lib/libgmime-2.6.so
+lib/x86_64-linux-gnu/libgmime-2.6.so

=== modified file 'bindings/vapi/gmime-2.6/gmime-2.6.metadata'
--- bindings/vapi/gmime-2.6/gmime-2.6.metadata	2014-07-26 10:08:43 +0000
+++ bindings/vapi/gmime-2.6/gmime-2.6.metadata	2014-10-02 03:11:35 +0000
@@ -3,16 +3,22 @@
 GMimeObject abstract="1"
 GMimeStream abstract="1"
 
+g_mime_content_type_to_string transfer_ownership="1"
 g_mime_header_list_get_iter.iter is_out="1"
 g_mime_message_get_date.date is_out="1"
 g_mime_message_get_date.tz_offset is_out="1"
+g_mime_message_get_date_as_string transfer_ownership="1"
 g_mime_message_get_mime_part is_nullable="1"
+g_mime_multipart_remove_at is_nullable="1" transfer_ownership="1"
+g_mime_multipart_replace is_nullable="1" transfer_ownership="1"
 g_mime_object_get_content_disposition nullable="1"
 g_mime_object_get_content_type nullable="1"
 g_mime_object_get_content_type_parameter nullable="1"
+g_mime_object_get_headers transfer_ownership="1"
 g_mime_object_to_string transfer_ownership="1"
 g_mime_param_next name="get_next"
-g_mime_parser_construct_message nullable="1"
+g_mime_parser_construct_message nullable="1" transfer_ownership="1"
+g_mime_parser_construct_part nullable="1" transfer_ownership="1"
 g_mime_part_get_content_description nullable="1"
 g_mime_part_get_content_location nullable="1"
 g_mime_part_get_content_id nullable="1"
@@ -29,7 +35,7 @@
 g_mime_utils_decode_message_id transfer_ownership="1"
 g_mime_utils_generate_message_id transfer_ownership="1"
 g_mime_utils_header_decode_date type_name="time_t"
-g_mime_utils_header_decode_date.tz_offset is_out="1" nullable="1"
+g_mime_utils_header_decode_date.tz_offset is_out="1"
 g_mime_utils_header_decode_phrase transfer_ownership="1"
 g_mime_utils_header_decode_text transfer_ownership="1"
 g_mime_utils_header_encode_phrase transfer_ownership="1"
@@ -50,6 +56,7 @@
 GMimeFilter.outptr type_name="char*" is_protected="1"
 GMimeFilter.outreal type_name="char*" is_protected="1"
 GMimeFilter.outsize hidden="1" is_protected="1"
+GMimeFilterBest.charset hidden="1"
 
 g_mime_filter_backup.data is_array="1" array_length_pos="1.1" array_length_type="size_t" type_name="char[]"
 g_mime_filter_backup.length hidden="1"

=== modified file 'cmake/FindIntltool.cmake'
--- cmake/FindIntltool.cmake	2014-07-26 10:08:43 +0000
+++ cmake/FindIntltool.cmake	2014-10-02 03:11:35 +0000
@@ -19,5 +19,12 @@
         )
         install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) 
     endmacro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
+    macro (INTLTOOL_MERGE_AUTOSTART_DESKTOP desktop_id po_dir)
+        add_custom_target (geary-autostart.desktop ALL
+            ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir}
+                ${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.desktop.in ${desktop_id}.desktop
+        )
+        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-autostart.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+    endmacro (INTLTOOL_MERGE_AUTOSTART_DESKTOP desktop_id po_dir)
 endif (INTLTOOL_MERGE_FOUND)
 

=== modified file 'desktop/CMakeLists.txt'
--- desktop/CMakeLists.txt	2014-07-26 10:08:43 +0000
+++ desktop/CMakeLists.txt	2014-10-02 03:11:35 +0000
@@ -8,10 +8,12 @@
 include (FindDesktopFileValidate)
 if (INTLTOOL_MERGE_FOUND)
     INTLTOOL_MERGE_DESKTOP (geary po)
+    INTLTOOL_MERGE_AUTOSTART_DESKTOP (geary-autostart po)
     
     if (DESKTOP_VALIDATE)
         if (DESKTOP_FILE_VALIDATE_FOUND)
             VALIDATE_DESKTOP_FILE (geary)
+            VALIDATE_DESKTOP_FILE (geary-autostart)
         else (DESKTOP_FILE_VALIDATE_FOUND)
             message (FATAL_ERROR "desktop-file-validate must be installed to validate generated .desktop file")
         endif (DESKTOP_FILE_VALIDATE_FOUND)

=== added file 'desktop/geary-autostart.desktop.in'
--- desktop/geary-autostart.desktop.in	1970-01-01 00:00:00 +0000
+++ desktop/geary-autostart.desktop.in	2014-10-02 03:11:35 +0000
@@ -0,0 +1,14 @@
+[Desktop Entry]
+_Name=Geary
+_GenericName=Mail Client
+_X-GNOME-FullName=Geary Mail
+_Comment=Send and receive email
+_Keywords=Email;E-mail;Mail;
+Icon=geary
+TryExec=geary
+Exec=geary --hidden
+Type=Application
+Terminal=false
+Categories=GNOME;GTK;Network;Email;
+StartupNotify=true
+NoDisplay=true

=== modified file 'desktop/geary.appdata.xml'
--- desktop/geary.appdata.xml	2014-07-26 10:08:43 +0000
+++ desktop/geary.appdata.xml	2014-10-02 03:11:35 +0000
@@ -2,11 +2,12 @@
 <!-- Copyright 2013-2014 Yorba Foundation <[e-mail]> -->
 <application>
 <id type="desktop">geary.desktop</id>
-<licence>CC0</licence>
-<summary>Lightweight email client</summary>
+<metadata_license>CC0</metadata_license>
+<project_license>LGPL-2.1+</project_license>
+<summary>Lightweight mail client</summary>
 <description>
 <p>
-Geary is a new email application for GNOME designed to let you manage your email
+Geary is a mail application for GNOME designed to let you manage your email
 quickly and effortlessly. Its interface is based on conversations, so you can
 read an entire discussion without having to click from message to message.
 Geary is still in development and has a limited but growing set of features.
@@ -20,13 +21,13 @@
 <li>As-you-type searching</li>
 <li>Desktop notifications</li>
 <li>Multiple account support</li>
-<li>HTML composer that saves drafts to the server</li>
+<li>Inline HTML composer that saves drafts to the server</li>
 <li>Works with Gmail, Yahoo! Mail, Outlook.com (experimental), and other popular IMAP servers</li>
 </ul>
 </description>
-<url type="homepage">http://www.yorba.org/projects/geary/</url>
+<url type="homepage">https://wiki.gnome.org/Apps/Geary</url>
 <screenshots>
-<screenshot type="default">http://www.yorba.org/wp-content/uploads/2013/03/geary_main.png</screenshot>
+<screenshot type="default">http://yorba.org/geary/geary.png</screenshot>
 </screenshots>
 <updatecontact>[e-mail]</updatecontact>
 </application>

=== modified file 'desktop/org.yorba.geary.gschema.xml'
--- desktop/org.yorba.geary.gschema.xml	2014-07-26 10:08:43 +0000
+++ desktop/org.yorba.geary.gschema.xml	2014-10-02 03:11:35 +0000
@@ -59,6 +59,11 @@
         <summary>show notifications for new mail</summary>
         <description>True to show notification bubbles.</description>
     </key>
+    <key name="startup-notifications" type="b">
+        <default>false</default>
+        <summary>notify of new mail at startup</summary>
+        <description>True to notify of new mail at startup.</description>
+    </key>
     <key name="ask-open-attachment" type="b">
         <default>true</default>
         <summary>ask when opening an attachment</summary>

=== modified file 'help/CMakeLists.txt'
--- help/CMakeLists.txt	2014-07-26 10:08:43 +0000
+++ help/CMakeLists.txt	2014-10-02 03:11:35 +0000
@@ -30,12 +30,6 @@
 install(FILES ${HELP_SOURCE} DESTINATION ${HELP_DEST}/C)
 install(FILES C/figures/geary.svg DESTINATION ${HELP_DEST}/C/figures)
 
-
-FIND_PROGRAM(XML2PO_BIN xml2po)
-IF(NOT XML2PO_BIN)
-    MESSAGE(FATAL_ERROR "xml2po not found")
-ENDIF()
-
 # Hacked together from the similar macro in cmake/Gettext.cmake.
 MACRO(HELP_CREATE_TRANSLATIONS _firstLang)
     SET(_translatedPages)
@@ -79,4 +73,11 @@
     ENDIF()
 ENDMACRO()
 
-HELP_CREATE_TRANSLATIONS(ALL ${TRANSLATED} COMMENT "Translating help docs.")
+IF(TRANSLATE_HELP)
+    FIND_PROGRAM(XML2PO_BIN xml2po)
+    IF(NOT XML2PO_BIN)
+        MESSAGE(FATAL_ERROR "xml2po not found")
+    ENDIF()
+
+    HELP_CREATE_TRANSLATIONS(ALL ${TRANSLATED} COMMENT "Translating help docs.")
+ENDIF()

=== modified file 'help/Makefile.am'
--- help/Makefile.am	2014-07-26 10:08:43 +0000
+++ help/Makefile.am	2014-10-02 03:11:35 +0000
@@ -16,4 +16,4 @@
 	star.page \
 	write.page
 
-DOC_LINGUAS = el es it
+DOC_LINGUAS = el es fr it

=== added directory 'help/fr'
=== added file 'help/fr/fr.po'
--- help/fr/fr.po	1970-01-01 00:00:00 +0000
+++ help/fr/fr.po	2014-10-02 03:11:35 +0000
@@ -0,0 +1,1090 @@
+# French translation for geary.
+# Copyright (C) 2014 geary's COPYRIGHT HOLDER
+# This file is distributed under the same license as the geary package.
+#
+# jsirgue <[e-mail]>, 2014.
+# Julien Hardelin <[e-mail]>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: geary master\n"
+"POT-Creation-Date: 2014-04-19 16:56+0000\n"
+"PO-Revision-Date: 2014-04-19 18:55+0200\n"
+"Last-Translator: Julien Hardelin <[e-mail]>\n"
+"Language-Team: français <GNOME French Team <[e-mail]>>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#: C/write.page:9(title)
+msgid "Write a message"
+msgstr "Écriture d'un message"
+
+#: C/write.page:12(p)
+msgid ""
+"To compose a new message in Geary, press the <gui>New Message</gui> button "
+"on the toolbar."
+msgstr ""
+"Pour écrire un nouveau message dans Geary, appuyez sur le bouton "
+"<gui>Nouveau Message</gui> dans la barre d'outils."
+
+#: C/write.page:15(p)
+msgid ""
+"To reply to a message, open the message menu in the upper right corner of "
+"the message and choose <gui>Reply</gui>, <gui>Reply All</gui> or "
+"<gui>Forward</gui>. You can also reply to the last message in a conversation "
+"via the <gui>Reply</gui>, <gui>Reply All</gui> or <gui>Forward</gui> buttons "
+"on the toolbar."
+msgstr ""
+"Pour répondre à un message, ouvrez le menu dans le coin en haut à droite du "
+"message et choisissez <gui>Répondre</gui>, <gui> Répondre à tous</gui> ou "
+"<gui>Transmettre</gui>. Vous pouvez aussi répondre au dernier message d'une "
+"conversation via les boutons <gui>Répondre</gui>,<gui> Répondre à tous</gui> "
+"ou <gui>Transmettre</gui> de la barre d'outils."
+
+#: C/write.page:20(title)
+msgid "Features"
+msgstr "Fonctionnalités"
+
+#: C/write.page:22(p)
+msgid ""
+"Geary's email composer lets you adjust the font, size and color of text. You "
+"can also insert hyperlinks into messages."
+msgstr ""
+"L'éditeur de message de Geary vous permet de choisir la police, la taille et "
+"la couleur du texte. Vous pouvez aussi insérer des liens hypertextes dans "
+"les messages."
+
+#: C/write.page:24(p)
+msgid ""
+"Geary can also send plain text messages. In the drop-down menu, check or "
+"uncheck \"Rich Text\" to toggle between plain text and rich text mode."
+msgstr ""
+"Geary peut aussi envoyer des messages en texte brut. Dans le menu déroulant, "
+"cliquez sur \"Texte Riche\" pour basculer du mode texte brut au mode texte "
+"riche."
+
+#: C/write.page:27(p)
+msgid ""
+"You can attach a file to a message you're writing in either of these ways:"
+msgstr ""
+"Vous pouvez joindre un fichier au message que vous écrivez par une de ces "
+"méthodes :"
+
+#: C/write.page:29(p)
+msgid ""
+"Press the <gui>Attach File</gui> button at the lower left of the composer "
+"window, then select a file to attach."
+msgstr ""
+"Cliquez sur le bouton <gui>Joindre un Fichier </gui> en bas à gauche de la "
+"fenêtre d'édition et sélectionnez le fichier à joindre."
+
+#: C/write.page:31(p)
+msgid ""
+"Drag the file from the Nautilus file manager to the composer window, and "
+"drop it either on the text fields at the top of the window or on the toolbar "
+"at the bottom."
+msgstr ""
+"Faites glisser le fichier depuis le navigateur de fichier Nautilus et "
+"déposez-le soit sur les champs de texte en haut de la fenêtre d'édition, "
+"soit sur la barre d'outils en bas."
+
+#: C/write.page:37(title)
+msgid "Drafts"
+msgstr "Brouillons"
+
+#: C/write.page:39(p)
+msgid ""
+"For mail servers that support drafts, Geary will automatically save the "
+"message as you type. If you close the composer without sending, Geary will "
+"prompt you to keep the draft or to discard it."
+msgstr ""
+"Pour les serveurs de messagerie qui prennent en compte les brouillons, Geary "
+"enregistre automatiquement ce que vous écrivez. Si vous fermez l'éditeur "
+"sans envoyer le message, Geary vous demandera s'il doit garder le brouillon "
+"ou le détruire."
+
+#: C/write.page:42(p)
+msgid ""
+"To edit an existing draft, select the Drafts folder in the folder list, "
+"select the message, and click \"Edit Draft\" in the message viewer."
+msgstr ""
+"Pour modifier un brouillon existant, sélectionnez le dossier Brouillons dans "
+"la liste, sélectionnez le message et cliquez sur « Modifier le Brouillon » "
+"dans le panneau message. "
+
+#: C/write.page:45(p)
+msgid "Geary deletes the draft when you send the message."
+msgstr "Geary supprime le brouillon quand vous envoyez le message."
+
+#: C/star.page:10(title)
+msgid "Star a message or mark it as read/unread"
+msgstr "Marquage d'un message d'une étoile ou comme lu/non lu"
+
+#: C/star.page:12(title)
+msgid "Star messages"
+msgstr "Marquage des message d'une étoile"
+
+#: C/star.page:13(p)
+msgid ""
+"You can star messages to indicate that they're important to you. To mark a "
+"conversation with a star, click its star icon in the conversation list. You "
+"can star an individual message by clicking the star at the upper right of "
+"the message itself."
+msgstr ""
+"Vous pouvez marquer un message d'une étoile pour indiquer qu'il est "
+"important pour vous. Pour marquer une conversation, cliquez sur l'icône en "
+"forme d'étoile dans la liste des conversations. Vous pouvez aussi marquer "
+"individuellement un message en cliquant sur l'étoile en haut à droite du "
+"message."
+
+#: C/star.page:15(p)
+msgid ""
+"With Gmail accounts, starred messages appear in the Starred folder in the "
+"folder list."
+msgstr ""
+"Pour les comptes Gmail, les messages étoilés se trouvent dans le dossier "
+"Messages Étoilés de la liste des dossiers."
+
+#: C/star.page:18(title)
+msgid "Mark messages as read or unread"
+msgstr "Marquage des messages comme lus ou non lus"
+
+#: C/star.page:19(p)
+msgid ""
+"Geary marks messages as read automatically as you read them. To manually "
+"toggle a conversation as read or unread, click the circle icon in the "
+"conversation list."
+msgstr ""
+"Geary marque automatiquement les messages comme lus quand vous les lisez. "
+"Pour marquer manuellement une conversation comme lue ou non lue, cliquez sur "
+"l'icône en forme de cercle dans la liste des conversations."
+
+#: C/star.page:22(p)
+msgid ""
+"Alternately, the <gui>Mark as Unread</gui> in the <gui>Mark</gui> menu on "
+"the toolbar can be used to toggle the read status of the selected "
+"conversation(s)."
+msgstr ""
+"Le bouton <gui>Marquer comme non lu</gui> dans le menu <gui>Marquer</gui> de "
+"la barre d'outils peut aussi être utilisé pour changer le statut de lecture "
+"de la, ou des conversations sélectionnées."
+
+#: C/star.page:25(p)
+msgid ""
+"To mark an individual message as read, select <gui>Mark as Read</gui> from "
+"the dropdown menu."
+msgstr ""
+"Pour marquer individuellement un message comme lu, sélectionner <gui>Marquer "
+"comme lu</gui> dans le menu déroulant."
+
+#: C/shortcuts.page:11(title)
+msgid "Keyboard shortcuts"
+msgstr "Raccourcis clavier"
+
+#: C/shortcuts.page:12(p)
+msgid "Geary has keyboard shortcuts for most common operations."
+msgstr "Geary a des raccourcis clavier pour les opérations les plus courantes."
+
+#: C/shortcuts.page:15(p)
+msgid "Compose a new message"
+msgstr "Écrire un nouveau message"
+
+#: C/shortcuts.page:16(p)
+msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq> or <key>N</key>"
+msgstr "<keyseq><key>Ctrl</key><key>N</key></keyseq> ou <key>N</key>"
+
+#: C/shortcuts.page:19(p)
+msgid "Reply to sender"
+msgstr "Répondre à l'expéditeur"
+
+#: C/shortcuts.page:20(p)
+msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>R</key>"
+msgstr "<keyseq><key>Ctrl</key><key>R</key></keyseq> ou <key>R</key>"
+
+#: C/shortcuts.page:23(p)
+msgid "Reply to all"
+msgstr "Répondre à tous"
+
+#: C/shortcuts.page:24(p)
+msgid ""
+"<keyseq><key>Ctrl</key><key>Shift</key><key>R</key></keyseq> or "
+"<keyseq><key>Shift</key><key>R</key></keyseq>"
+msgstr ""
+"<keyseq><key>Ctrl</key><key>Maj</key><key>R</key></keyseq> ou "
+"<keyseq><key>Maj</key><key>R</key></keyseq>"
+
+#: C/shortcuts.page:27(p)
+msgid "Forward"
+msgstr "Transférer"
+
+#: C/shortcuts.page:28(p)
+msgid "<keyseq><key>Ctrl</key><key>L</key></keyseq> or <key>F</key>"
+msgstr "<keyseq><key>Ctrl</key><key>L</key></keyseq> ou <key>F</key>"
+
+#: C/shortcuts.page:31(p)
+msgid "Archive"
+msgstr "Archiver"
+
+#: C/shortcuts.page:32(key)
+msgid "A"
+msgstr "A"
+
+#: C/shortcuts.page:35(p)
+msgid "Trash"
+msgstr "Corbeille"
+
+#: C/shortcuts.page:36(p)
+msgid "<key>Delete</key> or <key>Backspace</key>"
+msgstr "<key>Suppr</key> ou <key>Retour arrière</key>"
+
+#: C/shortcuts.page:39(p)
+msgid "Delete"
+msgstr "Supprimer"
+
+#: C/shortcuts.page:40(p)
+msgid ""
+"<keyseq><key>Shift</key><key>Delete</key></keyseq> or <keyseq><key>Shift</"
+"key><key>Backspace</key></keyseq>"
+msgstr ""
+"<keyseq><key>Maj</key><key>Suppr</key></keyseq> ou <keyseq><key>Maj</"
+"key><key>Retour arrière</key></keyseq>"
+
+#: C/shortcuts.page:43(p)
+msgid "Star"
+msgstr "Marquer d'une étoile"
+
+#: C/shortcuts.page:44(key) C/shortcuts.page:92(key)
+msgid "S"
+msgstr "S"
+
+#: C/shortcuts.page:47(p)
+msgid "Unstar"
+msgstr "Supprimer l'étoile"
+
+#: C/shortcuts.page:48(key)
+msgid "D"
+msgstr "D"
+
+#: C/shortcuts.page:51(p)
+msgid "Mark read"
+msgstr "Marquer comme lu"
+
+#: C/shortcuts.page:52(p)
+msgid ""
+"<keyseq><key>Ctrl</key><key>I</key></keyseq> or <keyseq><key>Shift</"
+"key><key>I</key></keyseq>"
+msgstr ""
+"<keyseq><key>Ctrl</key><key>I</key></keyseq> ou <keyseq><key>Maj</"
+"key><key>I</key></keyseq>"
+
+#: C/shortcuts.page:55(p)
+msgid "Mark unread"
+msgstr "Marquer comme non lu"
+
+#: C/shortcuts.page:56(p)
+msgid ""
+"<keyseq><key>Ctrl</key><key>U</key></keyseq> or <keyseq><key>Shift</"
+"key><key>U</key></keyseq>"
+msgstr ""
+"<keyseq><key>Ctrl</key><key>U</key></keyseq> ou <keyseq><key>Maj</"
+"key><key>U</key></keyseq>"
+
+#: C/shortcuts.page:59(p)
+msgid "Toggle spam"
+msgstr "Signaler comme pourriel"
+
+#: C/shortcuts.page:60(p)
+msgid "<keyseq><key>Ctrl</key><key>J</key></keyseq> or <key>!</key>"
+msgstr "<keyseq><key>Ctrl</key><key>J</key></keyseq> ou <key>!</key>"
+
+#: C/shortcuts.page:63(p)
+msgid "Quit"
+msgstr "Quitter"
+
+#: C/shortcuts.page:64(key) C/shortcuts.page:80(key) C/shortcuts.page:84(key)
+#: C/shortcuts.page:88(key) C/shortcuts.page:92(key) C/shortcuts.page:96(key)
+#: C/shortcuts.page:100(key) C/shortcuts.page:104(key)
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: C/shortcuts.page:64(key)
+msgid "Q"
+msgstr "Q"
+
+#: C/shortcuts.page:67(p)
+msgid "Zoom in"
+msgstr "Zoom avant"
+
+#: C/shortcuts.page:68(p)
+msgid "<keyseq><key>Ctrl</key><key>=</key></keyseq> or <key>=</key>"
+msgstr "<keyseq><key>Ctrl</key><key>=</key></keyseq> ou <key>=</key>"
+
+#: C/shortcuts.page:71(p)
+msgid "Zoom out"
+msgstr "Zoom arrière"
+
+#: C/shortcuts.page:72(p)
+msgid "<keyseq><key>Ctrl</key><key>-</key></keyseq> or <key>-</key>"
+msgstr "<keyseq><key>Ctrl</key><key>-</key></keyseq> ou <key>-</key>"
+
+#: C/shortcuts.page:75(p)
+msgid "Reset zoom"
+msgstr "Revenir au zoom par défaut"
+
+#: C/shortcuts.page:76(p)
+msgid "<keyseq><key>Ctrl</key><key>0</key></keyseq> or <key>0</key>"
+msgstr "<keyseq><key>Ctrl</key><key>0</key></keyseq> ou <key>0</key>"
+
+#: C/shortcuts.page:79(p) C/preferences.page:10(title)
+msgid "Preferences"
+msgstr "Préférences"
+
+#: C/shortcuts.page:80(key)
+msgid "E"
+msgstr "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
+
+#: C/shortcuts.page:83(p) C/accounts.page:10(title)
+msgid "Accounts"
+msgstr "Comptes"
+
+#: C/shortcuts.page:84(key)
+msgid "M"
+msgstr "<keyseq><key>Ctrl</key><key>M</key></keyseq>"
+
+#: C/shortcuts.page:87(p)
+msgid "Close composer window"
+msgstr "Fermer la fenêtre d'édition"
+
+#: C/shortcuts.page:88(key)
+msgid "W"
+msgstr "W"
+
+#: C/shortcuts.page:91(p)
+msgid "Jump to search box"
+msgstr "Aller à la barre de recherche"
+
+#: C/shortcuts.page:95(p)
+msgid "Find in current conversation"
+msgstr "Chercher dans la conversation en cours"
+
+#: C/shortcuts.page:96(key)
+msgid "F"
+msgstr "F"
+
+#: C/shortcuts.page:99(p)
+msgid "Find next in current conversation"
+msgstr "Occurrence suivante dans la conversation"
+
+#: C/shortcuts.page:100(key) C/shortcuts.page:104(key)
+msgid "G"
+msgstr "G"
+
+#: C/shortcuts.page:103(p)
+msgid "Find previous in current conversation"
+msgstr "Occurrence précédente dans la conversation"
+
+#: C/shortcuts.page:104(key)
+msgid "Shift"
+msgstr "Maj"
+
+#: C/search.page:10(title)
+msgid "Search"
+msgstr "Recherche"
+
+#: C/search.page:12(p)
+msgid ""
+"Geary supports a per-account full text search. To start a search, select a "
+"folder associated with the account you'd like to search against. Then click "
+"the search box in the toolbar (or press <keyseq><key>Ctrl</key><key>S</key></"
+"keyseq>) and start typing. Results will appear after a brief delay."
+msgstr ""
+"Geary propose une recherche de texte par comptes. Pour débuter, sélectionnez "
+"un dossier associé au compte où vous voulez faire la recherche. Puis cliquez "
+"dans la barre de recherche de la barre d'outils (ou appuyez sur "
+"<keyseq><key>Ctrl</key><key>S</key></keyseq>) et commencez la saisie. Les "
+"résultats s'afficheront après un court délai."
+
+#: C/search.page:16(p)
+msgid ""
+"The full text search includes email text, email addresses (to, from, and "
+"cc), subject lines and attachment filenames."
+msgstr ""
+"La recherche par texte inclus le texte des messages, les adresses courriel "
+"(champs « à », « de » et « cc »), sujets et noms des fichiers joints."
+
+#: C/search.page:19(p)
+msgid ""
+"Keywords that match your search are highlighted in the message view. Geary "
+"will match different forms of the same word, for example searching for \"walk"
+"\" will also match \"walking\" and \"walked.\""
+msgstr ""
+"Les mots clefs correspondants à votre recherche sont mis en évidence dans le "
+"panneau message. Geary détecte les formes analogues au mot recherché. Par "
+"exemple la recherche pour « marche » renverra aussi « marcher » et "
+"« marcheur »."
+
+#: C/search.page:23(title)
+msgid "Search operators"
+msgstr "Filtres de recherche"
+
+#: C/search.page:24(p)
+msgid "Geary supports the following operators to limit the scope of searches:"
+msgstr ""
+"Geary permet d'utiliser les filtres suivants pour limiter les recherches :"
+
+#: C/search.page:27(var)
+msgid "filename"
+msgstr "nom de fichier"
+
+#: C/search.page:27(input)
+msgid "attachment:<placeholder-1/>"
+msgstr "pièce jointe : <placeholder-1/>"
+
+#: C/search.page:28(p)
+msgid "Finds messages with attachments whose name matches <var>filename</var>."
+msgstr ""
+"Recherche les messages avec une pièce jointe dont le nom correspond à "
+"<var>nom de fichier</var>."
+
+#: C/search.page:31(var) C/search.page:39(var) C/search.page:51(var)
+msgid "recipient"
+msgstr "destinataire"
+
+#: C/search.page:31(input)
+msgid "bcc:<placeholder-1/>"
+msgstr "bcc :<placeholder-1/>"
+
+#: C/search.page:32(p)
+msgid "Finds messages where <var>recipient</var> matches the BCC header."
+msgstr ""
+"Cherche les messages pour lesquelles le <var>destinataire</var> correspond à "
+"l'en tête BCC."
+
+#: C/search.page:35(var) C/search.page:47(var)
+msgid "text"
+msgstr "texte"
+
+#: C/search.page:35(input)
+msgid "body:<placeholder-1/>"
+msgstr "corps :<placeholder-1/>"
+
+#: C/search.page:36(p)
+msgid "Finds messages whose body contains <var>text</var>."
+msgstr "Cherche les messages dont le corps contient le <var>texte</var>."
+
+#: C/search.page:39(input)
+msgid "cc:<placeholder-1/>"
+msgstr "cc :<placeholder-1/>"
+
+#: C/search.page:40(p)
+msgid "Finds messages where <var>recipient</var> matches the CC header."
+msgstr ""
+"Recherche les messages dont l'en-tête CC correspond à <var>destinataire</"
+"var>."
+
+#: C/search.page:43(var)
+msgid "sender"
+msgstr "expéditeur"
+
+#: C/search.page:43(input)
+msgid "from:<placeholder-1/>"
+msgstr "de :<placeholder-1/>"
+
+#: C/search.page:44(p)
+msgid "Finds messages where <var>sender</var> matches the From header."
+msgstr ""
+"Cherche les messages dont l'en-tête De correspond à <var>expéditeur</var>."
+
+#: C/search.page:47(input)
+msgid "subject:<placeholder-1/>"
+msgstr "sujet :<placeholder-1/>"
+
+#: C/search.page:48(p)
+msgid "Finds messages whose subject contains <var>text</var>."
+msgstr "Recherche les messages dont le sujet contient <var>texte</var>."
+
+#: C/search.page:51(input)
+msgid "to:<placeholder-1/>"
+msgstr "à :<placeholder-1/>"
+
+#: C/search.page:52(p)
+msgid ""
+"Finds messages where <var>sender</var> matches the To, CC, or BCC header."
+msgstr ""
+"Recherche les messages où l' <var>expéditeur</var> correspond aux champs De, "
+"CC ou BCC de l'en-tête ."
+
+#: C/search.page:56(p)
+msgid ""
+"As a special case, the <input>bcc</input>, <input>cc</input>, <input>from</"
+"input>, and <input>to</input> operators support <input>me</input> as their "
+"argument, which searches for the account's email address in the appropriate "
+"context."
+msgstr ""
+"Cas particulier, les champs <input>bcc</input>, <input>cc</input>, "
+"<input>de</input> et <input>à</input>, acceptent <input>moi</input> comme "
+"argument, ce qui lance une recherche sur l'adresse courriel du compte en "
+"cours dans le contexte approprié."
+
+#: C/preferences.page:11(p)
+msgid ""
+"The <gui>Preferences</gui> option is available in either Geary's application "
+"menu or the gear menu in the upper-right of the toolbar. (The location "
+"depends on the install desktop shell. For GNOME Shell and Unity, the "
+"application menu is available near the top-left corner of the screen.)"
+msgstr ""
+"Le panneau <gui>Préférences</gui> est accessible depuis le menu "
+"d'application de Geary ou le bouton menu dans le coin en haut à droite de la "
+"barre d'outils. (L'emplacement dépend de votre environnement de bureau. Pour "
+"GNOME Shell et Unity le menu d'application est près du coin en haut à gauche "
+"de l'écran.) "
+
+#: C/preferences.page:17(title)
+msgid "Reading"
+msgstr "Lecture"
+
+#: C/preferences.page:20(gui)
+msgid "Automatically select next message"
+msgstr "Sélectionner automatiquement le message suivant"
+
+#: C/preferences.page:21(p)
+msgid ""
+"When this option is enabled, Geary automatically selects the latest message "
+"in a folder when you enter the folder. In addition, after archiving a "
+"message, Geary automatically selects an adjacent message."
+msgstr ""
+"Si cette option est activée, Geary sélectionne automatiquement le dernier "
+"message quand vous sélectionnez un dossier. De plus, après avoir archivé un "
+"message, Geary sélectionne automatiquement un message adjacent."
+
+#: C/preferences.page:26(gui)
+msgid "Display conversation preview"
+msgstr "Afficher l'aperçu des conversations"
+
+#: C/preferences.page:27(p)
+msgid ""
+"Enables message previews in the conversation list. Previews show the first "
+"few lines of each message."
+msgstr ""
+"Active l'aperçu des messages dans la liste des conversations. L'aperçu "
+"montre quelques lignes du début de chaque message."
+
+#: C/preferences.page:34(title)
+msgid "Composer"
+msgstr "Éditeur"
+
+#: C/preferences.page:37(gui)
+msgid "Enable spell checking"
+msgstr "Activer la vérification orthographique"
+
+#: C/preferences.page:38(p)
+msgid ""
+"When set, Geary automatically spell checks a message as you write it, "
+"underlying each misspelled word in red."
+msgstr ""
+"Si l'option est activée, Geary vérifie automatiquement l'orthographe des "
+"messages que vous écrivez. Les mots mal orthographiés sont soulignés en "
+"rouge."
+
+#: C/preferences.page:45(title)
+msgid "Notifications"
+msgstr "Notifications"
+
+#: C/preferences.page:48(gui)
+msgid "Play notification sounds"
+msgstr "Jouer les sons de notification"
+
+#: C/preferences.page:49(p)
+msgid "When set, Geary plays a sound whenever a new message arrives."
+msgstr ""
+"Si l'option est activée, Geary émet un son à chaque nouveau message qui "
+"arrive."
+
+#: C/preferences.page:52(gui)
+msgid "Show notifications for new mail"
+msgstr "Afficher les notifications de nouveau message"
+
+#: C/preferences.page:53(p)
+msgid ""
+"When set, Geary displays a <em>notification</em> each time a new message "
+"arrives. Notifications are displayed in a system-dependent manner. On GNOME "
+"Shell, notifications appear at the bottom of the display. In Ubuntu Unity, "
+"notifications appear at the upper right of the display."
+msgstr ""
+"Si l'option est activée, Geary affiche une <em>notification</em> chaque fois "
+"qu'un nouveau message arrive. Les notifications sont affichées par chaque "
+"système de façon différente. Dans Gnome Shell, les notifications s'affichent "
+"au bas de l'écran. Dans Ubuntu Unity, elles apparaissent en haut à droite de "
+"l'écran."
+
+#: C/overview.page:8(title)
+msgid "Overview"
+msgstr "Aperçu"
+
+#: C/overview.page:10(p)
+msgid ""
+"Geary is a lightweight email reader for the <link href=\"http://gnome.org"
+"\">GNOME</link> desktop. It works with mail servers that support the IMAP "
+"protocol, including popular services such as Gmail, Yahoo Mail, and Outlook."
+"com."
+msgstr ""
+"Geary est un client de messagerie léger pour le bureau <link href=\"http://"
+"gnome.org\">GNOME</link>. Il fonctionne avec les serveurs de messageries qui "
+"prennent en charge le protocole IMAP, ce qui inclut des services populaires "
+"tel Gmail, Yahoo Mail ou Outlook.com. "
+
+#: C/overview.page:14(p)
+msgid ""
+"Geary groups mail messages into <em>conversations</em>. A conversation "
+"contains all messages in a single thread of discussion."
+msgstr ""
+"Geary regroupe les messages en <em>conversations</em>. Une conversation "
+"contient tous les messages d'un fil de discussion."
+
+#: C/overview.page:17(p)
+msgid "The main Geary window is divided into several areas:"
+msgstr "La fenêtre principale de Geary est divisée en plusieurs zones :"
+
+#: C/overview.page:20(title)
+msgid "Folder list"
+msgstr "Liste des dossiers"
+
+#: C/overview.page:21(p)
+msgid ""
+"The <em>folder list</em> at the left displays all <em>folders</em> and "
+"<em>labels</em> in your mail account. Geary uses the term <em>label</em> for "
+"any folder that you have created to help organize your messages. (The Gmail "
+"web interface also uses this term; most other mail services do not.)"
+msgstr ""
+"La <em>liste des dossiers</em> sur la gauche affiche tous les <em>dossiers</"
+"em> et <em>étiquettes</em> dans votre compte de messagerie. Geary utilise le "
+"terme <em>étiquette</em> pour tous les dossiers que vous avez créés afin "
+"d'organiser vos messages. (L'interface web de Gmail utilise aussi ce terme, "
+"contrairement à la plupart des autres services.)"
+
+#: C/overview.page:28(title)
+msgid "Conversation list"
+msgstr "Liste des conversations"
+
+#: C/overview.page:29(p)
+msgid ""
+"The <em>conversation list</em> displays a list of conversations in the "
+"selected folder. Newer conversations appear at the top."
+msgstr ""
+"La <em>liste des conversations</em> affiche les conversations dans le "
+"dossier sélectionné. Les conversations les plus récentes sont en haut."
+
+#: C/overview.page:31(p)
+msgid ""
+"Each sender's name appears bold if there are unread messages from that "
+"sender. If a conversation has more than one message, Geary displays a count "
+"of messages in the conversation."
+msgstr ""
+"Le nom d'un expéditeur figure en gras s'il y a des messages non lus qui "
+"proviennent de lui. Si une conversation contient plusieurs messages, Geary "
+"affiche leur nombre."
+
+#: C/overview.page:34(p)
+msgid ""
+"Geary does not automatically download all messages in all of your mail "
+"folders. When you first visit your Inbox or any other folder, Geary "
+"downloads the 50 most recent messages in that folder. To see more messages, "
+"simply scroll down the conversation list and Geary will fetch more messages "
+"automatically."
+msgstr ""
+"Geary ne télécharge pas automatiquement tous les messages dans tous vos "
+"dossiers de messagerie. Quand vous ouvrez votre boite de réception ou un "
+"autre dossier pour la première fois, Geary télécharge les 50 messages les "
+"plus récents. Pour afficher plus de messages, faites défiler entièrement la "
+"liste des conversations et Geary téléchargera automatiquement plus de "
+"messages."
+
+#: C/overview.page:36(p)
+msgid ""
+"Some commands in Geary can act on a group of conversations. To select "
+"multiple conversations, hold down the <key>Ctrl</key> key and click each "
+"conversation in turn in the conversation list. Alternatively, click the "
+"first conversation in a range, then hold down <key>Shift</key> and click the "
+"last conversation."
+msgstr ""
+"Certaines commandes de Geary peuvent être appliquées à un groupe de "
+"conversations. Pour sélectionner plusieurs conversations, gardez la touche "
+"<key>Ctrl</key> enfoncée et cliquez sur chaque conversation à sélectionner. "
+"Vous pouvez aussi cliquer sur la première conversation d'une série, garder "
+"la touche <key>Maj</key> enfoncée et cliquer sur la dernière."
+
+#: C/overview.page:44(title)
+msgid "Message area"
+msgstr "Panneau des messages"
+
+#: C/overview.page:45(p)
+msgid ""
+"The <em>message area</em> displays all messages in the selected "
+"conversation, with the oldest message at the top."
+msgstr ""
+"Le <em>panneau des messages</em> affiche tous les messages de la "
+"conversation sélectionnée, le plus ancien est en haut."
+
+#: C/overview.page:47(p)
+msgid ""
+"At the upper right of each message, Geary displays a dropdown arrow that "
+"lets you open the <em>message menu</em> with commands that operate on the "
+"message."
+msgstr ""
+"Dans le coin en haut à droite de chaque message, Geary affiche une flèche "
+"vers le bas qui vous permet d'ouvrir un <em>menu des messages</em> qui "
+"contient des fonctions s'appliquant au message."
+
+#: C/overview.page:49(p)
+msgid ""
+"When you view a conversation, Geary collapses messages that you've already "
+"read. Click collapsed messages to expand them. Click an expanded message's "
+"header to collapse it."
+msgstr ""
+"Quand vous ouvrez une conversation, Geary replie les messages que vous avez "
+"déjà lus. Cliquez sur les messages repliés pour les afficher. Cliquez sur "
+"l'en-tête d'un message pour le replier."
+
+#: C/overview.page:50(p)
+msgid ""
+"Any attachments in a message appear at the bottom of the message. You can "
+"click an attachment to open it or right-click to save it."
+msgstr ""
+"Toute pièce jointe à un message figure en bas du message. Vous pouvez "
+"cliquer sur une pièce jointe pour l'ouvrir, ou utiliser un clic droit pour "
+"l'enregistrer."
+
+#: C/overview.page:52(p)
+msgid ""
+"Geary uses <link href=\"https://secure.gravatar.com/\">Gravatar</link> to "
+"display an avatar for each message's sender in its header."
+msgstr ""
+"Geary utilise <link href=\"https://secure.gravatar.com/\">Gravatar</link> "
+"afin d'afficher un avatar pour chaque expéditeur de message dans l'en-tête."
+
+#: C/limits.page:11(title)
+msgid "Limitations"
+msgstr "Limitations"
+
+#: C/limits.page:12(p)
+msgid ""
+"Geary is still in early development. Geary supports IMAP and has been tested "
+"with Gmail, Yahoo, and the free Dovecot mail server. Experimental support "
+"for Outlook.com is provided. Geary may not yet work well with some IMAP "
+"servers. At this time Geary is still missing numerous features including "
+"offline mode."
+msgstr ""
+"Geary est encore à un stade précoce de développement. Geary accepte le "
+"protocole IMAP et a été testé avec Gmail, Yahoo et le service de messagerie "
+"Dovecot. La prise en compte de Outlook.com est expérimental. Geary ne "
+"fonctionne peut être pas encore correctement avec certains serveur IMAP. En "
+"l'état, il manque encore de nombreuses fonctionnalités à Geary, dont le mode "
+"hors-ligne."
+
+#: C/limits.page:14(p)
+msgid ""
+"To learn more about the features we're working on and the future of Geary, "
+"please visit Geary's <link href=\"https://wiki.gnome.org/Apps/Geary\">wiki "
+"page</link>."
+msgstr ""
+"Pour en savoir plus sur les fonctionnalités sur lesquelles nous travaillons, "
+"et le futur de Geary, vous pouvez visiter le <link href=\"https://wiki.gnome."
+"org/Apps/Geary\">wiki </link> de Geary."
+
+#: C/label.page:10(title)
+msgid "Label or move a conversation"
+msgstr "Ajout d'une étiquette à une conversation ou la déplacer"
+
+#: C/label.page:12(title)
+msgid "Label a conversation"
+msgstr "Ajout d'une étiquette à une conversation"
+
+#: C/label.page:13(p)
+msgid ""
+"Geary lets you apply one or more <em>labels</em> to each conversation. Geary "
+"labels correspond to labels in Gmail, or ordinary folders in other mail "
+"services."
+msgstr ""
+"Geary vous permet de marquer les conversations avec une ou plusieurs "
+"<em>étiquettes</em>. Les étiquettes dans Geary correspondent aux catégories "
+"de Gmail, ou aux dossiers des autres services de messagerie."
+
+#: C/label.page:15(p)
+msgid ""
+"To label one or more conversations, first select the conversation(s), then "
+"do either of the following:"
+msgstr ""
+"Pour ajouter une étiquette à une ou plusieurs conversations, commencez par "
+"sélectionner les conversations, puis au choix:"
+
+#: C/label.page:18(p)
+msgid ""
+"Click the <gui>Label</gui> button on the toolbar and select a label from the "
+"resulting drop-down menu."
+msgstr ""
+"Cliquez sur le bouton <gui>Ajouter une étiquette</gui> dans la barre "
+"d'outils et sélectionnez une étiquette dans le menu déroulant."
+
+#: C/label.page:20(p)
+msgid ""
+"Hold down the <key>Ctrl</key> key and drag the conversation(s) from the "
+"conversation list to the label in the sidebar."
+msgstr ""
+"Appuyez sur <key>Ctrl</key> et faites glisser la, ou les, conversation(s) "
+"depuis la liste vers l'étiquette dans la barre latérale."
+
+#: C/label.page:25(title)
+msgid "Move a conversation to a folder or label"
+msgstr "Déplacement d'une conversation vers un dossier ou une étiquette."
+
+#: C/label.page:26(p)
+msgid ""
+"To move one or more conversations to a folder or label, first select the "
+"conversation(s), then do either of the following:"
+msgstr ""
+"Pour déplacer une ou plusieurs conversations vers un dossier ou une "
+"étiquette commencez par sélectionner la ou les conversations, puis au choix :"
+
+#: C/label.page:29(p)
+msgid ""
+"Click the <gui>Move</gui> button on the toolbar and select a folder or label "
+"from the resulting drop-down menu."
+msgstr ""
+"Cliquez sur le bouton <gui>Déplacer</gui> dans la barre d'outil et "
+"sélectionnez un dossier ou une étiquette dans le menu déroulant."
+
+#: C/label.page:31(p)
+msgid ""
+"Drag the conversation(s) from the conversation list to the folder or label "
+"in the sidebar."
+msgstr ""
+"Faites glisser la (ou les) conversation(s) depuis la liste vers le dossier "
+"ou l'étiquette dans la barre latérale."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:5(None)
+msgid "@@image: 'figures/geary.svg'; md5=18b50c9e10fe5256ae1cb12aaa3a7600"
+msgstr "@@image: 'figures/geary.svg'; md5=18b50c9e10fe5256ae1cb12aaa3a7600"
+
+#: C/index.page:5(title)
+msgid "<media type=\"image\" src=\"figures/geary.svg\"/> Geary"
+msgstr "<media type=\"image\" src=\"figures/geary.svg\"/> Geary"
+
+#: C/index.page:9(title)
+msgid "Introduction"
+msgstr "Introduction"
+
+#: C/index.page:13(title)
+msgid "Using Geary"
+msgstr "Utilisation de Geary"
+
+#: C/index.page:17(title)
+msgid "Bugs"
+msgstr "Anomalies"
+
+#: C/bugs.page:8(title)
+msgid "Think you've found a bug?"
+msgstr "Vous pensez avoir découvert une anomalie ?"
+
+#: C/bugs.page:9(p)
+msgid ""
+"If you suspect you've found a bug in Geary, follow these steps to report it:"
+msgstr ""
+"Si vous pensez avoir découvert une anomalie dans Geary, voici la procédure à "
+"suivre pour la signaler :"
+
+#: C/bugs.page:11(p)
+msgid ""
+"Search Geary's <link href=\"https://bugzilla.gnome.org/browse.cgi?"
+"product=geary\">bug database</link> to see if someone else has reported the "
+"bug."
+msgstr ""
+"Vérifiez dans <link href=\"https://bugzilla.gnome.org/browse.cgi? "
+"product=geary\">la liste des anomalies</link> de Geary, si quelqu'un a déjà "
+"signalé cette anomalie."
+
+#: C/bugs.page:13(p)
+msgid ""
+"Don't see your bug listed? Congratulations! You've found a new bug. To "
+"create an bug report, create an account on GNOME's Bugzilla and <link href="
+"\"https://bugzilla.gnome.org/enter_bug.cgi?product=geary\">file a new bug</"
+"link>. Be as specific as you can and describe the steps to reproduce it. "
+"Don't forget to include details about your operating system and what version "
+"of Geary you're running."
+msgstr ""
+"Votre anomalie ne figure pas dans la liste ? Félicitations ! Vous avez "
+"découvert une nouvelle anomalie. Pour créer un rapport d'anomalie, créez un "
+"compte sur « GNOME Bugzilla » et <link href=\"https://bugzilla.gnome.org/"
+"enter_bug.cgi?product=geary\">signalez une nouvelle anomalie</link>. Soyez "
+"aussi précis que possible et décrivez la démarche à suivre pour la "
+"reproduire. N'oubliez pas d'inclure des détails sur votre système "
+"d'exploitation et la version de Geary que vous utilisez."
+
+#: C/bugs.page:18(p)
+msgid ""
+"For general inquiries, please join the <link href=\"https://mail.gnome.org/"
+"mailman/listinfo/geary-list\"> Geary mailing list</link>."
+msgstr ""
+"Pour les requêtes diverses, merci de contacter la  <link href=\"https://mail."
+"gnome.org/mailman/listinfo/geary-list\"> liste de diffusion de Geary.</link>"
+
+#: C/archive.page:10(title)
+msgid "Delete or archive a message"
+msgstr "Suppression ou archivage d'un message"
+
+#: C/archive.page:12(p)
+msgid ""
+"When you use Geary with a Gmail account, Geary lets you <em>archive</em> "
+"messages. The <gui>Archive</gui> toolbar button archives the selected "
+"conversation(s). Archived messages appear in the <gui>All Mail</gui> folder."
+msgstr ""
+"Si vous utilisez Geary avec un compte Gmail, Geary vous permet "
+"d'<em>archiver</em> les messages. Le bouton <gui>Archiver</gui> dans la "
+"barre d'outil archive la (ou les) conversation(s) sélectionnée(s). Les "
+"messages archivés se trouvent dans le dossier <gui>Tous les messages</gui>."
+
+#: C/archive.page:16(p)
+msgid ""
+"With other mail servers, you can trash or delete, but not archive, messages. "
+"To move one or more conversations to the <gui>Trash</gui> folder, select "
+"them and press the <gui>Trash</gui> button on the toolbar. To permanently "
+"delete the conversations, hold down <key>Shift</key> and press the "
+"<gui>Delete</gui> button that appears in place of the <gui>Trash</gui> "
+"button."
+msgstr ""
+"Avec les autres serveurs de messagerie, vous pouvez mettre à la corbeille ou "
+"supprimer les messages, mais pas les archiver. Pour déplacer une ou "
+"plusieurs conversations dans la <gui>Corbeille</gui>, sélectionnez les, et "
+"cliquez sur le bouton <gui>Corbeille</gui> de la barre d'outils. Pour "
+"supprimer définitivement la conversation, maintenez la touche <key>Maj</key> "
+"enfoncée et cliquez sur le bouton <gui>Supprimer</gui> qui apparaît à la "
+"place du bouton <gui>Corbeille</gui>."
+
+#: C/archive.page:21(p)
+msgid ""
+"Delete is not available from every folder, such as Search. Delete is also "
+"unavailable for Gmail. For Gmail, <gui>Trash</gui> will move messages to the "
+"Trash folder on the server, where the user can then manually delete them. "
+"The server will automatically remove trashed messages after 30 days."
+msgstr ""
+"La suppression n'est pas disponible pour tous les dossiers, tel que "
+"Recherche. Supprimer n'est pas disponible non plus pour Gmail. Pour Gmail, "
+"<gui>Corbeille</gui> déplace les messages vers la corbeille du serveur, où "
+"l'utilisateur peut manuellement les supprimer. Le serveur supprime "
+"automatiquement les messages de la corbeille au bout de 30 jours."
+
+#: C/accounts.page:13(title)
+msgid "Adding accounts"
+msgstr "Ajout d'un compte"
+
+#: C/accounts.page:15(p)
+msgid ""
+"The first time you start Geary, you will be prompted to add an email "
+"account. On this screen, select if your account is Gmail, Yahoo, Outlook."
+"com, or other. For other account types, you will need to enter your IMAP and "
+"SMTP login settings manually."
+msgstr ""
+"La première fois que vous démarrez Geary, il vous est proposé d'ajouter un "
+"compte de messagerie. Dans cette fenêtre, sélectionnez le type de compte "
+"parmi Gmail, Yahoo, Outlook.com ou Autres. Pour les autres types de compte, "
+"vous devrez régler manuellement les paramètres de connexion aux serveurs "
+"IMAP et SMTP."
+
+#: C/accounts.page:19(p)
+msgid ""
+"Additional accounts can be added from the Accounts dialog. The "
+"<gui>Accounts</gui> option is available in either Geary's application menu "
+"or the gear menu in the upper-right of the toolbar. (The location depends on "
+"the install desktop shell. For GNOME Shell and Unity, the application menu "
+"is available near the top-left corner of the screen.) Alternately, "
+"<keyseq><key>Ctrl</key><key>M</key></keyseq> will open the Accounts dialog. "
+"To add an account, click the + button."
+msgstr ""
+"Des comptes supplémentaires peuvent être ajoutés dans la fenêtre Comptes. "
+"Vous pouvez accéder à <gui>Comptes</gui> depuis le menu d'application de "
+"Geary ou le bouton menu dans le coin en haut à droite de la barre d'outils. "
+"(L'emplacement dépend de votre environnement de bureau. Pour GNOME Shell et "
+"Unity le menu d'application est près du coin en haut à gauche de l'écran.) "
+"Le raccourci clavier <keyseq><key>Ctrl</key><key>M</key></keyseq> ouvre "
+"aussi la fenêtre de comptes. Pour ajouter un compte, cliquez sur le bouton "
+"+ ."
+
+#: C/accounts.page:28(title)
+msgid "Editing existing accounts"
+msgstr "Modification d'un compte existant"
+
+#: C/accounts.page:30(p)
+msgid ""
+"From the Accounts dialog, select an account and click the pencil icon to "
+"change various settings. Please note that Geary cannot change server "
+"settings on an existing account. If you need to change your IMAP or SMTP "
+"server, you will need to delete the account and re-add it."
+msgstr ""
+"Dans la fenêtre des Comptes, sélectionnez un compte et cliquer sur l'icône "
+"stylo pour modifier la configuration. Veuillez noter que Geary ne peut pas "
+"modifier les paramètres de serveur pour un compte existant. Si vous avez "
+"besoin de changer le serveur IMAP ou SMTP, vous devez supprimer le compte et "
+"le re-créer."
+
+#: C/accounts.page:34(p)
+msgid ""
+"To change the order that accounts are displayed in the folder list, drag the "
+"accounts in the Accounts dialog to the desired order."
+msgstr ""
+"Pour changer l'ordre dans lequel les comptes sont affichés dans la liste des "
+"dossiers, faites glisser le compte à la place voulue dans la fenêtre Compte."
+
+#: C/accounts.page:37(p)
+msgid "There are some advanced options available when editing accounts:"
+msgstr ""
+"Quelques options avancées sont disponibles quand on modifie un compte :"
+
+#: C/accounts.page:39(p)
+msgid ""
+"The <gui>Save sent mail</gui> checkbox controls whether Geary will push "
+"successfully sent messages up to the account's <gui>Sent Mail</gui> folder. "
+"For Gmail accounts, this happens automatically. Yahoo and some other "
+"accounts can be configured to do this automatically as well. For other "
+"accounts, if you disable this setting, you may be unable to view messages "
+"you've sent."
+msgstr ""
+"L'option <gui>Enregistrer les messages envoyés</gui> décide si Geary place "
+"les messages envoyés avec succès dans le dossier <gui>Message envoyés</gui> "
+"du compte. Pour les utilisateurs de Gmail, cela se fait automatiquement. "
+"Yahoo et certains autre comptes peuvent être configurés pour que cela soit "
+"automatique aussi. Pour les autres comptes, si vous désactivez cette option "
+"vous ne pourrez pas voir les messages que vous avez envoyés."
+
+#: C/accounts.page:45(p)
+msgid ""
+"The <gui>Download mail</gui> drop-down allows you to configure how much mail "
+"Geary will keep locally. Geary can only use locally available mail when "
+"searching and forming conversations."
+msgstr ""
+"La liste déroulante <gui>Télécharger les messages</gui> permet de configurer "
+"combien de messages Geary stocke localement. Geary ne peut classer en "
+"conversations, ou effectuer une recherche, que parmi les messages locaux."
+
+#: C/accounts.page:53(title)
+msgid "Removing accounts"
+msgstr "Suppression d'un compte"
+
+#: C/accounts.page:55(p)
+msgid ""
+"To delete an account, open the Accounts dialog, select the account, and "
+"press the - button. Geary will delete all information associated with the "
+"account."
+msgstr ""
+"Pour supprimer un compte, ouvrez le gestionnaire de Comptes, sélectionner un "
+"compte et appuyez sur le bouton - . Geary effacera toutes les informations "
+"associées au compte."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/accounts.page:0(None)
+msgid "translator-credits"
+msgstr "Jérôme Sirgue <[e-mail]>, 2014"

=== modified file 'help/it/it.po'
--- help/it/it.po	2014-07-26 10:08:43 +0000
+++ help/it/it.po	2014-10-02 03:11:35 +0000
@@ -38,7 +38,7 @@
 "on the toolbar."
 msgstr ""
 "Per rispondere a un messaggio, aprire il menù dei messaggi nell'angolo "
-"superiore destro del messaggio e scegliere <gui>Rispondi</guI>, "
+"superiore destro del messaggio e scegliere <gui>Rispondi</gui>, "
 "<gui>Rispondi a tutti</gui> o <gui>Inoltra</gui>. È possibile anche "
 "rispondere all'ultimo messaggio di una conversazione tramite i pulsanti "
 "<gui>Rispondi</gui>, <gui>Rispondi a tutti</gui> o <gui>Inoltra</gui> della "

=== modified file 'icons/CMakeLists.txt'
--- icons/CMakeLists.txt	2014-07-26 10:08:43 +0000
+++ icons/CMakeLists.txt	2014-10-02 03:11:35 +0000
@@ -3,6 +3,7 @@
 set(ICON_FILES
     archive-symbolic.svg
     close-symbolic.svg
+    detach-symbolic.svg
     document-symbolic.svg
     edit-symbolic.svg
     format-text-remove-symbolic.svg

=== added file 'icons/detach-symbolic.svg'
--- icons/detach-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/detach-symbolic.svg	2014-10-02 03:11:35 +0000
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16.084999"
+   height="16.024"
+   id="svg7384">
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs17" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-60.952,-646.98)"
+     id="layer12">
+    <path
+       d="M 61.906,653 A 1.0001,1.0001 0 0 0 61,654 v 8 a 1.0001,1.0001 0 0 0 1,1 h 8 a 1.0001,1.0001 0 0 0 1,-1 v -8 a 1.0001,1.0001 0 0 0 -1,-1 h -8 a 1.0001,1.0001 0 0 0 -0.09375,0 z M 63,655 h 6 v 6 h -6 v -6 z"
+       id="rect13039"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;enable-background:new" />
+    <path
+       d="M 61.906,655 A 1.0011039,1.0011039 0 1 0 62,657 h 8 a 1.0001,1.0001 0 1 0 0,-2 h -8 a 1.0001,1.0001 0 0 0 -0.09375,0 z"
+       id="path13041"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;fill-rule:evenodd;enable-background:new" />
+    <path
+       d="m 76.23537,652.9981 a 1.0001,1.0001 0 0 0 0.781,-1 v -4 a 1.0001,1.0001 0 0 0 -1,-1 h -4 a 1.0001,1.0001 0 1 0 0,2 h 3 v 3 a 1.0001,1.0001 0 0 0 1.2188,1 z"
+       id="path12113-8"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;enable-background:new" />
+    <path
+       d="m 72.14137,652.9981 a 1.0001,1.0001 0 0 0 0.59375,-0.28125 l 4,-4 a 1.0165,1.0165 0 1 0 -1.4375,-1.4375 l -4,4 a 1.0001,1.0001 0 0 0 0.843,1.72 z"
+       id="path12147-8"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;enable-background:new" />
+    <rect
+       width="1"
+       height="1"
+       x="-77.016373"
+       y="-647.99811"
+       transform="scale(-1,-1)"
+       id="rect12919-5"
+       style="color:#000000;fill:#bdbdbd;enable-background:new" />
+    <rect
+       width="1"
+       height="1"
+       x="-72.016373"
+       y="-647.99811"
+       transform="scale(-1,-1)"
+       id="rect4479-2-9-9-0-8-6"
+       style="color:#000000;fill:#bebebe" />
+    <rect
+       width="1"
+       height="1"
+       x="-77.016373"
+       y="-652.99811"
+       transform="scale(-1,-1)"
+       id="rect4479-2-9-9-0-8-6-6"
+       style="color:#000000;fill:#bebebe" />
+    <rect
+       width="1"
+       height="1"
+       x="70"
+       y="662"
+       id="rect4479-2-9-9-0-8-6-9"
+       style="color:#000000;fill:#bebebe" />
+    <rect
+       width="1"
+       height="1"
+       x="61"
+       y="662"
+       id="rect4479-2-9-9-0-8-6-4"
+       style="color:#000000;fill:#bebebe" />
+  </g>
+</svg>

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-07-26 10:08:43 +0000
+++ po/POTFILES.in	2014-10-02 03:11:35 +0000
@@ -1,5 +1,6 @@
 [encoding: UTF-8]
 desktop/geary.desktop.in
+desktop/geary-autostart.desktop.in
 src/client/accounts/account-dialog-account-list-pane.vala
 src/client/accounts/account-dialog-add-edit-pane.vala
 src/client/accounts/account-dialog-pane.vala
@@ -28,11 +29,16 @@
 src/client/components/pill-toolbar.vala
 src/client/components/status-bar.vala
 src/client/components/stock.vala
+src/client/composer/composer-container.vala
+src/client/composer/composer-embed.vala
+src/client/composer/composer-headerbar.vala
+src/client/composer/composer-widget.vala
 src/client/composer/composer-toolbar.vala
 src/client/composer/composer-window.vala
 src/client/composer/contact-entry-completion.vala
 src/client/composer/contact-list-store.vala
 src/client/composer/email-entry.vala
+src/client/composer/scrollable-overlay.vala
 src/client/composer/webview-edit-fixer.vala
 src/client/conversation-list/conversation-list-cell-renderer.vala
 src/client/conversation-list/conversation-list-store.vala
@@ -42,6 +48,7 @@
 src/client/conversation-viewer/conversation-web-view.vala
 src/client/dialogs/alert-dialog.vala
 src/client/dialogs/attachment-dialog.vala
+src/client/dialogs/certificate-warning-dialog.vala
 src/client/dialogs/password-dialog.vala
 src/client/dialogs/preferences-dialog.vala
 src/client/dialogs/upgrade-dialog.vala
@@ -108,6 +115,7 @@
 src/engine/api/geary-progress-monitor.vala
 src/engine/api/geary-search-folder.vala
 src/engine/api/geary-search-query.vala
+src/engine/api/geary-service.vala
 src/engine/api/geary-service-provider.vala
 src/engine/api/geary-special-folder-type.vala
 src/engine/app/app-conversation-monitor.vala
@@ -346,6 +354,7 @@
 [type: gettext/glade]ui/account_list.glade
 [type: gettext/glade]ui/account_spinner.glade
 [type: gettext/glade]ui/app_menu.interface
+[type: gettext/glade]ui/certificate_warning_dialog.glade
 [type: gettext/glade]ui/composer_accelerators.ui
 [type: gettext/glade]ui/composer.glade
 [type: gettext/glade]ui/find_bar.glade

=== modified file 'po/cs.po'
--- po/cs.po	2014-07-26 10:08:43 +0000
+++ po/cs.po	2014-10-02 03:11:35 +0000
@@ -12,8 +12,8 @@
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-02-27 20:29+0000\n"
-"PO-Revision-Date: 2014-03-02 16:02+0100\n"
+"POT-Creation-Date: 2014-09-10 05:03+0000\n"
+"PO-Revision-Date: 2014-09-10 07:09+0200\n"
 "Last-Translator: Marek Černocký <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
 "Language: cs\n"
@@ -23,24 +23,24 @@
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../desktop/geary.desktop.in.h:1
+#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
 msgid "Geary"
 msgstr "Geary"
 
-#: ../desktop/geary.desktop.in.h:2
+#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
 #: ../src/client/application/geary-application.vala:18
 msgid "Mail Client"
 msgstr "Poštovní klient"
 
-#: ../desktop/geary.desktop.in.h:3
+#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
 msgid "Geary Mail"
 msgstr "Pošta Geary"
 
-#: ../desktop/geary.desktop.in.h:4
+#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
 msgid "Send and receive email"
 msgstr "Odesílat a přijímat e-maily"
 
-#: ../desktop/geary.desktop.in.h:5
+#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
 msgid "Email;E-mail;Mail;"
 msgstr "email;e-mail;mail;pošta;e-pošta;"
 
@@ -74,89 +74,89 @@
 msgid "First Last"
 msgstr "První poslední"
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Welcome to Geary."
 msgstr "Vítejte v Geary."
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Enter your account information to get started."
 msgstr "Nejprve vyplňte informace o svém účtu."
 
-#: ../src/client/accounts/add-edit-page.vala:223
+#: ../src/client/accounts/add-edit-page.vala:247
 msgid "2 weeks back"
 msgstr "2 týdny nazpět"
 
 #. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:224
+#: ../src/client/accounts/add-edit-page.vala:248
 msgid "1 month back"
 msgstr "1 měsíc nazpět"
 
-#: ../src/client/accounts/add-edit-page.vala:225
+#: ../src/client/accounts/add-edit-page.vala:249
 msgid "3 months back"
 msgstr "3 měsíce nazpět"
 
-#: ../src/client/accounts/add-edit-page.vala:226
+#: ../src/client/accounts/add-edit-page.vala:250
 msgid "6 months back"
 msgstr "6 měsíců nazpět"
 
-#: ../src/client/accounts/add-edit-page.vala:227
+#: ../src/client/accounts/add-edit-page.vala:251
 msgid "1 year back"
 msgstr "1 rok nazpět"
 
-#: ../src/client/accounts/add-edit-page.vala:228
+#: ../src/client/accounts/add-edit-page.vala:252
 msgid "2 years back"
 msgstr "2 roky nazpět"
 
-#: ../src/client/accounts/add-edit-page.vala:229
+#: ../src/client/accounts/add-edit-page.vala:253
 msgid "4 years back"
 msgstr "4 roky nazpět"
 
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:231
+#: ../src/client/accounts/add-edit-page.vala:255
 msgid "Everything"
 msgstr "Vše"
 
-#: ../src/client/accounts/add-edit-page.vala:630
+#: ../src/client/accounts/add-edit-page.vala:686
 msgid "Remem_ber passwords"
 msgstr "Pama_tovat si hesla"
 
-#: ../src/client/accounts/add-edit-page.vala:637 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "Pama_tovat si heslo"
 
-#: ../src/client/accounts/add-edit-page.vala:671
+#: ../src/client/accounts/add-edit-page.vala:727
 msgid "Unable to validate:\n"
 msgstr "Nelze ověřit:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:673
+#: ../src/client/accounts/add-edit-page.vala:729
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Neplatná přezdívka účtu.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:676
+#: ../src/client/accounts/add-edit-page.vala:732
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr "        &#8226; E-mailová adresa už byla do Geary přidána.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:680
+#: ../src/client/accounts/add-edit-page.vala:736
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; Chyba připojení IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:683
+#: ../src/client/accounts/add-edit-page.vala:739
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo pro IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:686
+#: ../src/client/accounts/add-edit-page.vala:742
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; Chyba připojení SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:689
+#: ../src/client/accounts/add-edit-page.vala:745
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo pro SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:693
+#: ../src/client/accounts/add-edit-page.vala:749
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Chyba připojení.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:697
+#: ../src/client/accounts/add-edit-page.vala:753
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo.\n"
 
@@ -169,242 +169,256 @@
 msgstr "Navštívit webové stránky Yorba"
 
 #: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Spustit Geary se skrytým hlavním oknem"
+
+#: ../src/client/application/geary-args.vala:11
 msgid "Output debugging information"
 msgstr "Vypisovat ladicí informace"
 
-#: ../src/client/application/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "Zaznamenávat sledování konverzace"
 
-#: ../src/client/application/geary-args.vala:12
+#: ../src/client/application/geary-args.vala:13
 msgid "Log network deserialization"
 msgstr "Zaznamenávat síťové deserializace"
 
-#: ../src/client/application/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "Zaznamenávat aktivity sítě"
 
 #. / The IMAP replay queue is how changes on the server are replicated on the client.
 #. / It could also be called the IMAP events queue.
-#: ../src/client/application/geary-args.vala:16
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "Zaznamenávat přehrání fronty IMAP"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../src/client/application/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "Zaznamenávat síťové serializace"
 
-#: ../src/client/application/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "Zaznamenávat opakující se aktivity"
 
-#: ../src/client/application/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "Zaznamenávat databázové dotazy (generuje velké množství zpráv)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Zaznamenávat normalizace složky"
 
-#: ../src/client/application/geary-args.vala:24
+#: ../src/client/application/geary-args.vala:25
 msgid "Allow inspection of WebView"
 msgstr "Povolit kontrolu WebView"
 
-#: ../src/client/application/geary-args.vala:25
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Odvolat všechny serverové certifikáty s varováními TLS"
+
+#: ../src/client/application/geary-args.vala:27
 msgid "Display program version"
 msgstr "Zobrazit verzi programu"
 
 #. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:47
+#: ../src/client/application/geary-args.vala:51
 #, c-format
 msgid "Use %s to open a new composer window"
 msgstr "Použít %s k otevření nového okna pro psaní zprávy"
 
-#: ../src/client/application/geary-args.vala:48
+#: ../src/client/application/geary-args.vala:52
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Připomínky, návrhy a chyby hlaste prosím na:"
 
 #. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:55
+#: ../src/client/application/geary-args.vala:59
 #, c-format
 msgid "Failed to parse command line options: %s\n"
 msgstr "Nepodařilo se zpracovat přepínače příkazového řádku: %s\n"
 
-#: ../src/client/application/geary-args.vala:66
+#: ../src/client/application/geary-args.vala:70
 #, c-format
 msgid "Unrecognized command line option \"%s\"\n"
 msgstr "Nerozpoznaný přepínač příkazového řádku „%s“\n"
 
-#: ../src/client/application/geary-controller.vala:46
+#: ../src/client/application/geary-controller.vala:56
 msgid "_Delete"
-msgstr "_Vymazat"
+msgstr "_Smazat"
 
-#: ../src/client/application/geary-controller.vala:47
+#: ../src/client/application/geary-controller.vala:57
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Vymazat konverzaci (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:48
+#: ../src/client/application/geary-controller.vala:58
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Vymazat konverzace (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:51
+#. This refers to the action ("move email to the trash"), not the Trash folder itself
+#: ../src/client/application/geary-controller.vala:62
 msgid "_Trash"
 msgstr "_Koš"
 
-#: ../src/client/application/geary-controller.vala:52
+#: ../src/client/application/geary-controller.vala:63
 msgid "Move conversation to trash (Delete, Backspace)"
 msgstr "Přesunout konverzaci do koše (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:53
+#: ../src/client/application/geary-controller.vala:64
 msgid "Move conversations to trash (Delete, Backspace)"
 msgstr "Přesunout konverzace do koše (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:56
+#. This refers to the action ("archive an email"), not the Archive folder itself
+#: ../src/client/application/geary-controller.vala:68
 msgid "_Archive"
 msgstr "_Archivovat"
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:69
 msgid "Archive conversation (A)"
 msgstr "Archivovat konverzaci (A)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:70
 msgid "Archive conversations (A)"
 msgstr "Archivovat konverzace (A)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:73
 msgid "Mark as S_pam"
 msgstr "Označit jako nevyžá_dané"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:74
 msgid "Mark as not S_pam"
 msgstr "Označit, že není nevyžá_dané"
 
-#: ../src/client/application/geary-controller.vala:64
-#: ../src/client/application/geary-controller.vala:275
+#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:295
 msgid "Mark conversation"
 msgstr "Označit konverzaci"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark conversations"
 msgstr "Označit konverzace"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:78
 msgid "Add label to conversation"
 msgstr "Přiřadit konverzaci štítek"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:79
 msgid "Add label to conversations"
 msgstr "Přiřadit konverzacím štítek"
 
-#: ../src/client/application/geary-controller.vala:68
-#: ../src/client/application/geary-controller.vala:314
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:334
 msgid "Move conversation"
 msgstr "Přesunout konverzaci"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:81
 msgid "Move conversations"
 msgstr "Přesunout konverzace"
 
-#: ../src/client/application/geary-controller.vala:251
+#: ../src/client/application/geary-controller.vala:271
 msgid "A_ccounts"
 msgstr "Úč_ty"
 
-#: ../src/client/application/geary-controller.vala:256
+#: ../src/client/application/geary-controller.vala:276
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Předvolby"
 
-#: ../src/client/application/geary-controller.vala:260
+#: ../src/client/application/geary-controller.vala:280
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Nápo_věda"
 
-#: ../src/client/application/geary-controller.vala:264
+#: ../src/client/application/geary-controller.vala:284
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../src/client/application/geary-controller.vala:268
+#: ../src/client/application/geary-controller.vala:288
 msgid "_Donate"
 msgstr "_Darovat"
 
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:292
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "U_končit"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:297
 msgid "_Mark as..."
 msgstr "Oz_načit jako…"
 
-#: ../src/client/application/geary-controller.vala:283
+#: ../src/client/application/geary-controller.vala:303
 msgid "Mark as _Read"
 msgstr "Označit jako _přečtené"
 
-#: ../src/client/application/geary-controller.vala:289
+#: ../src/client/application/geary-controller.vala:309
 msgid "Mark as _Unread"
 msgstr "Označit jako _nepřečtené"
 
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:315
 msgid "_Star"
 msgstr "_Hvězdička"
 
-#: ../src/client/application/geary-controller.vala:300
+#: ../src/client/application/geary-controller.vala:320
 msgid "U_nstar"
 msgstr "O_debrat hvězdičku"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:330
 msgid "Add label"
 msgstr "Přidat štítek"
 
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:331
 msgid "_Label"
 msgstr "Štít_ek"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:335
 msgid "_Move"
 msgstr "_Přesunout"
 
-#: ../src/client/application/geary-controller.vala:319
+#: ../src/client/application/geary-controller.vala:339
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Napsat novou zprávu (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:323
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1567
+#: ../src/client/application/geary-controller.vala:343
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1635
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:344
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odpovědět (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:328
+#: ../src/client/application/geary-controller.vala:348
 msgid "R_eply All"
 msgstr "O_dpovědět všem"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:349
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Odpovědět všem (Ctrl+Shift+R, Shift+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:334
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1577
+#: ../src/client/application/geary-controller.vala:354
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1645
 msgid "_Forward"
 msgstr "_Přeposlat"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:355
 msgid "Forward (Ctrl+L, F)"
 msgstr "Přeposlat (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:618
+#: ../src/client/application/geary-controller.vala:623
+msgid "Unable to store server trust exception"
+msgstr "Nelze uložit výjimku důvěry k serveru"
+
+#: ../src/client/application/geary-controller.vala:860
 msgid "Your settings are insecure"
 msgstr "Vaše nastavení není bezpečené"
 
-#: ../src/client/application/geary-controller.vala:619
+#: ../src/client/application/geary-controller.vala:861
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -414,17 +428,17 @@
 "vaše uživatelské jméno a heslo může číst jiná osoba na síti. Opravdu to tak "
 "chcete?"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:862
 msgid "Co_ntinue"
 msgstr "Po_kračovat"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:698
+#: ../src/client/application/geary-controller.vala:940
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Chyba při odesílání e-mailu"
 
-#: ../src/client/application/geary-controller.vala:699
+#: ../src/client/application/geary-controller.vala:941
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -434,12 +448,12 @@
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:703
+#: ../src/client/application/geary-controller.vala:945
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Chyba při ukládání odeslané pošty"
 
-#: ../src/client/application/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:946
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -447,19 +461,19 @@
 "V Geary došlo k chybě při ukládání odeslané zprávy. Zpráva zůstane ve vaší "
 "složce Pošta k odeslání, dokud ji nesmažete."
 
-#: ../src/client/application/geary-controller.vala:773
+#: ../src/client/application/geary-controller.vala:1015
 msgid "Labels"
 msgstr "Štítky"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:785
+#: ../src/client/application/geary-controller.vala:1027
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Nelze otevřít databázi pro %s"
 
-#: ../src/client/application/geary-controller.vala:786
+#: ../src/client/application/geary-controller.vala:1028
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -483,20 +497,20 @@
 "Opětovné sestavení databáze zničí všechny místně uložené e-maily a jejich "
 "přílohy <b>Na e-maily na vašem serveru to nebude mít vliv.</b>"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1030
 msgid "_Rebuild"
 msgstr "Znovu _sestavit"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1030
 msgid "E_xit"
 msgstr "S_končit"
 
-#: ../src/client/application/geary-controller.vala:797
+#: ../src/client/application/geary-controller.vala:1039
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Nelze znovu sestavit databázi pro „%s“"
 
-#: ../src/client/application/geary-controller.vala:798
+#: ../src/client/application/geary-controller.vala:1040
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -509,14 +523,14 @@
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:820
-#: ../src/client/application/geary-controller.vala:830
-#: ../src/client/application/geary-controller.vala:841
+#: ../src/client/application/geary-controller.vala:1062
+#: ../src/client/application/geary-controller.vala:1072
+#: ../src/client/application/geary-controller.vala:1083
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Nelze otevřít místní poštovní schránku pro %s"
 
-#: ../src/client/application/geary-controller.vala:821
+#: ../src/client/application/geary-controller.vala:1063
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -535,7 +549,7 @@
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:831
+#: ../src/client/application/geary-controller.vala:1073
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
@@ -548,7 +562,7 @@
 "\n"
 "Nainstalujte prosím nejnovější verzi Geary a zkuste to znovu."
 
-#: ../src/client/application/geary-controller.vala:842
+#: ../src/client/application/geary-controller.vala:1084
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -561,25 +575,25 @@
 "\n"
 "Zkontrolujte prosím připojení k síti a restartujte Geary."
 
-#: ../src/client/application/geary-controller.vala:1335
+#: ../src/client/application/geary-controller.vala:1591
 #, c-format
 msgid "About %s"
 msgstr "O aplikaci %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <[e-mail]>
-#: ../src/client/application/geary-controller.vala:1338
+#: ../src/client/application/geary-controller.vala:1594
 msgid "translator-credits"
 msgstr ""
 "Petr Šimáček <[e-mail]>\n"
 "Marek Černocký <[e-mail]>"
 
-#: ../src/client/application/geary-controller.vala:1595
+#: ../src/client/application/geary-controller.vala:1858
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Opravdu chcete otevřít „%s“?"
 
-#: ../src/client/application/geary-controller.vala:1596
+#: ../src/client/application/geary-controller.vala:1859
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -587,33 +601,39 @@
 "Příloha by po otevření mohla poškodit váš počítač. Otevírejte pouze soubory "
 "z důvěryhodných zdrojů. "
 
-#: ../src/client/application/geary-controller.vala:1597
+#: ../src/client/application/geary-controller.vala:1860
 msgid "Don't _ask me again"
 msgstr "Příště se nept_at"
 
-#: ../src/client/application/geary-controller.vala:1615
+#: ../src/client/application/geary-controller.vala:1878
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Soubor s názvem „%s“ již existuje. Chcete ho nahradit?"
 
-#: ../src/client/application/geary-controller.vala:1617
+#: ../src/client/application/geary-controller.vala:1880
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Soubor již existuje v „%s“. Nahrazením přepíšete jeho obsah."
 
-#: ../src/client/application/geary-controller.vala:1620
+#: ../src/client/application/geary-controller.vala:1883
 msgid "_Replace"
 msgstr "Nah_radit"
 
-#: ../src/client/application/geary-controller.vala:1922
+#. Find out what to do with the inline composers.
+#. TODO: Remove this in favor of automatically saving drafts
+#: ../src/client/application/geary-controller.vala:2150
+msgid "Close open draft messages?"
+msgstr "Zavřít otevřený koncept zprávy?"
+
+#: ../src/client/application/geary-controller.vala:2259
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Chcete trvale smazat tuto zprávu?"
 msgstr[1] "Chcete trvale smazat tyto zprávy?"
 msgstr[2] "Chcete trvale smazat tyto zprávy?"
 
-#: ../src/client/application/geary-controller.vala:1924
+#: ../src/client/application/geary-controller.vala:2261
 msgid "Delete"
 msgstr "Smazat"
 
@@ -643,23 +663,27 @@
 msgid "Search"
 msgstr "Hledat"
 
-#. Spacer.
 #. Search bar.
-#: ../src/client/components/main-toolbar.vala:84
+#: ../src/client/components/main-toolbar.vala:78
 msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr "Prohledat všechny e-maily v účtu podle klíčového slova (Ctrl+S)"
 
-#: ../src/client/components/main-toolbar.vala:205
+#: ../src/client/components/main-toolbar.vala:212
 #, c-format
 msgid "Indexing %s account"
 msgstr "Indexuje se účet %s"
 
-#: ../src/client/components/main-toolbar.vala:212
+#: ../src/client/components/main-toolbar.vala:223
 #: ../src/client/folder-list/folder-list-search-branch.vala:39
 #, c-format
 msgid "Search %s account"
 msgstr "Prohledat účet %s"
 
+#: ../src/client/components/main-window.vala:323
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
@@ -675,7 +699,7 @@
 msgstr "_Zrušit"
 
 #: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:1
+#: ../ui/preferences.glade.h:2
 msgid "_Close"
 msgstr "_Zavřít"
 
@@ -697,7 +721,7 @@
 
 #. Select all.
 #: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1035
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1103
 msgid "Select _All"
 msgstr "Vybrat _vše"
 
@@ -705,115 +729,132 @@
 msgid "_Keep"
 msgstr "_Zachovat"
 
-#: ../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Nová zpráva"
-
-#: ../src/client/composer/composer-window.vala:41
+#: ../src/client/composer/composer-widget.vala:57
 msgid "Saved"
 msgstr "Uloženo"
 
-#: ../src/client/composer/composer-window.vala:42
+#: ../src/client/composer/composer-widget.vala:58
 msgid "Saving"
 msgstr "Ukládá se"
 
-#: ../src/client/composer/composer-window.vala:43
+#: ../src/client/composer/composer-widget.vala:59
 msgid "Error saving"
 msgstr "Chyba při ukládání"
 
 #. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-window.vala:90
+#: ../src/client/composer/composer-widget.vala:117
 msgid "attach|enclosed|enclosing|cover letter"
 msgstr "přiložit|přiložený|přikládá|průvodní dopis"
 
-#: ../src/client/composer/composer-window.vala:679
+#: ../src/client/composer/composer-widget.vala:831
 msgid "Do you want to discard the unsaved message?"
 msgstr "Chcete zahodit neuloženou zprávu?"
 
-#: ../src/client/composer/composer-window.vala:682
+#: ../src/client/composer/composer-widget.vala:834
+#: ../src/client/composer/composer-widget.vala:838
 msgid "Do you want to discard this message?"
 msgstr "Chcete zahodit tuto zprávu?"
 
-#: ../src/client/composer/composer-window.vala:759
+#: ../src/client/composer/composer-widget.vala:919
 msgid "Send message with an empty subject and body?"
 msgstr "Poslat zprávu s prázdným předmětem a tělem?"
 
-#: ../src/client/composer/composer-window.vala:761
+#: ../src/client/composer/composer-widget.vala:921
 msgid "Send message with an empty subject?"
 msgstr "Poslat zprávu s prázdným předmětem?"
 
-#: ../src/client/composer/composer-window.vala:763
+#: ../src/client/composer/composer-widget.vala:923
 msgid "Send message with an empty body?"
 msgstr "Poslat zprávu s prázdným tělem?"
 
-#: ../src/client/composer/composer-window.vala:765
+#: ../src/client/composer/composer-widget.vala:925
 msgid "Send message without an attachment?"
 msgstr "Poslat zprávu bez přílohy?"
 
-#: ../src/client/composer/composer-window.vala:948
+#: ../src/client/composer/composer-widget.vala:1108
 msgid "Cannot add attachment"
 msgstr "Nelze připojit přílohu"
 
-#: ../src/client/composer/composer-window.vala:959
+#: ../src/client/composer/composer-widget.vala:1119
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "Soubor „%s“ nebyl nalezen."
 
-#: ../src/client/composer/composer-window.vala:966
+#: ../src/client/composer/composer-widget.vala:1126
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "„%s“ je složka."
 
-#: ../src/client/composer/composer-window.vala:973
+#: ../src/client/composer/composer-widget.vala:1133
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "Soubor „%s“ je prázdný."
 
-#: ../src/client/composer/composer-window.vala:987
+#: ../src/client/composer/composer-widget.vala:1147
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "Soubor „%s“ nemohl být otevřen pro čtení."
 
-#: ../src/client/composer/composer-window.vala:994
+#: ../src/client/composer/composer-widget.vala:1154
 #, c-format
 msgid "\"%s\" already attached for delivery."
 msgstr "Soubor „%s“ už byl pro doručení přiložen."
 
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-window.vala:1003
+#: ../src/client/composer/composer-widget.vala:1163
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-window.vala:1265
+#: ../src/client/composer/composer-widget.vala:1223
+msgid "To: "
+msgstr "Komu: "
+
+#: ../src/client/composer/composer-widget.vala:1226
+msgid "Cc: "
+msgstr "Kopie: "
+
+#: ../src/client/composer/composer-widget.vala:1229
+msgid "Bcc: "
+msgstr "Skrytá kopie: "
+
+#: ../src/client/composer/composer-widget.vala:1446
 msgid "Select Color"
 msgstr "Vybrat barvu"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: ../src/client/composer/composer-window.vala:1655
+#: ../src/client/composer/composer-widget.vala:1894
 msgid "_From:"
 msgstr "_Od:"
 
 #. For other types of messages, just show the from account.
 #. Composer label (without mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#. Geary account mail will be sent from
-#: ../src/client/composer/composer-window.vala:1671
-#: ../src/client/conversation-viewer/conversation-viewer.vala:628
-#: ../ui/composer.glade.h:41
+#: ../src/client/composer/composer-widget.vala:1910
+#: ../src/client/conversation-viewer/conversation-viewer.vala:637
 msgid "From:"
 msgstr "Od:"
 
+#. Copyright 2011-2014 Yorba Foundation
+#. *
+#. * This software is licensed under the GNU Lesser General Public License
+#. * (version 2.1 or later).  See the COPYING file in this distribution.
+#.
+#. Window for sending messages.
+#: ../src/client/composer/composer-window.vala:10
+msgid "New Message"
+msgstr "Nová zpráva"
+
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Já"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:255
+#: ../src/client/conversation-viewer/conversation-viewer.vala:262
 msgid "No conversations selected."
 msgstr "Nebyla vybrána žádná konverzace."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:257
+#: ../src/client/conversation-viewer/conversation-viewer.vala:264
 #, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
@@ -821,51 +862,51 @@
 msgstr[1] "%u vybrané konverzace."
 msgstr[2] "%u vybraných konverzací."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:286
+#: ../src/client/conversation-viewer/conversation-viewer.vala:293
 msgid "No search results found."
 msgstr "Žádné výsledky vyhledávání."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:288
+#: ../src/client/conversation-viewer/conversation-viewer.vala:295
 msgid "No conversations in folder."
 msgstr "Žádná konverzace ve složce."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:536
 msgid "This message contains remote images."
 msgstr "Tato zpráva obsahuje vzdálené obrázky. "
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:536
 msgid "Show Images"
 msgstr "Zobrazit obrázky"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:528
+#: ../src/client/conversation-viewer/conversation-viewer.vala:537
 msgid "Always Show From Sender"
 msgstr "Vždy zobrazovat Od odesílatele"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:552
+#: ../src/client/conversation-viewer/conversation-viewer.vala:561
 msgid "Edit Draft"
 msgstr "Upravit koncept"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:631
+#: ../src/client/conversation-viewer/conversation-viewer.vala:640
 msgid "To:"
 msgstr "Komu:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
+#: ../src/client/conversation-viewer/conversation-viewer.vala:643
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
+#: ../src/client/conversation-viewer/conversation-viewer.vala:646
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
+#: ../src/client/conversation-viewer/conversation-viewer.vala:649
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
+#: ../src/client/conversation-viewer/conversation-viewer.vala:652
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:850
+#: ../src/client/conversation-viewer/conversation-viewer.vala:918
 #, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
@@ -873,64 +914,64 @@
 msgstr[1] "%u přečtené zprávy"
 msgstr[2] "%u přečtených zpráv"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:982
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1050
 #, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Tato zpráva byla úspěšně odeslána, ale nelze ji uložit do %s"
 
 #. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1008
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1076
 #: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Kopírovat"
 
 #. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1016
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1084
 msgid "Copy _Email Address"
 msgstr "Kopírovat _e-mailovou adresu"
 
 #. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1021
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1089
 #: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Kopírovat _odkaz"
 
 #. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1029
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1097
 msgid "Select _Message"
 msgstr "Vybrat _zprávu"
 
 #. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1109
 msgid "_Inspect"
 msgstr "_Kontrolovat"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1267
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1335
 msgid "This link appears to go to"
 msgstr "Tento odkaz vypadá, že míří na"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1268
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1336
 msgid "but actually goes to"
 msgstr "ale ve skutečnosti jde na"
 
 #. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1323
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1391
 msgid " (Invalid?)"
 msgstr " (neplatný?)"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1515
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1583
 msgid "_Save As..."
 msgstr "_Uložit jako…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1520
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1588
 msgid "Save All A_ttachments..."
 msgstr "Uložit všechny pří_lohy…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1534
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1602
 msgid "_Save Image As..."
 msgstr "_Uložit obrázek jako…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1625
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Uložit pří_lohu…"
@@ -938,41 +979,41 @@
 msgstr[2] "Uložit pří_lohy…"
 
 #. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1572
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1640
 msgid "Reply to _All"
 msgstr "Odpovědět _všem"
 
 #. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1657
 msgid "_Mark as Read"
 msgstr "_Označit jako přečtené"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1661
 msgid "_Mark as Unread"
 msgstr "_Označit jako nepřečtené"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1599
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1667
 msgid "Mark Unread From _Here"
 msgstr "Označit jako nepřečtené z_de"
 
 #. Separator.
 #. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1614
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1682
 msgid "_View Source"
 msgstr "_Zobrazit zdroj"
 
 #. Generate the attachment table.
 #. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1908
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1996
 #: ../src/engine/rfc822/rfc822-utils.vala:327
 msgid "none"
 msgstr "žádný"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2038
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2126
 msgid "Failed to open default text editor."
 msgstr "Nepodařilo se otevřít výchozí textový editor."
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:296
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
 #, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s – Inspektor konverzace"
@@ -985,6 +1026,85 @@
 msgid "_Attach"
 msgstr "_Příloha"
 
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+#, c-format
+msgid "Untrusted Connection: %s"
+msgstr "Nedůvěryhodné připojení: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+#, c-format
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "Identitu poštovního serveru %s na %s:%u nelze ověřit."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
+"Pokud vyberete „Důvěřovat tomuto serveru“ nebo „Vždy důvěřovat tomuto "
+"serveru“, mohou být vaše uživatelské jméno a heslo odeslány nebezpečným "
+"způsobem."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Pokud vyberete „Nedůvěřovat tomuto serveru“, nebude Geary k tomuto serveru "
+"vůbec přistupovat."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary tento poštovní účet nepřidá nebo neaktualizuje."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Pokud vyberete „Nedůvěřovat tomuto serveru“, zastaví Geary přístup k tomuto "
+"účtu."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Pokud nemáte žádné další otevřené poštovní účty, bude Geary ukončen."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Pokud máte k této záležitosti nějaké dotazy, kontaktujte svého správce "
+"systému nebo poskytovatele e-mailu."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Certifikát serveru je podepsán neznámou autoritou"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Identita serveru neodpovídá identitě v certifikátu"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Certifikát serveru vypršel"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Certifikát serveru nebyl aktivován"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Certifikát serveru byl odvolán a v současnosti je neplatný"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Certifikát serveru není považován za bezpečný"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Při zpracování certifikátu serveru nastala chyba"
+
 #. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
 #. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
@@ -993,7 +1113,7 @@
 msgstr "Zadejte prosím své heslo"
 
 #. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:30
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1002,7 +1122,7 @@
 msgstr[2] "%d zpráv"
 
 #. / Label displaying number of unread email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:37
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1013,7 +1133,7 @@
 #. / This string represents the divider between two messages: "n messages" and "n unread",
 #. / shown in the folder list as a tooltip.  Please use your languages conventions for
 #. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../src/client/folder-list/folder-list-folder-entry.vala:43
+#: ../src/client/folder-list/folder-list-folder-entry.vala:45
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -1156,7 +1276,7 @@
 msgstr "%A"
 
 #: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:742
+#: ../src/engine/rfc822/rfc822-message.vala:741
 msgid "(no subject)"
 msgstr "(bez předmětu)"
 
@@ -1184,6 +1304,14 @@
 msgid "KB"
 msgstr "kB"
 
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
+
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
+
 #: ../src/engine/api/geary-service-provider.vala:52
 msgid "Gmail"
 msgstr "Gmail"
@@ -1198,7 +1326,7 @@
 
 #: ../src/engine/api/geary-service-provider.vala:61
 msgid "Other"
-msgstr "Jiný"
+msgstr "Jiná"
 
 #: ../src/engine/api/geary-special-folder-type.vala:24
 msgid "Inbox"
@@ -1301,7 +1429,7 @@
 #. List of folder names to match for Drafts, separated by |.  Please add localized common
 #. names for the Drafts folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:439
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
 msgid "Drafts | Draft"
 msgstr ""
 "Drafts | Koncepty | Koncept | Rozepsané | Rozepsané zprávy | Rozepsané e-"
@@ -1310,14 +1438,14 @@
 #. List of folder names to match for Sent Mail, separated by |.  Please add localized common
 #. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:444
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Sent | Odeslané | Odeslaná pošta  | Odeslané zprávy | Odeslané e-maily"
 
 #. List of folder names to match for Spam, separated by |.  Please add localized common
 #. names for the Spam folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:449
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:545
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1328,7 +1456,7 @@
 #. List of folder names to match for Trash, separated by |.  Please add localized common
 #. names for the Trash folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:454
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Trash | Koš | Smazané | Smazané zprávy | Smazaná pošta"
 
@@ -1417,6 +1545,22 @@
 msgid "Please wait while Geary validates your account."
 msgstr "Vyčkejte prosím, než Geary ověří váš účet."
 
+#: ../ui/certificate_warning_dialog.glade.h:1
+msgid "Untrusted Connection"
+msgstr "Nedůvěryhodné připojení"
+
+#: ../ui/certificate_warning_dialog.glade.h:2
+msgid "_Always Trust This Server"
+msgstr "_Vždy důvěřovat tomuto serveru"
+
+#: ../ui/certificate_warning_dialog.glade.h:3
+msgid "_Trust This Server"
+msgstr "_Důvěřovat tomuto serveru"
+
+#: ../ui/certificate_warning_dialog.glade.h:4
+msgid "_Don't Trust This Server"
+msgstr "_Nedůvěřovat tomuto serveru"
+
 #: ../ui/composer.glade.h:1
 msgid "_Undo"
 msgstr "_Zpět"
@@ -1496,7 +1640,7 @@
 
 #: ../ui/composer.glade.h:22
 msgid "_Rich Text"
-msgstr "_Rich Text"
+msgstr "Fo_rmátovaný text"
 
 #: ../ui/composer.glade.h:23
 msgid "Lar_ge"
@@ -1546,47 +1690,64 @@
 msgid "Fixed Width"
 msgstr "Pevná šířka"
 
-#. Address(es) e-mail is to be sent to
+#: ../ui/composer.glade.h:35
+msgid "Detach"
+msgstr "Odpojit"
+
 #: ../ui/composer.glade.h:36
-msgid "_To:"
-msgstr "_Komu:"
+msgid "_Send"
+msgstr "_Odeslat"
 
 #: ../ui/composer.glade.h:37
-msgid "_Cc:"
-msgstr "Ko_pie:"
+msgid "Send"
+msgstr "Odeslat"
 
 #: ../ui/composer.glade.h:38
-msgid "_Subject:"
-msgstr "_Předmět:"
+msgid "_Attach File"
+msgstr "_Přiložit soubor"
 
 #: ../ui/composer.glade.h:39
-msgid "_Bcc:"
-msgstr "_Skrytá kopie:"
-
-#: ../ui/composer.glade.h:42
+msgid "Attach File"
+msgstr "Přiložit soubor"
+
+#: ../ui/composer.glade.h:40
+msgid "_Include Original Attachments"
+msgstr "Vlož_it původní přílohy"
+
+#: ../ui/composer.glade.h:41
+msgid "Include Original Attachments"
+msgstr "Vložit původní přílohy"
+
+#. Address(es) e-mail is to be sent to
+#: ../ui/composer.glade.h:43
+msgid "_To"
+msgstr "_Komu"
+
+#: ../ui/composer.glade.h:44
+msgid "_Cc"
+msgstr "Ko_pie"
+
+#: ../ui/composer.glade.h:45
+msgid "_Subject"
+msgstr "_Předmět"
+
+#: ../ui/composer.glade.h:46
+msgid "_Bcc"
+msgstr "_Skrytá kopie"
+
+#. Geary account mail will be sent from
+#: ../ui/composer.glade.h:48
+msgid "From"
+msgstr "Od"
+
+#: ../ui/composer.glade.h:49
 msgid "Drop files here"
 msgstr "upusťte soubory zde"
 
-#: ../ui/composer.glade.h:43
+#: ../ui/composer.glade.h:50
 msgid "To add them as attachments"
 msgstr "Chcete-li je přidat jako přílohy"
 
-#: ../ui/composer.glade.h:44
-msgid "_Attach File"
-msgstr "_Přiložit soubor"
-
-#: ../ui/composer.glade.h:45
-msgid "_Include Original Attachments"
-msgstr "Vlož_it původní přílohy"
-
-#: ../ui/composer.glade.h:46
-msgid "C_lose"
-msgstr "_Zavřít"
-
-#: ../ui/composer.glade.h:47
-msgid "_Send"
-msgstr "_Odeslat"
-
 #: ../ui/find_bar.glade.h:1
 msgid "Find:"
 msgstr "Hledat:"
@@ -1612,24 +1773,24 @@
 msgstr "Heslo"
 
 #: ../ui/login.glade.h:2
-msgid "E_mail address:"
-msgstr "E-_mailová adresa:"
+msgid "E_mail address"
+msgstr "E-_mailová adresa"
 
 #: ../ui/login.glade.h:3
-msgid "_Password:"
-msgstr "_Heslo:"
+msgid "_Password"
+msgstr "_Heslo"
 
 #: ../ui/login.glade.h:4
-msgid "S_ervice:"
-msgstr "S_lužba:"
+msgid "S_ervice"
+msgstr "S_lužba"
 
 #: ../ui/login.glade.h:5
-msgid "N_ame:"
-msgstr "J_méno:"
+msgid "N_ame"
+msgstr "J_méno"
 
 #: ../ui/login.glade.h:7
-msgid "N_ickname:"
-msgstr "Přez_dívka:"
+msgid "N_ickname"
+msgstr "Přez_dívka"
 
 #: ../ui/login.glade.h:8
 msgid "Work, Home, etc."
@@ -1644,32 +1805,32 @@
 msgstr "Nastavení IMAP"
 
 #: ../ui/login.glade.h:11
-msgid "Se_rver:"
-msgstr "Se_rver:"
+msgid "Se_rver"
+msgstr "Se_rver"
 
 #: ../ui/login.glade.h:12
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "P_ort"
+msgstr "P_ort"
 
 #: ../ui/login.glade.h:13
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
+msgid "Ser_ver"
+msgstr "Ser_ver"
 
 #: ../ui/login.glade.h:14
-msgid "Por_t:"
-msgstr "Por_t:"
+msgid "Por_t"
+msgstr "Por_t"
 
 #: ../ui/login.glade.h:15
 msgid "SMTP settings"
 msgstr "Nastavení SMTP"
 
 #: ../ui/login.glade.h:16
-msgid "User_name:"
-msgstr "Uživatelské _jméno:"
+msgid "User_name"
+msgstr "Uživatelské _jméno"
 
 #: ../ui/login.glade.h:17
-msgid "Pass_word:"
-msgstr "Hes_lo:"
+msgid "Pass_word"
+msgstr "Hes_lo"
 
 #: ../ui/login.glade.h:18
 msgid "SMTP username"
@@ -1680,8 +1841,8 @@
 msgstr "Heslo pro SMTP"
 
 #: ../ui/login.glade.h:20
-msgid "_Username:"
-msgstr "_Uživatelské jméno:"
+msgid "_Username"
+msgstr "_Uživatelské jméno"
 
 #: ../ui/login.glade.h:21
 msgid "IMAP username"
@@ -1692,12 +1853,12 @@
 msgstr "Heslo pro IMAP"
 
 #: ../ui/login.glade.h:23
-msgid "Encr_yption:"
-msgstr "Šifr_ování:"
+msgid "Encr_yption"
+msgstr "Ši_frování"
 
 #: ../ui/login.glade.h:24
-msgid "Encrypt_ion:"
-msgstr "Šifrová_ní:"
+msgid "Encrypt_ion"
+msgstr "Š_ifrování"
 
 #: ../ui/login.glade.h:26
 msgid "SSL/TLS"
@@ -1720,8 +1881,20 @@
 msgstr "Úložiště"
 
 #: ../ui/login.glade.h:31
-msgid "_Download mail:"
-msgstr "_Stáhnout e-mail:"
+msgid "_Download mail"
+msgstr "Stá_hnout e-mail"
+
+#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
+msgid "Composer"
+msgstr "Editor"
+
+#: ../ui/login.glade.h:33
+msgid "Save dra_fts on server"
+msgstr "Ukládat kon_cepty na server"
+
+#: ../ui/login.glade.h:34
+msgid "Si_gn emails:"
+msgstr "Podepsat e-_maily:"
 
 #: ../ui/password-dialog.glade.h:1
 msgid "SMTP Credentials"
@@ -1739,38 +1912,42 @@
 msgid "_Remember password"
 msgstr "_Pamatovat si heslo"
 
-#: ../ui/preferences.glade.h:2
+#: ../ui/preferences.glade.h:1
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: ../ui/preferences.glade.h:3
 msgid "Reading"
 msgstr "Čtení"
 
-#: ../ui/preferences.glade.h:3
+#: ../ui/preferences.glade.h:4
 msgid "_Automatically select next message"
 msgstr "_Automaticky vybrat další zprávu"
 
-#: ../ui/preferences.glade.h:4
+#: ../ui/preferences.glade.h:5
 msgid "_Display conversation preview"
 msgstr "_Zobrazit náhled konverzace"
 
-#: ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Editor"
-
-#: ../ui/preferences.glade.h:6
+#: ../ui/preferences.glade.h:7
 msgid "Enable _spell checking"
 msgstr "Zapnout _kontrolu pravopisu"
 
-#: ../ui/preferences.glade.h:7
+#: ../ui/preferences.glade.h:8
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../ui/preferences.glade.h:8
+#: ../ui/preferences.glade.h:9
 msgid "_Play notification sounds"
 msgstr "_Přehrávat zvuková upozornění"
 
-#: ../ui/preferences.glade.h:9
+#: ../ui/preferences.glade.h:10
 msgid "Show _notifications for new mail"
 msgstr "Zobrazit _upozornění na nový e-mail"
 
+#: ../ui/preferences.glade.h:11
+msgid "Notify of new mail at start_up"
+msgstr "Při sp_uštění upozornit na novou poštu"
+
 #: ../ui/remove_confirm.glade.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "

=== modified file 'po/el.po'
--- po/el.po	2014-07-26 10:08:43 +0000
+++ po/el.po	2014-10-02 03:11:35 +0000
@@ -12,8 +12,8 @@
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-06-04 17:02+0000\n"
-"PO-Revision-Date: 2014-06-07 14:55+0200\n"
+"POT-Creation-Date: 2014-06-07 05:02+0000\n"
+"PO-Revision-Date: 2014-06-13 14:45+0200\n"
 "Last-Translator: Tom Tryfonidis <[e-mail]>\n"
 "Language-Team: www.gnome.gr\n"
 "Language: el\n"
@@ -75,91 +75,91 @@
 msgid "First Last"
 msgstr "Όνομα επώνυμο"
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Welcome to Geary."
 msgstr "Καλώς ήρθατε στο Geary."
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Enter your account information to get started."
 msgstr "Εισάγετε τα στοιχεία του λογαριασμού σας για να ξεκινήσετε."
 
-#: ../src/client/accounts/add-edit-page.vala:223
+#: ../src/client/accounts/add-edit-page.vala:247
 msgid "2 weeks back"
 msgstr "πριν 2 εβδομάδες"
 
 #. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:224
+#: ../src/client/accounts/add-edit-page.vala:248
 msgid "1 month back"
 msgstr "πριν 1 μήνα"
 
-#: ../src/client/accounts/add-edit-page.vala:225
+#: ../src/client/accounts/add-edit-page.vala:249
 msgid "3 months back"
 msgstr "πριν 3 μήνες"
 
-#: ../src/client/accounts/add-edit-page.vala:226
+#: ../src/client/accounts/add-edit-page.vala:250
 msgid "6 months back"
 msgstr "πριν 6 μήνες"
 
-#: ../src/client/accounts/add-edit-page.vala:227
+#: ../src/client/accounts/add-edit-page.vala:251
 msgid "1 year back"
 msgstr "πριν 1 χρόνο"
 
-#: ../src/client/accounts/add-edit-page.vala:228
+#: ../src/client/accounts/add-edit-page.vala:252
 msgid "2 years back"
 msgstr "πριν 2 χρόνια"
 
-#: ../src/client/accounts/add-edit-page.vala:229
+#: ../src/client/accounts/add-edit-page.vala:253
 msgid "4 years back"
 msgstr "πριν 4 χρόνια"
 
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:231
+#: ../src/client/accounts/add-edit-page.vala:255
 msgid "Everything"
 msgstr "Όλα"
 
-#: ../src/client/accounts/add-edit-page.vala:630
+#: ../src/client/accounts/add-edit-page.vala:687
 msgid "Remem_ber passwords"
 msgstr "Απο_μνημόνευση κωδικών πρόσβασης"
 
-#: ../src/client/accounts/add-edit-page.vala:637 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:694 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "Απο_μνημόνευση κωδικού πρόσβασης"
 
-#: ../src/client/accounts/add-edit-page.vala:671
+#: ../src/client/accounts/add-edit-page.vala:728
 msgid "Unable to validate:\n"
 msgstr "Δεν ήταν δυνατή η επικύρωση:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:673
+#: ../src/client/accounts/add-edit-page.vala:730
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Μη έγκυρο ψευδώνυμο λογαριασμού.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:676
+#: ../src/client/accounts/add-edit-page.vala:733
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 "        &#8226; Η διεύθυνση ηλεκτρονικού ταχυδρομείου είναι ήδη καταχωρημένη "
 "στο Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:680
+#: ../src/client/accounts/add-edit-page.vala:737
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; Σφάλμα σύνδεσης IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:683
+#: ../src/client/accounts/add-edit-page.vala:740
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:686
+#: ../src/client/accounts/add-edit-page.vala:743
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; Σφάλμα σύνδεσης SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:689
+#: ../src/client/accounts/add-edit-page.vala:746
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης για το SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:693
+#: ../src/client/accounts/add-edit-page.vala:750
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Σφάλμα σύνδεσης.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:697
+#: ../src/client/accounts/add-edit-page.vala:754
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης.\n"
 
@@ -253,161 +253,163 @@
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Διαγραφή συνομιλιών (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:51
+#. This refers to the action ("move email to the trash"), not the Trash folder itself
+#: ../src/client/application/geary-controller.vala:52
 msgid "_Trash"
 msgstr "Απο_ρρίμματα"
 
-#: ../src/client/application/geary-controller.vala:52
+#: ../src/client/application/geary-controller.vala:53
 msgid "Move conversation to trash (Delete, Backspace)"
 msgstr "Μετακίνηση συνομιλίας στα απορρίμματα (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:53
+#: ../src/client/application/geary-controller.vala:54
 msgid "Move conversations to trash (Delete, Backspace)"
 msgstr "Μετακίνηση συνομιλιών στα απορρίμματα (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:56
+#. This refers to the action ("archive an email"), not the Archive folder itself
+#: ../src/client/application/geary-controller.vala:58
 msgid "_Archive"
 msgstr "_Αρχείο"
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:59
 msgid "Archive conversation (A)"
 msgstr "Αρχειοθέτηση συνομιλίας (Α)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:60
 msgid "Archive conversations (A)"
 msgstr "Αρχειοθέτηση συνομιλιών (Α)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:63
 msgid "Mark as S_pam"
 msgstr "Σημείωση ως ανεπι_θύμητα"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:64
 msgid "Mark as not S_pam"
 msgstr "Σημείωση ως μη ανεπιθύ_μητα"
 
-#: ../src/client/application/geary-controller.vala:64
-#: ../src/client/application/geary-controller.vala:275
+#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:277
 msgid "Mark conversation"
 msgstr "Σήμανση συνομιλίας"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:67
 msgid "Mark conversations"
 msgstr "Σήμανση συνομιλιών"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:68
 msgid "Add label to conversation"
 msgstr "Προσθήκη ετικέτας στην συνομιλία"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:69
 msgid "Add label to conversations"
 msgstr "Προσθήκη ετικέτας στις συνομιλίες"
 
-#: ../src/client/application/geary-controller.vala:68
-#: ../src/client/application/geary-controller.vala:314
+#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:316
 msgid "Move conversation"
 msgstr "Μετακίνηση συνομιλίας"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:71
 msgid "Move conversations"
 msgstr "Μετακίνηση συνομιλιών"
 
-#: ../src/client/application/geary-controller.vala:251
+#: ../src/client/application/geary-controller.vala:253
 msgid "A_ccounts"
 msgstr "Λ_ογαριασμοί"
 
-#: ../src/client/application/geary-controller.vala:256
+#: ../src/client/application/geary-controller.vala:258
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../src/client/application/geary-controller.vala:260
+#: ../src/client/application/geary-controller.vala:262
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../src/client/application/geary-controller.vala:264
+#: ../src/client/application/geary-controller.vala:266
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "Σ_χετικά με"
 
-#: ../src/client/application/geary-controller.vala:268
+#: ../src/client/application/geary-controller.vala:270
 msgid "_Donate"
 msgstr "_Δωρεά"
 
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:274
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "Έ_ξοδος"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:279
 msgid "_Mark as..."
 msgstr "_Σήμανση ως..."
 
-#: ../src/client/application/geary-controller.vala:283
+#: ../src/client/application/geary-controller.vala:285
 msgid "Mark as _Read"
 msgstr "Σήμανση ως α_ναγνωσμένο"
 
-#: ../src/client/application/geary-controller.vala:289
+#: ../src/client/application/geary-controller.vala:291
 msgid "Mark as _Unread"
 msgstr "Σήμανση ως α_διάβαστο"
 
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:297
 msgid "_Star"
 msgstr "_Αστέρι"
 
-#: ../src/client/application/geary-controller.vala:300
+#: ../src/client/application/geary-controller.vala:302
 msgid "U_nstar"
 msgstr "Κα_τάργηση αστεριού"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:312
 msgid "Add label"
 msgstr "Προσθήκη ετικέτας"
 
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:313
 msgid "_Label"
 msgstr "_Ετικέτα"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:317
 msgid "_Move"
 msgstr "_Μετακίνηση"
 
-#: ../src/client/application/geary-controller.vala:319
+#: ../src/client/application/geary-controller.vala:321
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Σύνθεση νέου μηνύματος (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:323
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1567
+#: ../src/client/application/geary-controller.vala:325
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1574
 msgid "_Reply"
 msgstr "_Απάντηση"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:326
 msgid "Reply (Ctrl+R, R)"
 msgstr "Απάντηση (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:328
+#: ../src/client/application/geary-controller.vala:330
 msgid "R_eply All"
 msgstr "Α_πάντηση σε όλους"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:331
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Απάντηση σε όλους (Ctrl+Shift+R, Shift+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:334
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1577
+#: ../src/client/application/geary-controller.vala:336
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1584
 msgid "_Forward"
 msgstr "_Μπροστά"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:337
 msgid "Forward (Ctrl+L, F)"
 msgstr "Προώθηση (Ctrl+F, F)"
 
-#: ../src/client/application/geary-controller.vala:618
+#: ../src/client/application/geary-controller.vala:620
 msgid "Your settings are insecure"
 msgstr "Οι ρυθμίσεις σας είναι επισφαλείς"
 
-#: ../src/client/application/geary-controller.vala:619
+#: ../src/client/application/geary-controller.vala:621
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -418,17 +420,17 @@
 "διαβαστεί από άλλο άτομο στο δίκτυο. Είστε βέβαιοι ότι θέλετε να το κάνετε "
 "αυτό;"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:622
 msgid "Co_ntinue"
 msgstr "Συ_νεχίστε"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:698
+#: ../src/client/application/geary-controller.vala:700
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Σφάλμα κατά την αποστολή του μηνύματος"
 
-#: ../src/client/application/geary-controller.vala:699
+#: ../src/client/application/geary-controller.vala:701
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -439,12 +441,12 @@
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:703
+#: ../src/client/application/geary-controller.vala:705
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Σφάλμα κατά την αποθήκευση του μηνύματος"
 
-#: ../src/client/application/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:706
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -453,19 +455,19 @@
 "μηνύματος. Το μήνυμα θα παραμείνει στο φάκελο Εξερχόμενα μέχρι να το "
 "διαγράψετε."
 
-#: ../src/client/application/geary-controller.vala:773
+#: ../src/client/application/geary-controller.vala:775
 msgid "Labels"
 msgstr "Ετικέτες"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:785
+#: ../src/client/application/geary-controller.vala:787
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Αδύνατο το άνοιγμα της βάσης δεδομένων για το %s"
 
-#: ../src/client/application/geary-controller.vala:786
+#: ../src/client/application/geary-controller.vala:788
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -491,20 +493,20 @@
 "και τα συνημμένα της. <b>Η αλληλογραφία στον διακομιστή σας δεν θα "
 "επηρεαστεί.</b>"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:790
 msgid "_Rebuild"
 msgstr "Αναδόμη_ση"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:790
 msgid "E_xit"
 msgstr "Έ_ξοδος"
 
-#: ../src/client/application/geary-controller.vala:797
+#: ../src/client/application/geary-controller.vala:799
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Αδύνατη η αναδόμηση της βάσης δεδομένων για το \"%s\""
 
-#: ../src/client/application/geary-controller.vala:798
+#: ../src/client/application/geary-controller.vala:800
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -517,14 +519,14 @@
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:820
-#: ../src/client/application/geary-controller.vala:830
-#: ../src/client/application/geary-controller.vala:841
+#: ../src/client/application/geary-controller.vala:822
+#: ../src/client/application/geary-controller.vala:832
+#: ../src/client/application/geary-controller.vala:843
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Αδύνατο το άνοιγμα του τοπικού γραμματοκιβωτίου για το %s"
 
-#: ../src/client/application/geary-controller.vala:821
+#: ../src/client/application/geary-controller.vala:823
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -544,7 +546,7 @@
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:831
+#: ../src/client/application/geary-controller.vala:833
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
@@ -558,7 +560,7 @@
 "\n"
 "Παρακαλούμε εγκαταστήστε την τελευταία έκδοση του Geary και ξαναδοκιμάστε."
 
-#: ../src/client/application/geary-controller.vala:842
+#: ../src/client/application/geary-controller.vala:844
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -570,14 +572,14 @@
 "\n"
 "Παρακαλούμε ελέγξτε τη σύνδεση δικτύου και επανεκκινήστε το Geary."
 
-#: ../src/client/application/geary-controller.vala:1335
+#: ../src/client/application/geary-controller.vala:1338
 #, c-format
 msgid "About %s"
 msgstr "Σχετικά %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <[e-mail]>
-#: ../src/client/application/geary-controller.vala:1338
+#: ../src/client/application/geary-controller.vala:1341
 msgid "translator-credits"
 msgstr ""
 "Δημήτρης Σπίγγος <[e-mail]>\n"
@@ -586,12 +588,12 @@
 "Petros Dias <[e-mail]>\n"
 "Μαρία Μαυρίδου <[e-mail]>"
 
-#: ../src/client/application/geary-controller.vala:1602
+#: ../src/client/application/geary-controller.vala:1605
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Είστε βέβαιοι ότι θέλετε να ανοίξετε το \"%s\";"
 
-#: ../src/client/application/geary-controller.vala:1603
+#: ../src/client/application/geary-controller.vala:1606
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -599,16 +601,16 @@
 "Τα συνημμένα μπορεί να προκαλέσουν βλάβη στο σύστημά σας, αν ανοιχθούν. "
 "Ανοίξτε αρχεία που προέρχονται μόνο από αξιόπιστες πηγές."
 
-#: ../src/client/application/geary-controller.vala:1604
+#: ../src/client/application/geary-controller.vala:1607
 msgid "Don't _ask me again"
 msgstr "Να μην _ερωτηθώ ξανά"
 
-#: ../src/client/application/geary-controller.vala:1622
+#: ../src/client/application/geary-controller.vala:1625
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Ένα αρχείο με όνομα \"%s\" υπάρχει ήδη. Θέλετε να το αντικαταστήσετε;"
 
-#: ../src/client/application/geary-controller.vala:1624
+#: ../src/client/application/geary-controller.vala:1627
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -616,17 +618,23 @@
 "Το αρχείο υπάρχει ήδη στο \"%s\". Η αντικατάστασή του θα αντικαταστήσει το "
 "περιεχόμενό του."
 
-#: ../src/client/application/geary-controller.vala:1627
+#: ../src/client/application/geary-controller.vala:1630
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: ../src/client/application/geary-controller.vala:1929
+#. Find out what to do with the inline composers.
+#. TODO: Remove this in favor of automatically saving drafts
+#: ../src/client/application/geary-controller.vala:1896
+msgid "Close open draft messages?"
+msgstr "Κλείσμο ανοιγμένων πρόχειρων μηνυμάτων;"
+
+#: ../src/client/application/geary-controller.vala:2003
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Θέλετε να διαγράψετε οριστικά αυτό το μήνυμα;"
 msgstr[1] "Θέλετε να διαγράψετε οριστικά αυτά τα μηνύματα;"
 
-#: ../src/client/application/geary-controller.vala:1931
+#: ../src/client/application/geary-controller.vala:2005
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -654,24 +662,29 @@
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#. Spacer.
 #. Search bar.
-#: ../src/client/components/main-toolbar.vala:84
+#: ../src/client/components/main-toolbar.vala:78
 msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 "Αναζητήστε όλη την αλληλογραφία σε λογαριασμό για λέξεις-κλειδιά (Ctrl+S)"
 
-#: ../src/client/components/main-toolbar.vala:205
+#: ../src/client/components/main-toolbar.vala:196
 #, c-format
 msgid "Indexing %s account"
 msgstr "Ευρετηρίαση λογαριασμού %s"
 
-#: ../src/client/components/main-toolbar.vala:212
+#: ../src/client/components/main-toolbar.vala:207
 #: ../src/client/folder-list/folder-list-search-branch.vala:39
 #, c-format
 msgid "Search %s account"
 msgstr "Αναζήτηση λογαριασμού %s"
 
+#: ../src/client/components/main-window.vala:302
+#, c-format
+#| msgid "%s (%s)"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
@@ -687,7 +700,7 @@
 msgstr "_Ακύρωση"
 
 #: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:1
+#: ../ui/preferences.glade.h:2
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
@@ -709,7 +722,7 @@
 
 #. Select all.
 #: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1035
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1042
 msgid "Select _All"
 msgstr "Ε_πιλογή όλων"
 
@@ -717,94 +730,90 @@
 msgid "_Keep"
 msgstr "Δια_τήρηση"
 
-#: ../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Νέο μήνυμα"
-
-#: ../src/client/composer/composer-window.vala:41
+#: ../src/client/composer/composer-widget.vala:53
 msgid "Saved"
 msgstr "Αποθηκεύτηκε"
 
-#: ../src/client/composer/composer-window.vala:42
+#: ../src/client/composer/composer-widget.vala:54
 msgid "Saving"
 msgstr "Αποθηκεύεται"
 
-#: ../src/client/composer/composer-window.vala:43
+#: ../src/client/composer/composer-widget.vala:55
 msgid "Error saving"
 msgstr "Σφάλμα κατά την αποθήκευση"
 
 #. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-window.vala:90
+#: ../src/client/composer/composer-widget.vala:102
 msgid "attach|enclosed|enclosing|cover letter"
 msgstr "επισύναψη|περιεχόμενο|περικλείω|γράμμα εξώφυλλου"
 
-#: ../src/client/composer/composer-window.vala:683
+#: ../src/client/composer/composer-widget.vala:846
 msgid "Do you want to discard the unsaved message?"
 msgstr "Θέλετε να απορρίψετε το μη αποθηκευμένο μήνυμα;"
 
-#: ../src/client/composer/composer-window.vala:686
-#: ../src/client/composer/composer-window.vala:690
+#: ../src/client/composer/composer-widget.vala:849
+#: ../src/client/composer/composer-widget.vala:853
 msgid "Do you want to discard this message?"
 msgstr "Θέλετε να απορρίψετε αυτό το μήνυμα;"
 
-#: ../src/client/composer/composer-window.vala:770
+#: ../src/client/composer/composer-widget.vala:934
 msgid "Send message with an empty subject and body?"
 msgstr "Να αποσταλεί το μήνυμα με κενό θέμα και περιεχόμενο;"
 
-#: ../src/client/composer/composer-window.vala:772
+#: ../src/client/composer/composer-widget.vala:936
 msgid "Send message with an empty subject?"
 msgstr "Να αποσταλεί το μήνυμα με κενό θέμα;"
 
-#: ../src/client/composer/composer-window.vala:774
+#: ../src/client/composer/composer-widget.vala:938
 msgid "Send message with an empty body?"
 msgstr "Να αποσταλεί το μήνυμα με κενό περιεχόμενο;"
 
-#: ../src/client/composer/composer-window.vala:776
+#: ../src/client/composer/composer-widget.vala:940
 msgid "Send message without an attachment?"
 msgstr "Να αποσταλεί το μήνυμα χωρίς συνημμένο;"
 
-#: ../src/client/composer/composer-window.vala:967
+#: ../src/client/composer/composer-widget.vala:1123
 msgid "Cannot add attachment"
 msgstr "Δεν είναι δυνατή η προσθήκη συνημμένου"
 
-#: ../src/client/composer/composer-window.vala:978
+#: ../src/client/composer/composer-widget.vala:1134
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "Το \"%s\" δεν ήταν δυνατό να βρεθεί."
 
-#: ../src/client/composer/composer-window.vala:985
+#: ../src/client/composer/composer-widget.vala:1141
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "Το \"%s\" είναι ένας φάκελος."
 
-#: ../src/client/composer/composer-window.vala:992
+#: ../src/client/composer/composer-widget.vala:1148
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "Το \"%s\" είναι ένα άδειο αρχείο."
 
-#: ../src/client/composer/composer-window.vala:1006
+#: ../src/client/composer/composer-widget.vala:1162
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "Το \"%s\" δεν ήταν δυνατό να ανοιχτεί για ανάγνωση."
 
-#: ../src/client/composer/composer-window.vala:1013
+#: ../src/client/composer/composer-widget.vala:1169
 #, c-format
 msgid "\"%s\" already attached for delivery."
 msgstr "Το αρχείο \"%s\" έχει ήδη επισυναφθεί για παράδοση."
 
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-window.vala:1022
+#: ../src/client/composer/composer-widget.vala:1178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-window.vala:1284
+#: ../src/client/composer/composer-widget.vala:1454
 msgid "Select Color"
 msgstr "Επιλογή χρώματος"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: ../src/client/composer/composer-window.vala:1679
+#: ../src/client/composer/composer-widget.vala:1900
 msgid "_From:"
 msgstr "_Από:"
 
@@ -812,178 +821,188 @@
 #. Composer label (without mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
 #. Geary account mail will be sent from
-#: ../src/client/composer/composer-window.vala:1695
-#: ../src/client/conversation-viewer/conversation-viewer.vala:628
-#: ../ui/composer.glade.h:41
+#: ../src/client/composer/composer-widget.vala:1916
+#: ../src/client/conversation-viewer/conversation-viewer.vala:635
+#: ../ui/composer.glade.h:42
 msgid "From:"
 msgstr "Από:"
 
+#. Copyright 2011-2014 Yorba Foundation
+#. *
+#. * This software is licensed under the GNU Lesser General Public License
+#. * (version 2.1 or later).  See the COPYING file in this distribution.
+#.
+#. Window for sending messages.
+#: ../src/client/composer/composer-window.vala:10
+msgid "New Message"
+msgstr "Νέο μήνυμα"
+
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Εγώ"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:255
+#: ../src/client/conversation-viewer/conversation-viewer.vala:260
 msgid "No conversations selected."
 msgstr "Δεν επιλέχθηκαν συνομιλίες."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:257
+#: ../src/client/conversation-viewer/conversation-viewer.vala:262
 #, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u συνομιλία επιλέχθηκε."
 msgstr[1] "%u συνομιλίες επιλέχθηκαν."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:286
+#: ../src/client/conversation-viewer/conversation-viewer.vala:291
 msgid "No search results found."
 msgstr "Δεν υπάρχουν ευρήματα."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:288
+#: ../src/client/conversation-viewer/conversation-viewer.vala:293
 msgid "No conversations in folder."
 msgstr "Δεν υπάρχουν συνομιλίες στον φάκελο."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:534
 msgid "This message contains remote images."
 msgstr "Αυτό το μήνυμα περιέχει απομακρυσμένες εικόνες."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:534
 msgid "Show Images"
 msgstr "Προβολή εικόνων"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:528
+#: ../src/client/conversation-viewer/conversation-viewer.vala:535
 msgid "Always Show From Sender"
 msgstr "Να εμφανίζεται πάντοτε ο αποστολέας"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:552
+#: ../src/client/conversation-viewer/conversation-viewer.vala:559
 msgid "Edit Draft"
 msgstr "Επεξεργασία πρόχειρου μηνύματος"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:631
+#: ../src/client/conversation-viewer/conversation-viewer.vala:638
 msgid "To:"
 msgstr "Προς:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
+#: ../src/client/conversation-viewer/conversation-viewer.vala:641
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
+#: ../src/client/conversation-viewer/conversation-viewer.vala:644
 msgid "Bcc:"
 msgstr "Κρυφή κοιν.:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
+#: ../src/client/conversation-viewer/conversation-viewer.vala:647
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
+#: ../src/client/conversation-viewer/conversation-viewer.vala:650
 msgid "Date:"
 msgstr "Ημερομηνία:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:850
+#: ../src/client/conversation-viewer/conversation-viewer.vala:857
 #, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u αναγνωσμένο μήνυμα"
 msgstr[1] "%u αναγνωσμένα μηνύματα"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:982
+#: ../src/client/conversation-viewer/conversation-viewer.vala:989
 #, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 "Αυτό το μήνυμα στάλθηκε με επιτυχία, αλλά δεν μπόρεσε να αποθηκευτεί στο %s."
 
 #. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1008
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1015
 #: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Αντιγραφή"
 
 #. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1016
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1023
 msgid "Copy _Email Address"
 msgstr "Αντιγραφή _διεύθυνσης ηλεκτρονικού ταχυδρομείου"
 
 #. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1021
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1028
 #: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Αντιγραφή _σύνδεσης"
 
 #. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1029
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1036
 msgid "Select _Message"
 msgstr "Επιλογή _μηνύματος"
 
 #. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1048
 msgid "_Inspect"
 msgstr "_Επιθεώρηση"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1267
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1274
 msgid "This link appears to go to"
 msgstr "Αυτός ο σύνδεσμος φαίνεται να πηγαίνει στο"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1268
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1275
 msgid "but actually goes to"
 msgstr "στην πραγματικότητα όμως πάει στο"
 
 #. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1323
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid " (Invalid?)"
 msgstr " (Άκυρο;)"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1515
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1522
 msgid "_Save As..."
 msgstr "_Αποθήκευση ως..."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1520
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1527
 msgid "Save All A_ttachments..."
 msgstr "Αποθή_κευση όλων των συνημμένων..."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1534
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1541
 msgid "_Save Image As..."
 msgstr "Αποθήκευ_ση εικόνας ως..."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1564
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Αποθή_κευση συνημμένου..."
 msgstr[1] "Αποθή_κευση όλων των συνημμένων..."
 
 #. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1572
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1579
 msgid "Reply to _All"
 msgstr "Απάντηση σε ό_λους"
 
 #. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1596
 msgid "_Mark as Read"
 msgstr "_Σήμανση ως αναγνωσμένα"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1600
 msgid "_Mark as Unread"
 msgstr "_Σήμανση ως μη αναγνωσμένα"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1599
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1606
 msgid "Mark Unread From _Here"
 msgstr "Σημειώστε αδιάβαστα από ε_δώ"
 
 #. Separator.
 #. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1614
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1621
 msgid "_View Source"
 msgstr "_Προβολή προέλευσης"
 
 #. Generate the attachment table.
 #. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1908
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1915
 #: ../src/engine/rfc822/rfc822-utils.vala:327
 msgid "none"
 msgstr "Κανένα"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2038
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2045
 msgid "Failed to open default text editor."
 msgstr "Απέτυχε να ανοίξετε το προεπιλεγμένο πρόγραμμα επεξεργασίας κειμένου."
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:296
+#: ../src/client/conversation-viewer/conversation-web-view.vala:313
 #, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Επόπτης συνομιλίας"
@@ -1005,7 +1024,7 @@
 "Παρακαλούμε πληκτρολογήστε τον κωδικό πρόσβασης ηλεκτρονικού ταχυδρομείου σας"
 
 #. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:30
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1013,7 +1032,7 @@
 msgstr[1] "%d μηνύματα"
 
 #. / Label displaying number of unread email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:37
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1023,7 +1042,7 @@
 #. / This string represents the divider between two messages: "n messages" and "n unread",
 #. / shown in the folder list as a tooltip.  Please use your languages conventions for
 #. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../src/client/folder-list/folder-list-folder-entry.vala:43
+#: ../src/client/folder-list/folder-list-folder-entry.vala:45
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -1158,7 +1177,7 @@
 msgstr "%A"
 
 #: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:742
+#: ../src/engine/rfc822/rfc822-message.vala:741
 msgid "(no subject)"
 msgstr "(χωρίς θέμα)"
 
@@ -1553,44 +1572,53 @@
 msgid "Fixed Width"
 msgstr "Σταθερό πλάτος"
 
+#: ../ui/composer.glade.h:35
+msgid "Edit recipients"
+msgstr "Επεξεργασία παραληπτών"
+
 #. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:36
+#: ../ui/composer.glade.h:37
 msgid "_To:"
 msgstr "Πρ_ος:"
 
-#: ../ui/composer.glade.h:37
+#: ../ui/composer.glade.h:38
 msgid "_Cc:"
 msgstr "_Κοινοποίηση:"
 
-#: ../ui/composer.glade.h:38
+#: ../ui/composer.glade.h:39
 msgid "_Subject:"
 msgstr "_Θέμα:"
 
-#: ../ui/composer.glade.h:39
+#: ../ui/composer.glade.h:40
 msgid "_Bcc:"
 msgstr "Κρ_υφή κοιν.:"
 
-#: ../ui/composer.glade.h:42
+#: ../ui/composer.glade.h:43
 msgid "Drop files here"
 msgstr "Αφήστε τα αρχεία εδώ"
 
-#: ../ui/composer.glade.h:43
+#: ../ui/composer.glade.h:44
 msgid "To add them as attachments"
 msgstr "Για να τα προσθέσετε ως συνημμένα"
 
-#: ../ui/composer.glade.h:44
+#: ../ui/composer.glade.h:45
 msgid "_Attach File"
 msgstr "_Επισύναψη αρχείου"
 
-#: ../ui/composer.glade.h:45
+#: ../ui/composer.glade.h:46
 msgid "_Include Original Attachments"
 msgstr "Να _συμπεριλαμβάνονται τα αρχικά συνημμένα"
 
-#: ../ui/composer.glade.h:46
+#: ../ui/composer.glade.h:47
 msgid "C_lose"
 msgstr "Κ_λείσιμο"
 
-#: ../ui/composer.glade.h:47
+#: ../ui/composer.glade.h:48
+#| msgid "_Attach"
+msgid "Detach"
+msgstr "Απόσπαση"
+
+#: ../ui/composer.glade.h:49
 msgid "_Send"
 msgstr "Α_ποστολή"
 
@@ -1619,24 +1647,29 @@
 msgstr "Κωδικός πρόσβασης"
 
 #: ../ui/login.glade.h:2
-msgid "E_mail address:"
-msgstr "Διεύθυνση ηλεκτρονικού _ταχυδρομίου:"
+#| msgid "E_mail address:"
+msgid "E_mail address"
+msgstr "Διεύθυνση ηλεκτρονικού _ταχυδρομίου"
 
 #: ../ui/login.glade.h:3
-msgid "_Password:"
-msgstr "_Κωδικός πρόσβασης:"
+#| msgid "_Password:"
+msgid "_Password"
+msgstr "_Κωδικός πρόσβασης"
 
 #: ../ui/login.glade.h:4
-msgid "S_ervice:"
-msgstr "_Υπηρεσία:"
+#| msgid "S_ervice:"
+msgid "S_ervice"
+msgstr "_Υπηρεσία"
 
 #: ../ui/login.glade.h:5
-msgid "N_ame:"
-msgstr "Όν_ομα:"
+#| msgid "N_ame:"
+msgid "N_ame"
+msgstr "Όν_ομα"
 
 #: ../ui/login.glade.h:7
-msgid "N_ickname:"
-msgstr "_Ψευδώνυμο:"
+#| msgid "N_ickname:"
+msgid "N_ickname"
+msgstr "_Ψευδώνυμο"
 
 #: ../ui/login.glade.h:8
 msgid "Work, Home, etc."
@@ -1651,32 +1684,38 @@
 msgstr "Ρυθμίσεις IMAP"
 
 #: ../ui/login.glade.h:11
-msgid "Se_rver:"
-msgstr "Δ_ιακομιστής:"
+#| msgid "Se_rver:"
+msgid "Se_rver"
+msgstr "Δ_ιακομιστής"
 
 #: ../ui/login.glade.h:12
-msgid "P_ort:"
-msgstr "_Θύρα:"
+#| msgid "P_ort:"
+msgid "P_ort"
+msgstr "_Θύρα"
 
 #: ../ui/login.glade.h:13
-msgid "Ser_ver:"
-msgstr "Δ_ιακομιστής:"
+#| msgid "Ser_ver:"
+msgid "Ser_ver"
+msgstr "Δ_ιακομιστής"
 
 #: ../ui/login.glade.h:14
-msgid "Por_t:"
-msgstr "Θύ_ρα:"
+#| msgid "Por_t:"
+msgid "Por_t"
+msgstr "Θύ_ρα"
 
 #: ../ui/login.glade.h:15
 msgid "SMTP settings"
 msgstr "Ρυθμίσεις SMTP"
 
 #: ../ui/login.glade.h:16
-msgid "User_name:"
-msgstr "Όνομα_χρήστη:"
+#| msgid "User_name:"
+msgid "User_name"
+msgstr "Όνομα_χρήστη"
 
 #: ../ui/login.glade.h:17
-msgid "Pass_word:"
-msgstr "Κ_ωδικός πρόσβασης:"
+#| msgid "Pass_word:"
+msgid "Pass_word"
+msgstr "Κ_ωδικός πρόσβασης"
 
 #: ../ui/login.glade.h:18
 msgid "SMTP username"
@@ -1687,8 +1726,9 @@
 msgstr "Κωδικός πρόσβασης SMTP"
 
 #: ../ui/login.glade.h:20
-msgid "_Username:"
-msgstr "Ό_νομα χρήστη:"
+#| msgid "_Username:"
+msgid "_Username"
+msgstr "Ό_νομα χρήστη"
 
 #: ../ui/login.glade.h:21
 msgid "IMAP username"
@@ -1699,12 +1739,14 @@
 msgstr "Κωδικός πρόσβασης IMAP"
 
 #: ../ui/login.glade.h:23
-msgid "Encr_yption:"
-msgstr "Κρυπ_τογράφηση:"
+#| msgid "Encr_yption:"
+msgid "Encr_yption"
+msgstr "Κρυπ_τογράφηση"
 
 #: ../ui/login.glade.h:24
-msgid "Encrypt_ion:"
-msgstr "Κρυπτογράφ_ηση:"
+#| msgid "Encrypt_ion:"
+msgid "Encrypt_ion"
+msgstr "Κρυπτογράφ_ηση"
 
 #: ../ui/login.glade.h:26
 msgid "SSL/TLS"
@@ -1727,8 +1769,21 @@
 msgstr "Αποθήκευση"
 
 #: ../ui/login.glade.h:31
-msgid "_Download mail:"
-msgstr "_Λήψη αλληλογραφίας:"
+#| msgid "_Download mail:"
+msgid "_Download mail"
+msgstr "_Λήψη αλληλογραφίας"
+
+#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
+msgid "Composer"
+msgstr "Συνθέτης"
+
+#: ../ui/login.glade.h:33
+msgid "Save dra_fts on server"
+msgstr "Αποθήκευση πρόχειρων στον διακομιστή"
+
+#: ../ui/login.glade.h:34
+msgid "Si_gn emails:"
+msgstr "Υπο_γραφή μηνυμάτων αλληλογραφίας:"
 
 #: ../ui/password-dialog.glade.h:1
 msgid "SMTP Credentials"
@@ -1746,35 +1801,36 @@
 msgid "_Remember password"
 msgstr "Α_πομνημόνευση κωδικού πρόσβασης"
 
-#: ../ui/preferences.glade.h:2
+#: ../ui/preferences.glade.h:1
+#| msgid "_Preferences"
+msgid "Preferences"
+msgstr "Προτιμήσεις"
+
+#: ../ui/preferences.glade.h:3
 msgid "Reading"
 msgstr "Aνάγνωση"
 
-#: ../ui/preferences.glade.h:3
+#: ../ui/preferences.glade.h:4
 msgid "_Automatically select next message"
 msgstr "_Αυτόματη επιλογή επόμενου μηνύματας"
 
-#: ../ui/preferences.glade.h:4
+#: ../ui/preferences.glade.h:5
 msgid "_Display conversation preview"
 msgstr "Να ε_μφανίζεται η προεπισκόπηση συνομιλίας"
 
-#: ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Συνθέτης"
-
-#: ../ui/preferences.glade.h:6
+#: ../ui/preferences.glade.h:7
 msgid "Enable _spell checking"
 msgstr "Ενεργοποίηση _ορθογράφου"
 
-#: ../ui/preferences.glade.h:7
+#: ../ui/preferences.glade.h:8
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"
 
-#: ../ui/preferences.glade.h:8
+#: ../ui/preferences.glade.h:9
 msgid "_Play notification sounds"
 msgstr "Α_ναπαραγωγή ήχων ειδοποίησης"
 
-#: ../ui/preferences.glade.h:9
+#: ../ui/preferences.glade.h:10
 msgid "Show _notifications for new mail"
 msgstr "Εμφάνιση ειδοποιήσεων για _νέα μηνύματα"
 

=== modified file 'po/es.po'
--- po/es.po	2014-07-26 10:08:43 +0000
+++ po/es.po	2014-10-02 03:11:35 +0000
@@ -17,35 +17,35 @@
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-05 02:09+0000\n"
-"PO-Revision-Date: 2014-03-05 14:11+0100\n"
+"POT-Creation-Date: 2014-09-01 17:00+0000\n"
+"PO-Revision-Date: 2014-09-03 12:44+0200\n"
 "Last-Translator: Daniel Mustieles <[e-mail]>\n"
-"Language-Team: Español <[e-mail]>\n"
+"Language-Team: Español; Castellano <[e-mail]>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: ../desktop/geary.desktop.in.h:1
+#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
 msgid "Geary"
 msgstr "Geary"
 
-#: ../desktop/geary.desktop.in.h:2
+#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
 #: ../src/client/application/geary-application.vala:18
 msgid "Mail Client"
 msgstr "Cliente de correo"
 
-#: ../desktop/geary.desktop.in.h:3
+#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
 msgid "Geary Mail"
 msgstr "Correo Geary"
 
-#: ../desktop/geary.desktop.in.h:4
+#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
 msgid "Send and receive email"
 msgstr "Envíe y reciba correos electrónicos"
 
-#: ../desktop/geary.desktop.in.h:5
+#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
 msgid "Email;E-mail;Mail;"
 msgstr "email;e-mail;correo electrónico;correo-e;"
 
@@ -79,89 +79,89 @@
 msgid "First Last"
 msgstr "Nombre Apellido"
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Welcome to Geary."
 msgstr "Bienvenido a Geary."
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Enter your account information to get started."
-msgstr "Introduzca la información de su cuenta para empezar. "
+msgstr "Proporcione la información de su cuenta para empezar."
 
-#: ../src/client/accounts/add-edit-page.vala:223
+#: ../src/client/accounts/add-edit-page.vala:247
 msgid "2 weeks back"
 msgstr "hace 2 semanas"
 
 #. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:224
+#: ../src/client/accounts/add-edit-page.vala:248
 msgid "1 month back"
 msgstr "hace 1 mes"
 
-#: ../src/client/accounts/add-edit-page.vala:225
+#: ../src/client/accounts/add-edit-page.vala:249
 msgid "3 months back"
 msgstr "hace 3 meses"
 
-#: ../src/client/accounts/add-edit-page.vala:226
+#: ../src/client/accounts/add-edit-page.vala:250
 msgid "6 months back"
 msgstr "hace 6 meses"
 
-#: ../src/client/accounts/add-edit-page.vala:227
+#: ../src/client/accounts/add-edit-page.vala:251
 msgid "1 year back"
 msgstr "hace 1 año"
 
-#: ../src/client/accounts/add-edit-page.vala:228
+#: ../src/client/accounts/add-edit-page.vala:252
 msgid "2 years back"
 msgstr "hace 2 años"
 
-#: ../src/client/accounts/add-edit-page.vala:229
+#: ../src/client/accounts/add-edit-page.vala:253
 msgid "4 years back"
 msgstr "hace 4 años"
 
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:231
+#: ../src/client/accounts/add-edit-page.vala:255
 msgid "Everything"
 msgstr "Todo"
 
-#: ../src/client/accounts/add-edit-page.vala:630
+#: ../src/client/accounts/add-edit-page.vala:686
 msgid "Remem_ber passwords"
 msgstr "Recor_dar las contraseñas"
 
-#: ../src/client/accounts/add-edit-page.vala:637 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "Recor_dar la contraseña"
 
-#: ../src/client/accounts/add-edit-page.vala:671
+#: ../src/client/accounts/add-edit-page.vala:727
 msgid "Unable to validate:\n"
 msgstr "No se puede validar:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:673
+#: ../src/client/accounts/add-edit-page.vala:729
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Alias de cuenta no válido.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:676
+#: ../src/client/accounts/add-edit-page.vala:732
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr "        &#8226; Ya se había añadido la dirección de correo a Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:680
+#: ../src/client/accounts/add-edit-page.vala:736
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; Error de conexión IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:683
+#: ../src/client/accounts/add-edit-page.vala:739
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; Nombre de usuario o contraseña IMAP incorrectos.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:686
+#: ../src/client/accounts/add-edit-page.vala:742
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; Error de conexión SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:689
+#: ../src/client/accounts/add-edit-page.vala:745
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; El nombre de usuario o contraseña SMTP incorrectos.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:693
+#: ../src/client/accounts/add-edit-page.vala:749
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Error de conexión.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:697
+#: ../src/client/accounts/add-edit-page.vala:753
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Nombre de usuario o contraseña incorrectos.\n"
 
@@ -174,242 +174,256 @@
 msgstr "Visite el sitio web de Yorba"
 
 #: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Iniciar Geary con la ventana principal oculta"
+
+#: ../src/client/application/geary-args.vala:11
 msgid "Output debugging information"
 msgstr "Salida de información de depuración"
 
-#: ../src/client/application/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "Registrar la monitorización de conversaciones"
 
-#: ../src/client/application/geary-args.vala:12
+#: ../src/client/application/geary-args.vala:13
 msgid "Log network deserialization"
 msgstr "Registrar la deserialización de red"
 
-#: ../src/client/application/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "Registrar la actividad de red"
 
 #. / The IMAP replay queue is how changes on the server are replicated on the client.
 #. / It could also be called the IMAP events queue.
-#: ../src/client/application/geary-args.vala:16
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "Registrar la cola de eventos IMAP"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../src/client/application/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "Registrar la serialización de red"
 
-#: ../src/client/application/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "Registrar la actividad periódica"
 
-#: ../src/client/application/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "Registrar las consultas a la base de datos (genera muchos mensajes)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Registrar la normalización de carpetas"
 
-#: ../src/client/application/geary-args.vala:24
+#: ../src/client/application/geary-args.vala:25
 msgid "Allow inspection of WebView"
 msgstr "Permitir la inspección de WebView"
 
-#: ../src/client/application/geary-args.vala:25
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Revocar todos los certificados de servidores con advertencias de TLS"
+
+#: ../src/client/application/geary-args.vala:27
 msgid "Display program version"
 msgstr "Mostrar la versión del programa"
 
 #. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:47
+#: ../src/client/application/geary-args.vala:51
 #, c-format
 msgid "Use %s to open a new composer window"
 msgstr "Usar %s para abrir una ventana nueva del editor"
 
-#: ../src/client/application/geary-args.vala:48
+#: ../src/client/application/geary-args.vala:52
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Envíe comentarios, sugerencias y errores a:"
 
 #. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:55
+#: ../src/client/application/geary-args.vala:59
 #, c-format
 msgid "Failed to parse command line options: %s\n"
 msgstr "Falló al analizar las opciones de la línea de comandos: %s\n"
 
-#: ../src/client/application/geary-args.vala:66
+#: ../src/client/application/geary-args.vala:70
 #, c-format
 msgid "Unrecognized command line option \"%s\"\n"
 msgstr "Opción de la línea de comandos «%s» no reconocida\n"
 
-#: ../src/client/application/geary-controller.vala:46
+#: ../src/client/application/geary-controller.vala:56
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../src/client/application/geary-controller.vala:47
+#: ../src/client/application/geary-controller.vala:57
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Eliminar conversación (Mayús+Supr)"
 
-#: ../src/client/application/geary-controller.vala:48
+#: ../src/client/application/geary-controller.vala:58
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Eliminar conversaciones (Mayús+Supr)"
 
-#: ../src/client/application/geary-controller.vala:51
+#. This refers to the action ("move email to the trash"), not the Trash folder itself
+#: ../src/client/application/geary-controller.vala:62
 msgid "_Trash"
 msgstr "_Papelera"
 
-#: ../src/client/application/geary-controller.vala:52
+#: ../src/client/application/geary-controller.vala:63
 msgid "Move conversation to trash (Delete, Backspace)"
 msgstr "Mover conversación a la papelera (Supr, Retroceso)"
 
-#: ../src/client/application/geary-controller.vala:53
+#: ../src/client/application/geary-controller.vala:64
 msgid "Move conversations to trash (Delete, Backspace)"
 msgstr "Mover conversaciones a la papelera (Supr, Retroceso)"
 
-#: ../src/client/application/geary-controller.vala:56
+#. This refers to the action ("archive an email"), not the Archive folder itself
+#: ../src/client/application/geary-controller.vala:68
 msgid "_Archive"
 msgstr "_Archivar"
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:69
 msgid "Archive conversation (A)"
 msgstr "Archivar conversación (A)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:70
 msgid "Archive conversations (A)"
 msgstr "Archivar conversaciones (A)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:73
 msgid "Mark as S_pam"
 msgstr "Marcar como _spam"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:74
 msgid "Mark as not S_pam"
 msgstr "Marcar como no _spam"
 
-#: ../src/client/application/geary-controller.vala:64
-#: ../src/client/application/geary-controller.vala:275
+#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:295
 msgid "Mark conversation"
 msgstr "Marcar conversación"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark conversations"
 msgstr "Marcar conversaciones"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:78
 msgid "Add label to conversation"
 msgstr "Añadir etiqueta a la conversación"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:79
 msgid "Add label to conversations"
 msgstr "Añadir etiqueta a las conversaciones"
 
-#: ../src/client/application/geary-controller.vala:68
-#: ../src/client/application/geary-controller.vala:314
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:334
 msgid "Move conversation"
 msgstr "Mover conversación"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:81
 msgid "Move conversations"
 msgstr "Mover conversaciones"
 
-#: ../src/client/application/geary-controller.vala:251
+#: ../src/client/application/geary-controller.vala:271
 msgid "A_ccounts"
 msgstr "_Cuentas"
 
-#: ../src/client/application/geary-controller.vala:256
+#: ../src/client/application/geary-controller.vala:276
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/client/application/geary-controller.vala:260
+#: ../src/client/application/geary-controller.vala:280
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../src/client/application/geary-controller.vala:264
+#: ../src/client/application/geary-controller.vala:284
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../src/client/application/geary-controller.vala:268
+#: ../src/client/application/geary-controller.vala:288
 msgid "_Donate"
 msgstr "_Donar"
 
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:292
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:297
 msgid "_Mark as..."
 msgstr "_Marcar como…"
 
-#: ../src/client/application/geary-controller.vala:283
+#: ../src/client/application/geary-controller.vala:303
 msgid "Mark as _Read"
 msgstr "Marcar como _leído"
 
-#: ../src/client/application/geary-controller.vala:289
+#: ../src/client/application/geary-controller.vala:309
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:315
 msgid "_Star"
 msgstr "_Destacar"
 
-#: ../src/client/application/geary-controller.vala:300
+#: ../src/client/application/geary-controller.vala:320
 msgid "U_nstar"
 msgstr "_No destacar"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:330
 msgid "Add label"
 msgstr "Añadir etiqueta"
 
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:331
 msgid "_Label"
 msgstr "_Etiquetar"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:335
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../src/client/application/geary-controller.vala:319
+#: ../src/client/application/geary-controller.vala:339
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Redactar un mensaje nuevo (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:323
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1567
+#: ../src/client/application/geary-controller.vala:343
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1579
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:344
 msgid "Reply (Ctrl+R, R)"
 msgstr "Responder (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:328
+#: ../src/client/application/geary-controller.vala:348
 msgid "R_eply All"
 msgstr "R_esponder a todos"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:349
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Responder a todos (Ctrl+Mayús+R, Mayús+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:334
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1577
+#: ../src/client/application/geary-controller.vala:354
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:355
 msgid "Forward (Ctrl+L, F)"
 msgstr "Reenviar (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:618
+#: ../src/client/application/geary-controller.vala:623
+msgid "Unable to store server trust exception"
+msgstr "No se pudo almacenar la excepción de seguridad para el servidor"
+
+#: ../src/client/application/geary-controller.vala:860
 msgid "Your settings are insecure"
 msgstr "Su configuración no es segura"
 
-#: ../src/client/application/geary-controller.vala:619
+#: ../src/client/application/geary-controller.vala:861
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -419,17 +433,17 @@
 "otra persona podría leer su nombre de usuario y contraseña en la misma red. "
 "¿Está seguro de que quiere hacer esto?"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:862
 msgid "Co_ntinue"
 msgstr "Co_ntinuar"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:698
+#: ../src/client/application/geary-controller.vala:940
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Error al enviar el mensaje"
 
-#: ../src/client/application/geary-controller.vala:699
+#: ../src/client/application/geary-controller.vala:941
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -439,12 +453,12 @@
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:703
+#: ../src/client/application/geary-controller.vala:945
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Error al guardar los mensajes enviados"
 
-#: ../src/client/application/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:946
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -452,19 +466,19 @@
 "Geary encontró un error al guardar un mensaje enviado en Enviados. El "
 "mensaje permanecerá en la Bandeja de salida hasta que lo elimine."
 
-#: ../src/client/application/geary-controller.vala:773
+#: ../src/client/application/geary-controller.vala:1015
 msgid "Labels"
 msgstr "Etiquetas"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:785
+#: ../src/client/application/geary-controller.vala:1027
 #, c-format
 msgid "Unable to open the database for %s"
-msgstr "No fue posible abrir la base de datos local para %s"
+msgstr "No se pudo abrir la base de datos local para %s"
 
-#: ../src/client/application/geary-controller.vala:786
+#: ../src/client/application/geary-controller.vala:1028
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -489,20 +503,20 @@
 "Reconstruir la base de datos destruirá todo el correo guardado de forma "
 "local y sus adjuntos. <b>El correo del servidor permanecerá intacto.</b>"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1030
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1030
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ../src/client/application/geary-controller.vala:797
+#: ../src/client/application/geary-controller.vala:1039
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "No se puede reconstruir la base de datos para «%s»"
 
-#: ../src/client/application/geary-controller.vala:798
+#: ../src/client/application/geary-controller.vala:1040
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -515,14 +529,14 @@
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:820
-#: ../src/client/application/geary-controller.vala:830
-#: ../src/client/application/geary-controller.vala:841
+#: ../src/client/application/geary-controller.vala:1062
+#: ../src/client/application/geary-controller.vala:1072
+#: ../src/client/application/geary-controller.vala:1083
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "No se puede abrir el buzón local para %s"
 
-#: ../src/client/application/geary-controller.vala:821
+#: ../src/client/application/geary-controller.vala:1063
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -541,7 +555,7 @@
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:831
+#: ../src/client/application/geary-controller.vala:1073
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
@@ -555,7 +569,7 @@
 "\n"
 "Instale la última versión de Geary e inténtelo de nuevo."
 
-#: ../src/client/application/geary-controller.vala:842
+#: ../src/client/application/geary-controller.vala:1084
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -567,26 +581,26 @@
 "\n"
 "Revise su conexión de red y reinicie Geary."
 
-#: ../src/client/application/geary-controller.vala:1335
+#: ../src/client/application/geary-controller.vala:1591
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <[e-mail]>
-#: ../src/client/application/geary-controller.vala:1338
+#: ../src/client/application/geary-controller.vala:1594
 msgid "translator-credits"
 msgstr ""
 "Daniel Mustieles <[e-mail]>, 2014\n"
-"Adolfo Jayme Barrientos <[e-mail]>, 2012, 2014\n"
+"Adolfo Jayme Barrientos <[e-mail]>, 2012, 2014\n"
 "aldomann, pakitochuz, rcares a través de Transifex"
 
-#: ../src/client/application/geary-controller.vala:1595
+#: ../src/client/application/geary-controller.vala:1858
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "¿Está seguro de que quiere abrir «%s»?"
 
-#: ../src/client/application/geary-controller.vala:1596
+#: ../src/client/application/geary-controller.vala:1859
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -594,32 +608,38 @@
 "Los archivos adjuntos podrían causar daños a su sistema. Abra solo los "
 "archivos que provengan de fuentes fiables."
 
-#: ../src/client/application/geary-controller.vala:1597
+#: ../src/client/application/geary-controller.vala:1860
 msgid "Don't _ask me again"
 msgstr "No volver a _preguntarme"
 
-#: ../src/client/application/geary-controller.vala:1615
+#: ../src/client/application/geary-controller.vala:1878
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
 
-#: ../src/client/application/geary-controller.vala:1617
+#: ../src/client/application/geary-controller.vala:1880
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "El archivo ya existe en «%s». Reemplazarlo sobrescribirá su contenido."
 
-#: ../src/client/application/geary-controller.vala:1620
+#: ../src/client/application/geary-controller.vala:1883
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: ../src/client/application/geary-controller.vala:1922
+#. Find out what to do with the inline composers.
+#. TODO: Remove this in favor of automatically saving drafts
+#: ../src/client/application/geary-controller.vala:2150
+msgid "Close open draft messages?"
+msgstr "¿Quiere cerrar los mensajes en borrador abiertos?"
+
+#: ../src/client/application/geary-controller.vala:2259
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "¿Quiere eliminar permanentemente este mensaje?"