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

[Nathan Dyer]

This branch includes the latest version of Geary and has been backported to work better in elementary OS Freya. It now has all the correct icon names and sizes, a unified headerbar (instead of the split headerbar in the main verion), a search entry in the headerbar (instead of the new search bar), and a reasonable undo button. The conversation list has also been modified to display the correct background, foreground, selected_bg, and selected_fg colors (originally they were either transparent or light grey due to the way Geary draws its own widgets here).

[Rico Tzschichholz (ricotz)]

Pushed a cleaned version including this patch-set to https://launchpad.net/~elementary-os/+archive/ubuntu/testing/+packages?field.name_filter=geary&field.status_filter=published&field.series_filter=

 application/geary-controller.vala | 6
 components/main-toolbar.vala | 353 ++++++++++-----------
 components/main-window.vala | 10
 components/pill-toolbar.vala | 22 -
 composer/composer-box.vala | 5
 composer/composer-toolbar.vala | 18 -
 conversation-list/formatted-conversation-data.vala | 9
 folder-list/folder-list-folder-entry.vala | 18 -
 util/util-gtk.vala | 6
 9 files changed, 216 insertions(+), 231 deletions(-)

 31,4kB

compared to

 application/geary-controller.vala | 984 ++++++++---------
 components/main-toolbar.vala | 362 +++---
 components/main-window.vala | 138 +-
 components/pill-toolbar.vala | 69 -
 composer/composer-box.vala | 40
 composer/composer-toolbar.vala | 37
 conversation-list/conversation-list-cell-renderer.vala | 22
 conversation-list/conversation-list-view.vala | 201 +--
 conversation-list/formatted-conversation-data.vala | 148 +-
 folder-list/folder-list-folder-entry.vala | 76 -
 util/util-gtk.vala | 20
 11 files changed, 1039 insertions(+), 1058 deletions(-)

 204,4kB

Unmerged revisions

28. By Nathan Dyer <email address hidden> on 2015-07-10

All sidebar icons are now non-symbolic.

27. By Nathan Dyer <email address hidden> on 2015-07-10

Modified the search monitor that is called when search is unavailable due to indexing.

26. By Nathan Dyer <email address hidden> on 2015-07-10

Changed the hideous sidebar spam icon.

25. By Nathan Dyer <email address hidden> on 2015-07-10

Restored the new undo functionality and restored setting the title and subtitle based on the account selected.

24. By Nathan Dyer <email address hidden> on 2015-07-10

Connect the new search bar up to all the necessary signals.

23. By Nathan Dyer <email address hidden> on 2015-07-10

Make the conversation list view look more native.

22. By Nathan Dyer <email address hidden> on 2015-07-10

Fixed the compose window icons.

21. By Nathan Dyer <email address hidden> on 2015-07-10

Fixed the toolbar icons and removed some of the now-unnecessary code.

20. By Nathan Dyer <email address hidden> on 2015-07-10

Back to a single headerbar and a search entry in the toolbar.

19. By Nathan Dyer <email address hidden> on 2015-07-10

Initial update to 0.10.0

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-12-29 05:40:07 +0000
+++ CMakeLists.txt	2015-07-10 22:31:23 +0000
@@ -1,5 +1,5 @@
 # Geary build script
-# Copyright 2011-2014 Yorba Foundation
+# Copyright 2011-2015 Yorba Foundation
 #
 # Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
 
@@ -15,7 +15,7 @@
 #
 set(GETTEXT_PACKAGE "geary")
 set(RELEASE_NAME "Lightweight email client for GNOME.")
-set(VERSION "0.8.3")
+set(VERSION "0.10.0")
 set(VERSION_INFO "Release")
 set(LANGUAGE_SUPPORT_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/locale)
 

=== modified file 'COPYING.icons'
--- COPYING.icons	2014-12-29 05:40:07 +0000
+++ COPYING.icons	2015-07-10 22:31:23 +0000
@@ -7,9 +7,9 @@
     http://thenounproject.com/noun/star/#icon-No15362
     http://thenounproject.com/noun/star/#icon-No15361
 
-reply-symbolic.svg
-reply-all-symbolic.svg (derivative)
-forward-symbolic.svg (derivative)
+mail-reply-sender-symbolic.svg
+mail-reply-all-symbolic.svg (derivative)
+mail-forward-symbolic.svg (derivative)
     Back designed by Anisha Varghese from The Noun Project
     http://thenounproject.com/noun/back/#icon-No14792
 
@@ -17,16 +17,16 @@
     Marker designed by factor[e] design initiative from The Noun Project
     http://thenounproject.com/noun/marker/#icon-No18908
 
-inbox-symbolic.svg
-outbox-symbolic.svg (derivative)
+mail-inbox-symbolic.svg
+mail-outbox-symbolic.svg (derivative)
     Inbox designed by Edward Boatman from The Noun Project
     http://thenounproject.com/noun/inbox/#icon-No406
 
-document-symbolic.svg
+text-x-generic-symbolic.svg
     Document designed by Edward Boatman from The Noun Project
     http://thenounproject.com/noun/document/#icon-No453
 
-spam-symbolic.svg
+mail-spam-symbolic.svg
     Pig designed by aLf from The Noun Project
     http://thenounproject.com/noun/pig/#icon-No5271
 
@@ -34,9 +34,9 @@
     Close designed by Icomatic from The Noun Project
     http://thenounproject.com/noun/close/#icon-No18932
 
-archive-symbolic.svg
+mail-archive-symbolic.svg
 format-text-remove-symbolic.svg
-sent-symbolic.svg
+mail-sent-symbolic.svg
     Designed for Geary by Sam Hewitt, 2013
 
 

=== modified file 'INSTALL'
--- INSTALL	2014-12-29 05:40:07 +0000
+++ INSTALL	2015-07-10 22:31:23 +0000
@@ -123,4 +123,4 @@
         $ sudo make uninstall
 
 
-    Copyright 2012-2014 Yorba Foundation
+    Copyright 2012-2015 Yorba Foundation

=== modified file 'NEWS'
--- NEWS	2014-12-29 05:40:07 +0000
+++ NEWS	2015-07-10 22:31:23 +0000
@@ -1,3 +1,46 @@
+Geary 0.10.0 - 30 March 2015
+----------------------------
+
+  * Undo Archive/Trash/Move of email (#721828)
+  * New split headerbar layout with UI, composer improvements (#743960)
+  * Preference to switch between 2-column and 3-column layout (#714793)
+  * Support multiple ("alternate") email addresses per account (#714922)
+  * New shortcut keys to navigate next/previous conversation (#714434)
+  * Fix displaying inline images referenced by Content-ID (#743676)
+  * Numerous bug fixes, optimizations, improvements
+  * Updated translations
+
+
+Geary 0.9.1 - 2 February 2015
+-----------------------------
+
+  * Support HTML signatures (#738895)
+  * Quote from multiple selections in reply (#738188)
+  * Restore reply/reply all/forward state of edited drafts (#743067)
+  * Quoted message portion may be easily removed in composer (#741609)
+  * True delete now supported in Gmail (#721790)
+  * Improved searching for terms w/ punctuation (#714863)
+  * Better management of draft messages to avoid orphans
+  * Empty Trash, Empty Spam (#714809, #725260)
+  * Better conversation construction (#714563)
+  * Improved IMAP connection reestablishment and retrying of remote operations
+  * Various bug fixes, optimizations, improvements
+  * Updated translations
+
+
+Geary 0.9.0 - 19 December 2014
+------------------------------
+
+  * Improved full-text search experience (#720361)
+  * Periodic database & attachments garbage collection (#714134)
+  * Remove minimum width for sidebar/folder list (#713882)
+  * Use GtkHeaderBar for dialogs (#741240)
+  * Can now specify Reply-To when composing (#714588)
+  * Fix signed int32 UID/UIDVALIDITY bug (#737642)
+  * Composer shortcuts now listed in online help (#741573)
+  * Updated translations
+
+
 Geary 0.8.3 - 19 December 2014
 ------------------------------
 
@@ -76,6 +119,17 @@
   * Database speed optimizations to reduce lags and improve read times
   * Improved connection retry
   * Various bug fixes
+
+Geary 0.6.5 - 4 November 2014
+-----------------------------
+
+  * Fixed help documentation installation of translated pages
+
+
+Geary 0.6.4 - 4 November 2014
+-----------------------------
+
+  * French documentation added
   * Updated translations
 
 

=== modified file 'README'
--- README	2014-12-29 05:40:07 +0000
+++ README	2015-07-10 22:31:23 +0000
@@ -35,5 +35,5 @@
 
 
 
-    Copyright 2012-2014 Yorba Foundation
+    Copyright 2012-2015 Yorba Foundation
 

=== modified file 'THANKS'
--- THANKS	2014-12-29 05:40:07 +0000
+++ THANKS	2015-07-10 22:31:23 +0000
@@ -25,10 +25,12 @@
 Simon Lipp <[e-mail]>
 Brendan Long <[e-mail]>
 Angelo Marchesin <[e-mail]>
+mar-v-in <[e-mail]>
 Kai Mast <[e-mail]>
 William Jon McCann <[e-mail]>
 Thomas Moschny <[e-mail]>
 Tom Most <[e-mail]>
+Georges Basile Stavracas Neto <[e-mail]>
 Philipp Nordhus <[e-mail]>
 Andreas Obergrusberger <[e-mail]>
 Martin Olsson <[e-mail]>
@@ -39,6 +41,7 @@
 Viko Adi Rahmawan <[e-mail]>
 Didier Roche <[e-mail]>
 Janosch Rolles <[e-mail]>
+Robert Roth <[e-mail]>
 Gustavo Rubio <[e-mail]>
 Michel Alexandre Salim <[e-mail]>
 Anirudh Sanjeev <[e-mail]>

=== modified file 'bindings/vapi/gmime-2.6/gmime-2.6-custom.vala'
--- bindings/vapi/gmime-2.6/gmime-2.6-custom.vala	2014-07-26 10:08:43 +0000
+++ bindings/vapi/gmime-2.6/gmime-2.6-custom.vala	2015-07-10 22:31:23 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 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.

=== modified file 'cmake/FindDesktopFileValidate.cmake'
--- cmake/FindDesktopFileValidate.cmake	2014-07-26 10:08:43 +0000
+++ cmake/FindDesktopFileValidate.cmake	2015-07-10 22:31:23 +0000
@@ -1,7 +1,7 @@
 # FindDesktopFileValidate.cmake
 #
 # Charles Lindsay <[e-mail]>
-# Copyright 2013-2014 Yorba Foundation
+# Copyright 2013-2015 Yorba Foundation
 
 find_program (DESKTOP_FILE_VALIDATE_EXECUTABLE desktop-file-validate)
 

=== modified file 'cmake/FindIntltool.cmake'
--- cmake/FindIntltool.cmake	2014-12-29 05:40:07 +0000
+++ cmake/FindIntltool.cmake	2015-07-10 22:31:23 +0000
@@ -1,7 +1,7 @@
 # FindIntltool.cmake
 #
 # Jim Nelson <[e-mail]>
-# Copyright 2012-2014 Yorba Foundation
+# Copyright 2012-2015 Yorba Foundation
 
 find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
 

=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2014-07-26 10:08:43 +0000
+++ cmake/ValaPrecompile.cmake	2015-07-10 22:31:23 +0000
@@ -170,7 +170,7 @@
     set(vapi_arguments "")
     if(ARGS_GENERATE_VAPI)
         list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi")
-        set(vapi_arguments "--internal-vapi=${ARGS_GENERATE_VAPI}.vapi")
+        set(vapi_arguments "--vapi=${ARGS_GENERATE_VAPI}.vapi")
         
         # Header and internal header is needed to generate internal vapi
         if(NOT ARGS_GENERATE_HEADER)

=== modified file 'configure'
--- configure	2014-12-29 05:40:07 +0000
+++ configure	2015-07-10 22:31:23 +0000
@@ -24,8 +24,6 @@
 	
 	  --disable-fatal-warnings
 	                        Disable Vala fatal warnings when compiling.
-	  --enable-unity
-	                        Enable Unity interface changes.
 	  --enable-ref-tracking
 	                        Enable reference tracking which is dumped to stdout when the program exits.
 	  --disable-schemas-compile
@@ -96,10 +94,6 @@
                             CMDLINE="${CMDLINE} -DREF_TRACKING=ON"
                             ;;
         
-        --enable-unity)
-                            CMDLINE="${CMDLINE} -DENABLE_UNITY=ON"
-                            ;;
-        
         --disable-schemas-compile)
                             CMDLINE="${CMDLINE} -DGSETTINGS_COMPILE=OFF"
                             CMDLINE="${CMDLINE} -DGSETTINGS_COMPILE_IN_PLACE=OFF"

=== modified file 'desktop/org.yorba.geary.gschema.xml'
--- desktop/org.yorba.geary.gschema.xml	2014-10-02 02:02:09 +0000
+++ desktop/org.yorba.geary.gschema.xml	2015-07-10 22:31:23 +0000
@@ -26,12 +26,36 @@
         <description>Position of the folder list Paned grabber.</description>
     </key>
     
+    <key name="folder-list-pane-position-horizontal" type="i">
+        <default>-1</default>
+        <summary>position of folder list pane when horizontal</summary>
+        <description>Position of the folder list Paned grabber in the horizontal orientation.</description>
+    </key>
+    
+    <key name="folder-list-pane-position-vertical" type="i">
+        <default>200</default>
+        <summary>position of folder list pane when vertical</summary>
+        <description>Position of the folder list Paned grabber in the vertical orientation.</description>
+    </key>
+    
+    <key name="folder-list-pane-horizontal" type="b">
+        <default>true</default>
+        <summary>orientation of the folder list pane</summary>
+        <description>True if the folder list Paned is in the horizontal orientation.</description>
+    </key>
+    
     <key name="messages-pane-position" type="i">
         <default>250</default>
         <summary>position of message list pane</summary>
         <description>Position of the message list Paned grabber.</description>
     </key>
     
+    <key name="composer-pane-position" type="i">
+        <default>350</default>
+        <summary>position of the composer pane</summary>
+        <description>Position of the composer Paned grabber, when open.</description>
+    </key>
+    
     <key name="autoselect" type="b">
         <default>true</default>
         <summary>autoselect next message</summary>
@@ -74,6 +98,13 @@
         <summary>whether to compose emails in HTML</summary>
         <description>True to compose emails in HTML; false for plain text.</description>
     </key>
+    
+    <key name="search-strategy" type="s">
+        <default>"conservative"</default>
+        <summary>Advisory strategy for full-text searching</summary>
+        <description>Acceptable values are EXACT, CONSERVATIVE, AGGRESSIVE, and HORIZON.</description>
+    </key>
+    
 </schema>
 
 </schemalist>

=== modified file 'help/C/accounts.page'
--- help/C/accounts.page	2014-07-26 10:08:43 +0000
+++ help/C/accounts.page	2015-07-10 22:31:23 +0000
@@ -42,6 +42,16 @@
 	For other accounts, if you disable this setting, you may be unable to view messages you've
 	sent.</p></item>
 	
+	<item><p>The <gui>Sign emails</gui> checkbox indicates whether a signature will be automatically
+	inserted when a composer is opened.  You may enter the signature into the box immediately
+	below.  You may use HTML tags to style the text.  Switch to a preview of the signature using the
+	buttons to the right.</p>
+	
+	<p>If you leave the signature in the Accounts dialog blank, Geary will use the
+	<file>.signature</file> file in your home directory, if it exists.  This file may contain either
+	plain text or HTML markup.  In the latter case, the markup will be inserted directly into the
+	composer, without any escaping.</p></item>
+	
 	<item><p>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.</p></item>

=== modified file 'help/C/shortcuts.page'
--- help/C/shortcuts.page	2014-07-26 10:08:43 +0000
+++ help/C/shortcuts.page	2015-07-10 22:31:23 +0000
@@ -56,6 +56,18 @@
   		<td><p> <keyseq><key>Ctrl</key><key>U</key></keyseq> or <keyseq><key>Shift</key><key>U</key></keyseq> </p></td>
   	</tr>
   	<tr>
+  	    <td><p>Move focus to conversation list</p></td>
+  		<td><p> <keyseq><key>Ctrl</key><key>B</key></keyseq> </p></td>
+  	</tr>
+  	<tr>
+  	    <td><p>Jump to next (older) conversation</p></td>
+  		<td><p> <keyseq><key>j</key></keyseq> </p></td>
+  	</tr>
+  	<tr>
+  	    <td><p>Jump to previous (newer) conversation</p></td>
+  		<td><p> <keyseq><key>k</key></keyseq> </p></td>
+  	</tr>
+  	<tr>
   	    <td><p>Toggle spam</p></td>
   		<td><p> <keyseq><key>Ctrl</key><key>J</key></keyseq> or <key>!</key> </p></td>
   	</tr>
@@ -104,5 +116,57 @@
   		<td><p> <keyseq><key>Ctrl</key><key>Shift</key><key>G</key></keyseq> </p></td>
   	</tr>
      </table>
+    
+    <section id="composer">
+        <title>Composer shortcuts</title>
+        <p>These shortcuts are active whenever focus is in a composer.</p>
+        <table frame="all" rules="rows">
+            <tr>
+                <td><p>Quote text</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>]</key></keyseq> </p></td>
+            </tr>
+            <tr>
+                <td><p>Unquote text</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>[</key></keyseq> </p></td>
+            </tr>
+            <tr>
+                <td><p>Close composer</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>W</key></keyseq> or <key>Esc</key> </p></td>
+            </tr>
+            <tr>
+                <td><p>Detach composer</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>D</key></keyseq> </p></td>
+            </tr>
+        </table>
+        
+        <p>These shortcuts are only active in composers in rich text mode.</p>
+        <table frame="all" rules="rows">
+            <tr>
+                <td><p>Bold text</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>B</key></keyseq> </p></td>
+            </tr>
+            <tr>
+                <td><p>Italicize text</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>I</key></keyseq> </p></td>
+            </tr>
+            <tr>
+                <td><p>Underline text</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>U</key></keyseq> </p></td>
+            </tr>
+            <tr>
+                <td><p>Strike text</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>K</key></keyseq> </p></td>
+            </tr>
+            <tr>
+                <td><p>Insert a link</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>L</key></keyseq> </p></td>
+            </tr>
+            <tr>
+                <td><p>Remove formatting</p></td>
+                <td><p> <keyseq><key>Ctrl</key><key>Space</key></keyseq> </p></td>
+            </tr>
+        </table>
+    </section>
+
 </page>
 

=== modified file 'help/C/write.page'
--- help/C/write.page	2014-07-26 10:08:43 +0000
+++ help/C/write.page	2015-07-10 22:31:23 +0000
@@ -32,6 +32,11 @@
 	either on the text fields at the top of the window or on the toolbar at the bottom.</p></item>
 	</list>
 	
+	<p>A number of keyboard shortcuts are available in the composer; see <link xref="shortcuts#composer"/> for details.</p>
+	
+	<p>You may specify a signature to be inserted into the composer in the <link xref="accounts" />
+	dialog.</p>
+	
 	</section>
 	<section>
 	<title>Drafts</title>

=== modified file 'help/cs/cs.po'
--- help/cs/cs.po	2014-12-29 05:40:07 +0000
+++ help/cs/cs.po	2015-07-10 22:31:23 +0000
@@ -1,15 +1,15 @@
 # Czech translation for geary.
 # Copyright (C) 2014 geary's COPYRIGHT HOLDER
 # This file is distributed under the same license as the geary package.
-# Marek Černocký <[e-mail]>, 2014.
+# Marek Černocký <[e-mail]>, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
-"POT-Creation-Date: 2014-08-26 05:03+0000\n"
-"PO-Revision-Date: 2014-07-08 15:49+0200\n"
+"POT-Creation-Date: 2015-03-06 05:56+0000\n"
+"PO-Revision-Date: 2015-03-06 13:06+0100\n"
 "Last-Translator: Marek Černocký <[e-mail]>\n"
-"Language-Team: čeština <[e-mail]>\n"
+"Language-Team: Czech <[e-mail]>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,8 +61,8 @@
 "uncheck \"Rich Text\" to toggle between plain text and rich text mode."
 msgstr ""
 "Zprávy je možné posílat i jako čistě textové. V rozbalovací nabídce "
-"zaškrtněte nebo zrušte zaškrtnutí „Formátovaný text“, abyste se přepnuli mezi "
-"režimy prostého textu a formátovaného textu."
+"zaškrtněte nebo zrušte zaškrtnutí „Formátovaný text“, abyste se přepnuli "
+"mezi režimy prostého textu a formátovaného textu."
 
 #: C/write.page:27(p)
 msgid ""
@@ -86,21 +86,37 @@
 "Přetáhněte soubor ze správce souborů Nautilus do okna editoru a upusťte jej "
 "buď na textových polích v horní části okna nebo na nástrojové liště dole."
 
-#: C/write.page:37(title)
+#: C/write.page:35(p)
+msgid ""
+"A number of keyboard shortcuts are available in the composer; see <link xref="
+"\"shortcuts#composer\"/> for details."
+msgstr ""
+"Řada klávesových zkratek je dostupná v editoru zpráv, podrobnosti viz <link "
+"xref=\"shortcuts#composer\"/>."
+
+#: C/write.page:37(p)
+msgid ""
+"You may specify a signature to be inserted into the composer in the <link "
+"xref=\"accounts\"/> dialog."
+msgstr ""
+"V dialogovém okně <link xref=\"accounts\"/> můžete zadat patičku, která se "
+"bude vkládat do editoru."
+
+#: C/write.page:42(title)
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: C/write.page:39(p)
+#: C/write.page:44(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 ""
 "Na serverech, které podporují koncepty, ukládá Gerary zprávy automaticky "
-"během psaní. Pokud zavřete okno editoru, aniž byste zprávu odeslali, Geary se "
-"vás dotáže, jestli má zprávu uchovat v konceptech nebo ji zahodit."
+"během psaní. Pokud zavřete okno editoru, aniž byste zprávu odeslali, Geary "
+"se vás dotáže, jestli má zprávu uchovat v konceptech nebo ji zahodit."
 
-#: C/write.page:42(p)
+#: C/write.page:47(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."
@@ -109,7 +125,7 @@
 "složku Koncepty, vyberte zprávu a klikněte v prohlížeči zpráv na „Upravit "
 "koncept“ ."
 
-#: C/write.page:45(p)
+#: C/write.page:50(p)
 msgid "Geary deletes the draft when you send the message."
 msgstr "Po odeslání zprávy Geary koncept smaže."
 
@@ -249,7 +265,7 @@
 msgid "Star"
 msgstr "Přidělit hvězdičku"
 
-#: C/shortcuts.page:44(key) C/shortcuts.page:92(key)
+#: C/shortcuts.page:44(key) C/shortcuts.page:104(key)
 msgid "S"
 msgstr "S"
 
@@ -257,7 +273,7 @@
 msgid "Unstar"
 msgstr "Odebrat hvězdičku"
 
-#: C/shortcuts.page:48(key)
+#: C/shortcuts.page:48(key) C/shortcuts.page:138(key)
 msgid "D"
 msgstr "D"
 
@@ -286,103 +302,223 @@
 "key><key>U</key></keyseq>"
 
 #: C/shortcuts.page:59(p)
+#| msgid "Conversation list"
+msgid "Move focus to conversation list"
+msgstr "Přesunout zaměření na seznam konverzací"
+
+#: C/shortcuts.page:60(key) C/shortcuts.page:76(key) C/shortcuts.page:92(key)
+#: C/shortcuts.page:96(key) C/shortcuts.page:100(key)
+#: C/shortcuts.page:104(key) C/shortcuts.page:108(key)
+#: C/shortcuts.page:112(key) C/shortcuts.page:116(key)
+#: C/shortcuts.page:126(key) C/shortcuts.page:130(key)
+#: C/shortcuts.page:138(key) C/shortcuts.page:146(key)
+#: C/shortcuts.page:150(key) C/shortcuts.page:154(key)
+#: C/shortcuts.page:158(key) C/shortcuts.page:162(key)
+#: C/shortcuts.page:166(key)
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: C/shortcuts.page:60(key) C/shortcuts.page:146(key)
+msgid "B"
+msgstr "B"
+
+#: C/shortcuts.page:63(p)
+#| msgid "Find next in current conversation"
+msgid "Jump to next (older) conversation"
+msgstr "Přejít na následující (starší) konverzaci"
+
+#: C/shortcuts.page:64(key)
+msgid "j"
+msgstr "j"
+
+#: C/shortcuts.page:67(p)
+#| msgid "Find previous in current conversation"
+msgid "Jump to previous (newer) conversation"
+msgstr "Přejít na předchozí (novější) konverzaci"
+
+#: C/shortcuts.page:68(key)
+msgid "k"
+msgstr "k"
+
+#: C/shortcuts.page:71(p)
 msgid "Toggle spam"
-msgstr "Označit jako spam/zrušit označení"
+msgstr "Označit jako spam/zrušit označení spamu"
 
-#: C/shortcuts.page:60(p)
+#: C/shortcuts.page:72(p)
 msgid "<keyseq><key>Ctrl</key><key>J</key></keyseq> or <key>!</key>"
 msgstr "<keyseq><key>Ctrl</key><key>J</key></keyseq> nebo <key>!</key>"
 
-#: C/shortcuts.page:63(p)
+#: C/shortcuts.page:75(p)
 msgid "Quit"
 msgstr "Ukončit"
 
-#: 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)
+#: C/shortcuts.page:76(key)
 msgid "Q"
 msgstr "Q"
 
-#: C/shortcuts.page:67(p)
+#: C/shortcuts.page:79(p)
 msgid "Zoom in"
 msgstr "Přiblížit"
 
-#: C/shortcuts.page:68(p)
+#: C/shortcuts.page:80(p)
 msgid "<keyseq><key>Ctrl</key><key>=</key></keyseq> or <key>=</key>"
 msgstr "<keyseq><key>Ctrl</key><key>=</key></keyseq> nebo <key>=</key>"
 
-#: C/shortcuts.page:71(p)
+#: C/shortcuts.page:83(p)
 msgid "Zoom out"
 msgstr "Oddálit"
 
-#: C/shortcuts.page:72(p)
+#: C/shortcuts.page:84(p)
 msgid "<keyseq><key>Ctrl</key><key>-</key></keyseq> or <key>-</key>"
 msgstr "<keyseq><key>Ctrl</key><key>-</key></keyseq> nebo <key>-</key>"
 
-#: C/shortcuts.page:75(p)
+#: C/shortcuts.page:87(p)
 msgid "Reset zoom"
-msgstr "Přiblížení na výchozí velikost"
+msgstr "Přiblížit na výchozí velikost"
 
-#: C/shortcuts.page:76(p)
+#: C/shortcuts.page:88(p)
 msgid "<keyseq><key>Ctrl</key><key>0</key></keyseq> or <key>0</key>"
 msgstr "<keyseq><key>Ctrl</key><key>0</key></keyseq> nebo <key>0</key>"
 
-#: C/shortcuts.page:79(p) C/preferences.page:10(title)
+#: C/shortcuts.page:91(p) C/preferences.page:10(title)
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: C/shortcuts.page:80(key)
+#: C/shortcuts.page:92(key)
 msgid "E"
 msgstr "E"
 
-#: C/shortcuts.page:83(p) C/accounts.page:10(title)
+#: C/shortcuts.page:95(p) C/accounts.page:10(title)
 msgid "Accounts"
 msgstr "Účty"
 
-#: C/shortcuts.page:84(key)
+#: C/shortcuts.page:96(key)
 msgid "M"
 msgstr "M"
 
-#: C/shortcuts.page:87(p)
+#: C/shortcuts.page:99(p)
 msgid "Close composer window"
 msgstr "Zavřít okno editoru"
 
-#: C/shortcuts.page:88(key)
+#: C/shortcuts.page:100(key)
 msgid "W"
 msgstr "W"
 
-#: C/shortcuts.page:91(p)
+#: C/shortcuts.page:103(p)
 msgid "Jump to search box"
 msgstr "Přejít do vyhledávacího pole"
 
-#: C/shortcuts.page:95(p)
+#: C/shortcuts.page:107(p)
 msgid "Find in current conversation"
 msgstr "Hledat v aktuální konverzaci"
 
-#: C/shortcuts.page:96(key)
+#: C/shortcuts.page:108(key)
 msgid "F"
 msgstr "F"
 
-#: C/shortcuts.page:99(p)
+#: C/shortcuts.page:111(p)
 msgid "Find next in current conversation"
 msgstr "Najít následující v aktuální konverzaci"
 
-#: C/shortcuts.page:100(key) C/shortcuts.page:104(key)
+#: C/shortcuts.page:112(key) C/shortcuts.page:116(key)
 msgid "G"
 msgstr "G"
 
-#: C/shortcuts.page:103(p)
+#: C/shortcuts.page:115(p)
 msgid "Find previous in current conversation"
 msgstr "Najít předchozí v aktuální konverzaci"
 
-#: C/shortcuts.page:104(key)
+#: C/shortcuts.page:116(key)
 msgid "Shift"
 msgstr "Shift"
 
+#: C/shortcuts.page:121(title)
+msgid "Composer shortcuts"
+msgstr "Klávesové zkratky editoru"
+
+#: C/shortcuts.page:122(p)
+msgid "These shortcuts are active whenever focus is in a composer."
+msgstr ""
+"Následující klávesové zkratky jsou funkční, kdykoliv je aktivní editor zpráv."
+
+#: C/shortcuts.page:125(p)
+msgid "Quote text"
+msgstr "Citovat text"
+
+#: C/shortcuts.page:126(key)
+msgid "]"
+msgstr "]"
+
+#: C/shortcuts.page:129(p)
+msgid "Unquote text"
+msgstr "Ukončit citaci textu"
+
+#: C/shortcuts.page:130(key)
+msgid "["
+msgstr "["
+
+#: C/shortcuts.page:133(p)
+msgid "Close composer"
+msgstr "Zavřít okno editoru"
+
+#: C/shortcuts.page:134(p)
+msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq> or <key>Esc</key>"
+msgstr "<keyseq><key>Ctrl</key><key>W</key></keyseq> nebo <key>Esc</key>"
+
+#: C/shortcuts.page:137(p)
+msgid "Detach composer"
+msgstr "Odpojit okno editor"
+
+#: C/shortcuts.page:142(p)
+msgid "These shortcuts are only active in composers in rich text mode."
+msgstr ""
+"Následující klávesové zkratky jsou funkční pouze když je editor v režimu "
+"formátovaného textu."
+
+#: C/shortcuts.page:145(p)
+msgid "Bold text"
+msgstr "Tučný text"
+
+#: C/shortcuts.page:149(p)
+msgid "Italicize text"
+msgstr "Text kurzívou"
+
+#: C/shortcuts.page:150(key)
+msgid "I"
+msgstr "I"
+
+#: C/shortcuts.page:153(p)
+msgid "Underline text"
+msgstr "Podtržený text"
+
+#: C/shortcuts.page:154(key)
+msgid "U"
+msgstr "U"
+
+#: C/shortcuts.page:157(p)
+msgid "Strike text"
+msgstr "Přeškrtnutý text"
+
+#: C/shortcuts.page:158(key)
+msgid "K"
+msgstr "K"
+
+#: C/shortcuts.page:161(p)
+msgid "Insert a link"
+msgstr "Vložit odkaz"
+
+#: C/shortcuts.page:162(key)
+msgid "L"
+msgstr "L"
+
+#: C/shortcuts.page:165(p)
+msgid "Remove formatting"
+msgstr "Odstranit formátování"
+
+#: C/shortcuts.page:166(key)
+msgid "Space"
+msgstr "mezerník"
+
 #: C/search.page:10(title)
 msgid "Search"
 msgstr "Hledání"
@@ -394,8 +530,8 @@
 "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 podporuje vyhledávání v úplně všech textech v jednotlivých účtech. Když "
-"chcete vyhledávat, vyberte složku patřící k účtu, ve kterém si přejete "
+"Geary podporuje vyhledávání v úplně všech textech v jednotlivých účtech. "
+"Když chcete vyhledávat, vyberte složku patřící k účtu, ve kterém si přejete "
 "hledat. Pak klikněte na vyhledávací pole na nástrojové liště (nebo zmáčkněte "
 "<keyseq><key>Ctrl</key><key>S</key></keyseq>) a začněte psát. Po chvilce se "
 "začnou objevovat výsledky."
@@ -414,9 +550,9 @@
 "will match different forms of the same word, for example searching for \"walk"
 "\" will also match \"walking\" and \"walked.\""
 msgstr ""
-"Klíčová slova, která vyhovují vašemu hledání, se v zobrazení zprávy zvýrazní. "
-"Geary umí rozpoznat i různé varianty téhož slova, například při hledání "
-"„oběd“ bude vyhovovat i „obědvat“ a „obědový“."
+"Klíčová slova, která vyhovují vašemu hledání, se v zobrazení zprávy "
+"zvýrazní. Geary umí rozpoznat i různé varianty téhož slova, například při "
+"hledání „oběd“ bude vyhovovat i „obědvat“ a „obědový“."
 
 #: C/search.page:23(title)
 msgid "Search operators"
@@ -487,7 +623,8 @@
 #: C/search.page:44(p)
 msgid "Finds messages where <var>sender</var> matches the From header."
 msgstr ""
-"Najít zprávy, ve kterých <var>odesilatel</var> odpovídá údaji „Od“ v hlavičce."
+"Najít zprávy, ve kterých <var>odesilatel</var> odpovídá údaji „Od“ v "
+"hlavičce."
 
 #: C/search.page:47(input)
 msgid "subject:<placeholder-1/>"
@@ -546,8 +683,8 @@
 "message, Geary automatically selects an adjacent message."
 msgstr ""
 "Když je tato volba zapnutá, Geary, po té co vstoupíte do složky, automaticky "
-"vybere nejnovější zprávu. Navíc po archivaci zprávy, vybere Geary automaticky "
-"sousední zprávu."
+"vybere nejnovější zprávu. Navíc po archivaci zprávy, vybere Geary "
+"automaticky sousední zprávu."
 
 #: C/preferences.page:26(gui)
 msgid "Display conversation preview"
@@ -574,8 +711,8 @@
 "When set, Geary automatically spell checks a message as you write it, "
 "underlying each misspelled word in red."
 msgstr ""
-"Když je zapnuto, Geary automaticky kontroluje pravopis ve zprávě, "
-"kterou píšete a chybná slova podtrhává červeně."
+"Když je zapnuto, Geary automaticky kontroluje pravopis ve zprávě, kterou "
+"píšete a chybná slova podtrhává červeně."
 
 #: C/preferences.page:45(title)
 msgid "Notifications"
@@ -790,8 +927,8 @@
 "services."
 msgstr ""
 "Geary umožňuje každé konverzaci přidělit jeden nebo i více <em>štítků</em>. "
-"Štítky jsou u Geary to stejné jako štítky u Gmailu nebo běžné složky u jiných "
-"poštovních služeb."
+"Štítky jsou u Geary to stejné jako štítky u Gmailu nebo běžné složky u "
+"jiných poštovních služeb."
 
 #: C/label.page:15(p)
 msgid ""
@@ -911,8 +1048,8 @@
 "For general inquiries, please join the <link href=\"https://mail.gnome.org/"
 "mailman/listinfo/geary-list\"> Geary mailing list</link>."
 msgstr ""
-"Ohledně obecných dotazů se prosím připojte do <link href=\"https://mail.gnome."
-"org/mailman/listinfo/geary-list\">poštovní konference Geary</link>."
+"Ohledně obecných dotazů se prosím připojte do <link href=\"https://mail."
+"gnome.org/mailman/listinfo/geary-list\">poštovní konference Geary</link>."
 
 #: C/archive.page:10(title)
 msgid "Delete or archive a message"
@@ -1034,6 +1171,31 @@
 
 #: C/accounts.page:45(p)
 msgid ""
+"The <gui>Sign emails</gui> checkbox indicates whether a signature will be "
+"automatically inserted when a composer is opened. You may enter the "
+"signature into the box immediately below. You may use HTML tags to style the "
+"text. Switch to a preview of the signature using the buttons to the right."
+msgstr ""
+"Zaškrtávací políčko <gui>Patička e-mailů</gui> říká, jestli se má při "
+"otevření editoru automaticky vložit patička s podpisem. Obsah patičky můžete "
+"zadat do pole níže. Můžete při tom určovat styl pomocí značek HTML. "
+"Tlačítkem napravo si můžete zobrazit náhled patičky."
+
+#: C/accounts.page:50(p)
+msgid ""
+"If you leave the signature in the Accounts dialog blank, Geary will use the "
+"<file>.signature</file> file in your home directory, if it exists. This file "
+"may contain either plain text or HTML markup. In the latter case, the markup "
+"will be inserted directly into the composer, without any escaping."
+msgstr ""
+"Pokud ponecháte patičku v dialogovém okně Účty prázdnou, bude Geary používat "
+"soubor <file>.signature</file> ve vaší domovské složce (za předpokladu, že "
+"soubor existuje). Může obsahovat buď prostý text nebo text formátovaný jako "
+"HTML. Ve druhém případě bude vložen do editoru tak, jak je, bez jakéhokoliv "
+"ošetření speciálních znaků."
+
+#: C/accounts.page:55(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."
@@ -1042,11 +1204,11 @@
 "zpráv bude Geary uchovávat místně. Jen v místně uložených zprávám může Geary "
 "vychledávat a sestavovat z nich konverzace."
 
-#: C/accounts.page:53(title)
+#: C/accounts.page:63(title)
 msgid "Removing accounts"
 msgstr "Odebírání účtů"
 
-#: C/accounts.page:55(p)
+#: C/accounts.page:65(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 "

=== modified file 'help/de/de.po'
--- help/de/de.po	2014-12-29 05:40:07 +0000
+++ help/de/de.po	2015-07-10 22:31:23 +0000
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Geary 0.5.1\n"
-"POT-Creation-Date: 2014-11-10 05:49+0000\n"
-"PO-Revision-Date: 2014-12-04 23:57+0100\n"
-"Last-Translator: Christian Kirbach <[e-mail]>\n"
+"POT-Creation-Date: 2015-02-22 17:56+0000\n"
+"PO-Revision-Date: 2015-02-23 22:04+0100\n"
+"Last-Translator: Simon Linden <[e-mail]>\n"
 "Language-Team: Andreas Wilhelm <[e-mail]>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: C/write.page:9(title)
@@ -81,15 +81,31 @@
 "drop it either on the text fields at the top of the window or on the toolbar "
 "at the bottom."
 msgstr ""
-"Ziehen Sie die Datei aus der Nautilus Dateiverwaltung in das Editor-Fenster "
+"Ziehen Sie die Datei aus der Nautilus-Dateiverwaltung in das Editor-Fenster "
 "und legen Sie diese entweder im Textfeld oben im Fenster oder in der "
 "Werkzeugleiste im unteren Teil des Fensters ab."
 
-#: C/write.page:37(title)
+#: C/write.page:35(p)
+msgid ""
+"A number of keyboard shortcuts are available in the composer; see <link xref="
+"\"shortcuts#composer\"/> for details."
+msgstr ""
+"Im Editor stehen eine große Zahl von Tastaturkürzel zur Verfügung; Details "
+"unter <link xref=\"shortcuts#composer\"/>."
+
+#: C/write.page:37(p)
+msgid ""
+"You may specify a signature to be inserted into the composer in the <link "
+"xref=\"accounts\"/> dialog."
+msgstr ""
+"Sie können im <link xref=\"accounts\"/>-Dialog eine Signatur angeben, welche "
+"dann im E-Mail-Editor eingefügt wird."
+
+#: C/write.page:42(title)
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: C/write.page:39(p)
+#: C/write.page:44(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 "
@@ -100,7 +116,7 @@
 "ohne die Nachricht zu senden, fragt Geary, ob die Nachricht als Entwurf "
 "gespeichert oder verworfen werden soll. "
 
-#: C/write.page:42(p)
+#: C/write.page:47(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."
@@ -109,7 +125,7 @@
 "Entwürfe-Ordner aus der Ordnerliste, wählen die Nachricht und wählen in der "
 "Nachrichten Ansicht \"Entwurf bearbeiten\"."
 
-#: C/write.page:45(p)
+#: C/write.page:50(p)
 msgid "Geary deletes the draft when you send the message."
 msgstr "Geary löscht den Entwurf, wenn die Nachricht gesendet wird."
 
@@ -259,7 +275,7 @@
 msgid "Unstar"
 msgstr "Sternchen-Markierung entfernen"
 
-#: C/shortcuts.page:48(key)
+#: C/shortcuts.page:48(key) C/shortcuts.page:126(key)
 msgid "D"
 msgstr "D"
 
@@ -302,6 +318,11 @@
 #: 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)
+#: C/shortcuts.page:114(key) C/shortcuts.page:118(key)
+#: C/shortcuts.page:126(key) C/shortcuts.page:134(key)
+#: C/shortcuts.page:138(key) C/shortcuts.page:142(key)
+#: C/shortcuts.page:146(key) C/shortcuts.page:150(key)
+#: C/shortcuts.page:154(key)
 msgid "Ctrl"
 msgstr "Strg"
 
@@ -385,6 +406,97 @@
 msgid "Shift"
 msgstr "Umschalttaste"
 
+#: C/shortcuts.page:109(title)
+msgid "Composer shortcuts"
+msgstr "Tastenkombinationen des Editors"
+
+#: C/shortcuts.page:110(p)
+msgid "These shortcuts are active whenever focus is in a composer."
+msgstr ""
+"Diese Tastenkombinationen stehen zur Verfügung, sobald der Editor aktiv ist."
+
+#: C/shortcuts.page:113(p)
+msgid "Quote text"
+msgstr "Text zitieren"
+
+#: C/shortcuts.page:114(key)
+msgid "]"
+msgstr "]"
+
+#: C/shortcuts.page:117(p)
+msgid "Unquote text"
+msgstr "Text nicht mehr zitieren"
+
+#: C/shortcuts.page:118(key)
+msgid "["
+msgstr "["
+
+#: C/shortcuts.page:121(p)
+msgid "Close composer"
+msgstr "Editor schließen"
+
+#: C/shortcuts.page:122(p)
+msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq> or <key>Esc</key>"
+msgstr "<keyseq><key>Strg</key><key>W</key></keyseq> oder <key>Esc</key>"
+
+#: C/shortcuts.page:125(p)
+msgid "Detach composer"
+msgstr "Editor abtrennen"
+
+#: C/shortcuts.page:130(p)
+msgid "These shortcuts are only active in composers in rich text mode."
+msgstr ""
+"Diese Tastenkombinationen stehen nur in Editoren mit Rich-Text-Modus zur "
+"Verfügung."
+
+#: C/shortcuts.page:133(p)
+msgid "Bold text"
+msgstr "Fetter Text"
+
+#: C/shortcuts.page:134(key)
+msgid "B"
+msgstr "B"
+
+#: C/shortcuts.page:137(p)
+msgid "Italicize text"
+msgstr "Kursiver Text"
+
+#: C/shortcuts.page:138(key)
+msgid "I"
+msgstr "I"
+
+#: C/shortcuts.page:141(p)
+msgid "Underline text"
+msgstr "Text unterstreichen"
+
+#: C/shortcuts.page:142(key)
+msgid "U"
+msgstr "U"
+
+#: C/shortcuts.page:145(p)
+msgid "Strike text"
+msgstr "Text durchstreichen"
+
+#: C/shortcuts.page:146(key)
+msgid "K"
+msgstr "K"
+
+#: C/shortcuts.page:149(p)
+msgid "Insert a link"
+msgstr "Verweis einfügen"
+
+#: C/shortcuts.page:150(key)
+msgid "L"
+msgstr "L"
+
+#: C/shortcuts.page:153(p)
+msgid "Remove formatting"
+msgstr "Formatierung entfernen"
+
+#: C/shortcuts.page:154(key)
+msgid "Space"
+msgstr "Leerzeichen"
+
 #: C/search.page:10(title)
 msgid "Search"
 msgstr "Suche"
@@ -1040,7 +1152,7 @@
 "accounts, if you disable this setting, you may be unable to view messages "
 "you've sent."
 msgstr ""
-"Das Ankreuzfeld <gui>Gesendete E-Mail speichern</gui> bestimmt, ob Geary "
+"Das Ankreuzfeld <gui>Gesendete E-Mail speichern</gui> legt fest, ob Geary "
 "erfolgreich gesendete Nachrichten in den Ordner <gui>Gesendete E-Mails</gui> "
 "verschiebt. Für Gmail-Konten erfolgt das automatisch. Yahoo und einige "
 "andere können so eingestellt werden, dass sie gesendete E-Mails ebenfalls "
@@ -1050,6 +1162,32 @@
 
 #: C/accounts.page:45(p)
 msgid ""
+"The <gui>Sign emails</gui> checkbox indicates whether a signature will be "
+"automatically inserted when a composer is opened. You may enter the "
+"signature into the box immediately below. You may use HTML tags to style the "
+"text. Switch to a preview of the signature using the buttons to the right."
+msgstr ""
+"Das Ankreuzfeld <gui>E-Mails unterzeichnen</gui> zeigt an ob beim öffnen des "
+"E-Mail-Editors automatisch eine Signatur in die E-Mail eingefügt wird. In "
+"dem Eingabefeld direkt darunter können Sie die Signatur eingeben. Um den "
+"Text hervorzuheben können Sie auch HTML-Tags verwenden. Mit den Knöpfen auf "
+"der rechten Seite wechseln Sie zur Vorschau der Signatur."
+
+#: C/accounts.page:50(p)
+msgid ""
+"If you leave the signature in the Accounts dialog blank, Geary will use the "
+"<file>.signature</file> file in your home directory, if it exists. This file "
+"may contain either plain text or HTML markup. In the latter case, the markup "
+"will be inserted directly into the composer, without any escaping."
+msgstr ""
+"Wenn Sie im Konten-Dialog kein Signatur einstellen, wird Geary den Inhalt "
+"der Datei <file>.signature</file> aus Ihrem Persönlicher Ordner verwenden, "
+"sofern diese vorhanden ist. Diese Datei kann sowohl reinen Text als auch "
+"HTML-Textauszeichnungen enthalten. Im letzteren Fall, werden die "
+"Textauszeichnungen direkt und ohne Maskierung im E-Mail-Editor eingefügt."
+
+#: C/accounts.page:55(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."
@@ -1059,11 +1197,11 @@
 "berücksichtigen, wenn es um das Durchsuchen oder das Bündeln von Nachrichten "
 "in Konversationen geht.   "
 
-#: C/accounts.page:53(title)
+#: C/accounts.page:63(title)
 msgid "Removing accounts"
 msgstr "Konten löschen"
 
-#: C/accounts.page:55(p)
+#: C/accounts.page:65(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 "

=== modified file 'help/el/el.po'
--- help/el/el.po	2014-07-26 10:08:43 +0000
+++ help/el/el.po	2015-07-10 22:31:23 +0000
@@ -6,114 +6,64 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
-"POT-Creation-Date: 2014-02-16 18:06+0000\n"
-"PO-Revision-Date: 2014-02-15 17:49+0300\n"
-"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <[e-mail]>\n"
+"POT-Creation-Date: 2014-06-10 17:00+0000\n"
+"PO-Revision-Date: 2014-06-15 19:01+0200\n"
+"Last-Translator: Efstathios Iosifidis <[e-mail]>\n"
 "Language-Team: www.gnome.gr\n"
 "Language: el\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: Virtaal 0.7.1\n"
+"X-Generator: Poedit 1.6.4\n"
 
 #: C/write.page:9(title)
 msgid "Write a message"
 msgstr "Συγγραφή μηνύματος"
 
 #: C/write.page:12(p)
-msgid ""
-"To compose a new message in Geary, press the <gui>New Message</gui> button "
-"on the toolbar."
-msgstr ""
-"Για να συνθέσετε ένα νέο μήνυμα στο Geary, πατήστε το πλήκτρο <gui>Νέο "
-"μήνυμα</gui> στην εργαλειοθήκη."
+msgid "To compose a new message in Geary, press the <gui>New Message</gui> button on the toolbar."
+msgstr "Για να συνθέσετε ένα νέο μήνυμα στο Geary, πατήστε το πλήκτρο <gui>Νέο μήνυμα</gui> στην εργαλειοθήκη."
 
 #: 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 ""
-"Για να απαντήσετε σε ένα μήνυμα, ανοίξτε το μενού μηνυμάτων στην πάνω δεξιά "
-"γωνία του μηνύματος και επιλέξτε <gui>Απάντηση</gui>, <gui>Απάντηση σε "
-"όλους</gui> ή <gui>Προώθηση</gui>. Μπορείτε επίσης να απαντήσετε στο "
-"τελευταίο μήνυμα σε μια συζήτηση μέσα από το <gui>Απάντηση</gui>, "
-"<gui>Απάντηση σε όλους</gui> ή τα πλήκτρα <gui>Προώθηση</gui> στην "
-"εργαλειοθήκη."
+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 "Για να απαντήσετε σε ένα μήνυμα, ανοίξτε το μενού μηνυμάτων στην πάνω δεξιά γωνία του μηνύματος και επιλέξτε <gui>Απάντηση</gui>, <gui>Απάντηση σε όλους</gui> ή <gui>Προώθηση</gui>. Μπορείτε επίσης να απαντήσετε στο τελευταίο μήνυμα σε μια συζήτηση μέσα από τα πλήκτρα της εργαλειοθήκης <gui>Απάντηση</gui>, <gui>Απάντηση σε όλους</gui> ή <gui>Προώθηση</gui>."
 
 #: C/write.page:20(title)
 msgid "Features"
-msgstr "Γνωρίσματα"
+msgstr "Λειτουργίες"
 
 #: 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 ""
-"Η σύνταξη μηνύματος στο Geary σας επιτρέπει να ρυθμίσετε τη γραμματοσειρά, "
-"το μέγεθος και το χρώμα του κειμένου. Μπορείτε επίσης να παρεμβάλετε "
-"υπερσυνδέσμους στα μηνύματα."
+msgid "Geary's email composer lets you adjust the font, size and color of text. You can also insert hyperlinks into messages."
+msgstr "Η σύνταξη μηνύματος στο Geary σας επιτρέπει να ρυθμίσετε τη γραμματοσειρά, το μέγεθος και το χρώμα του κειμένου. Μπορείτε επίσης να παρεμβάλετε υπερσυνδέσμους στα μηνύματα."
 
 #: 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 μπορεί επίσης να στείλει απλά μηνύματα κειμένου. Στο πτυσσόμενο "
-"μενού, σημειώστε ή αποεπιλέξτε \"Πλούσιο κείμενο\" για να εναλλάξετε μεταξύ "
-"κατάστασης απλού και πλούσιου κειμένου."
+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 μπορεί επίσης να στείλει απλά μηνύματα κειμένου. Στο αναπτυσσόμενο μενού, επιλέξτε ή αποεπιλέξτε \"Πλούσιο κείμενο\" για εναλλαγή μεταξύ κατάστασης απλού και πλούσιου κειμένου."
 
 #: C/write.page:27(p)
-msgid ""
-"You can attach a file to a message you're writing in either of these ways:"
-msgstr ""
-"Μπορείτε να επισυνάψετε ένα αρχείο σε ένα μήνυμα που γράφετε σε οποιονδήποτε "
-"από αυτούς τους τρόπους:"
+msgid "You can attach a file to a message you're writing in either of these ways:"
+msgstr "Μπορείτε να επισυνάψετε ένα αρχείο σε ένα μήνυμα που γράφετε με οποιονδήποτε από αυτούς τους τρόπους:"
 
 #: 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 ""
-"Πατήστε το πλήκτρο <gui>Επισύναψη αρχείου</gui> στα κάτω αριστερά του "
-"παραθύρου σύνταξης, έπειτα επιλέξτε ένα αρχείο για επισύναψη."
+msgid "Press the <gui>Attach File</gui> button at the lower left of the composer window, then select a file to attach."
+msgstr "Πατήστε το πλήκτρο <gui>Επισύναψη αρχείου</gui> που βρίσκεται κάτω αριστερά του παραθύρου σύνταξης, έπειτα επιλέξτε ένα αρχείο για επισύναψη."
 
 #: 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 ""
-"Μεταφέρτε το αρχείο από τον διαχειριστή αρχείων Ναυτίλο στο παράθυρο "
-"σύνταξης και αποθέστε το ή στο πεδίο κειμένου στην κορυφή του παραθύρου ή "
-"στην εργαλειοθήκη προς τα κάτω."
+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 "Μεταφέρτε το αρχείο από τον διαχειριστή αρχείων Ναυτίλο στο παράθυρο σύνταξης και αποθέστε το ή στο πεδίο κειμένου στην κορυφή του παραθύρου ή στην εργαλειοθήκη προς τα κάτω."
 
 #: C/write.page:37(title)
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
 #: 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 ""
-"Για διακομιστές αλληλογραφίας που υποστηρίζουν πρόχειρα, το Geary θα "
-"αποθηκεύσει αυτόματα το μήνυμα καθώς πληκτρολογείτε. Αν κλείσετε τη σύνταξη "
-"χωρίς αποστολή, το Geary θα σας προτρέψει να κρατήσετε το πρόχειρο ή να το "
-"απορρίψετε."
+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 "Για διακομιστές αλληλογραφίας που υποστηρίζουν πρόχειρα, το Geary θα αποθηκεύσει αυτόματα το μήνυμα καθώς πληκτρολογείτε. Αν κλείσετε τη σύνταξη χωρίς αποστολή, το Geary θα σας προτρέψει να κρατήσετε το πρόχειρο ή να το απορρίψετε."
 
 #: 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 ""
-"Για να επεξεργαστείτε ένα υπάρχον πρόχειρο, επιλέξτε τον φάκελο προχείρων "
-"στον κατάλογο φακέλων, επιλέξτε το μήνυμα και πατήστε \"Επεξεργασία προχείρου"
-"\" στην προβολή μηνυμάτων."
+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 "Για να επεξεργαστείτε ένα υπάρχον πρόχειρο, επιλέξτε τον φάκελο προχείρων στον κατάλογο φακέλων, επιλέξτε το μήνυμα και πατήστε \"Επεξεργασία προχείρου\" στην προβολή μηνυμάτων."
 
 #: C/write.page:45(p)
 msgid "Geary deletes the draft when you send the message."
@@ -128,56 +78,28 @@
 msgstr "Μηνύματα με αστέρια"
 
 #: 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 ""
-"Μπορείτε να βάλετε αστέρια στα μηνύματα για να δείξετε ότι είναι σημαντικά "
-"για σας. Για να σημειώσετε μια συζήτηση με αστέρι, πατήστε το εικονίδιο "
-"αστεριού της στον κατάλογο συζητήσεων. Μπορείτε να βάλετε αστέρια σε ένα "
-"μεμονωμένο μήνυμα πατώντας το αστέρι στα πάνω δεξιά του ίδιου του μηνύματος."
+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 "Μπορείτε να βάλετε αστέρια στα μηνύματα για να δείξετε ότι είναι σημαντικά για σας. Για να σημειώσετε μια συζήτηση με αστέρι, πατήστε το εικονίδιο αστεριού της στον κατάλογο συζητήσεων. Μπορείτε να βάλετε αστέρια σε ένα μεμονωμένο μήνυμα πατώντας το αστέρι στα πάνω δεξιά του ίδιου του μηνύματος."
 
 #: C/star.page:15(p)
-msgid ""
-"With Gmail accounts, starred messages appear in the Starred folder in the "
-"folder list."
-msgstr ""
-"Με λογαριασμούς Gmail, τα μηνύματα με αστέρια εμφανίζονται στον φάκελο με τα "
-"αστέρια στον κατάλογο φακέλων."
+msgid "With Gmail accounts, starred messages appear in the Starred folder in the folder list."
+msgstr "Με λογαριασμούς Gmail, τα μηνύματα με αστέρια εμφανίζονται στον φάκελο με τα αστέρια στον κατάλογο φακέλων."
 
 #: C/star.page:18(title)
 msgid "Mark messages as read or unread"
 msgstr "Σημείωση μηνυμάτων ως διαβασμένα ή αδιάβαστα"
 
 #: 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 σημειώνει τα μηνύματα ως διαβασμένα αυτόματα καθώς τα διαβάζετε. "
-"Για χειροκίνητη εναλλαγή μιας συνομιλίας ως διαβασμένης ή αδιάβαστης, "
-"πατήστε το εικονίδιο κύκλου στον κατάλογο συνομιλιών."
+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 σημειώνει τα μηνύματα ως διαβασμένα αυτόματα καθώς τα διαβάζετε. Για χειροκίνητη εναλλαγή μιας συνομιλίας ως διαβασμένης ή αδιάβαστης, πατήστε το εικονίδιο κύκλου στον κατάλογο συνομιλιών."
 
 #: 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 ""
-"Εναλλακτικά, μπορεί να χρησιμοποιηθεί το <gui>Σημείωση ως αδιάβαστο</gui> "
-"στο μενού <gui>Σημείωση</gui> στην εργαλειοθήκη για να εναλλάξετε την "
-"κατάσταση ανάγνωσης των επιλεγμένων συνομιλιών."
+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 "Εναλλακτικά, μπορεί να χρησιμοποιηθεί το <gui>Σημείωση ως αδιάβαστο</gui> στο μενού <gui>Σημείωση</gui> στην εργαλειοθήκη για να εναλλάξετε την κατάσταση ανάγνωσης των επιλεγμένων συνομιλιών."
 
 #: C/star.page:25(p)
-msgid ""
-"To mark an individual message as read, select <gui>Mark as Read</gui> from "
-"the dropdown menu."
-msgstr ""
-"Για να σημειώσετε ένα μεμονωμένο μήνυμα ως διαβασμένο, επιλέξτε "
-"<gui>Σημείωση ως διαβασμένο</gui> από το πτυσσόμενο μενού."
+msgid "To mark an individual message as read, select <gui>Mark as Read</gui> from the dropdown menu."
+msgstr "Για να σημειώσετε ένα μεμονωμένο μήνυμα ως διαβασμένο, επιλέξτε <gui>Σημείωση ως διαβασμένο</gui> από το αναπτυσσόμενο μενού."
 
 #: C/shortcuts.page:11(title)
 msgid "Keyboard shortcuts"
@@ -185,209 +107,200 @@
 
 #: C/shortcuts.page:12(p)
 msgid "Geary has keyboard shortcuts for most common operations."
-msgstr ""
-"Το Geary έχει συντομεύσεις πληκτρολογίου για τις πιο συνηθισμένες "
-"λειτουργίες."
+msgstr "Το Geary έχει συντομεύσεις πληκτρολογίου για τις πιο συνηθισμένες λειτουργίες."
 
 #: C/shortcuts.page:15(p)
 msgid "Compose a new message"
 msgstr "Σύνταξη νέου μηνύματος"
 
-#: C/shortcuts.page:15(p)
+#: 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> ή <key>N</key>"
 
-#: C/shortcuts.page:18(p)
+#: C/shortcuts.page:19(p)
 msgid "Reply to sender"
 msgstr "Απάντηση στον αποστολέα"
 
-#: C/shortcuts.page:19(p)
+#: 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> ή <key>R</key>"
 
-#: C/shortcuts.page:22(p)
+#: C/shortcuts.page:23(p)
 msgid "Reply to all"
-msgstr "Απάντησε σε όλους"
-
-#: C/shortcuts.page:23(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>Shift</key><key>R</key></keyseq> ή "
-"<keyseq><key>Shift</key><key>R</key></keyseq>"
-
-#: C/shortcuts.page:26(p)
+msgstr "Απάντηση σε όλους"
+
+#: 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>Shift</key><key>R</key></keyseq> ή <keyseq><key>Shift</key><key>R</key></keyseq>"
+
+#: C/shortcuts.page:27(p)
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: C/shortcuts.page:27(p)
+#: 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> ή <key>F</key>"
 
-#: C/shortcuts.page:30(p)
+#: C/shortcuts.page:31(p)
 msgid "Archive"
-msgstr "Αρχειοθήκη"
+msgstr "Αρχειοθέτηση"
 
-#: C/shortcuts.page:31(key)
+#: C/shortcuts.page:32(key)
 msgid "A"
 msgstr "A"
 
-#: C/shortcuts.page:34(p)
+#: C/shortcuts.page:35(p)
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: C/shortcuts.page:35(p)
+#: C/shortcuts.page:36(p)
 msgid "<key>Delete</key> or <key>Backspace</key>"
 msgstr "<key>Delete</key> ή <key>Backspace</key>"
 
-#: C/shortcuts.page:38(p)
+#: C/shortcuts.page:39(p)
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: C/shortcuts.page:39(p)
-msgid ""
-"<keyseq><key>Shift</key><key>Delete</key></keyseq> or <keyseq><key>Shift</"
-"key><key>Backspace</key></keyseq>"
-msgstr ""
-"<keyseq><key>Shift</key><key>Delete</key></keyseq> ή <keyseq><key>Shift</"
-"key><key>Backspace</key></keyseq>"
+#: 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>Shift</key><key>Delete</key></keyseq> ή <keyseq><key>Shift</key><key>Backspace</key></keyseq>"
 
-#: C/shortcuts.page:42(p)
+#: C/shortcuts.page:43(p)
 msgid "Star"
 msgstr "Αστέρι"
 
-#: C/shortcuts.page:43(key) C/shortcuts.page:91(key)
+#: C/shortcuts.page:44(key)
+#: C/shortcuts.page:92(key)
 msgid "S"
 msgstr "S"
 
-#: C/shortcuts.page:46(p)
+#: C/shortcuts.page:47(p)
 msgid "Unstar"
 msgstr "Κατάργηση αστεριού"
 
-#: C/shortcuts.page:47(key)
+#: C/shortcuts.page:48(key)
 msgid "D"
 msgstr "D"
 
-#: C/shortcuts.page:50(p)
+#: C/shortcuts.page:51(p)
 msgid "Mark read"
 msgstr "Σημείωση ως διαβασμένου"
 
-#: C/shortcuts.page:51(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> ή <keyseq><key>Shift</"
-"key><key>I</key></keyseq>"
+#: 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> ή <keyseq><key>Shift</key><key>I</key></keyseq>"
 
-#: C/shortcuts.page:54(p)
+#: C/shortcuts.page:55(p)
 msgid "Mark unread"
 msgstr "Σημείωση ως αδιάβαστου"
 
-#: C/shortcuts.page:55(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> ή <keyseq><key>Shift</"
-"key><key>U</key></keyseq>"
+#: 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> ή <keyseq><key>Shift</key><key>U</key></keyseq>"
 
-#: C/shortcuts.page:58(p)
+#: C/shortcuts.page:59(p)
 msgid "Toggle spam"
-msgstr "Εναλλαγή οχλήσεων"
+msgstr "Εναλλαγή ανεπιθύμητων"
 
-#: C/shortcuts.page:59(p)
+#: 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> ή <key>!</key>"
 
-#: C/shortcuts.page:62(p)
+#: C/shortcuts.page:63(p)
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: C/shortcuts.page:63(key) C/shortcuts.page:79(key) C/shortcuts.page:83(key)
-#: C/shortcuts.page:87(key) C/shortcuts.page:91(key) C/shortcuts.page:95(key)
-#: C/shortcuts.page:99(key) C/shortcuts.page:103(key)
+#: 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:63(key)
+#: C/shortcuts.page:64(key)
 msgid "Q"
 msgstr "Q"
 
-#: C/shortcuts.page:66(p)
+#: C/shortcuts.page:67(p)
 msgid "Zoom in"
 msgstr "Μεγέθυνση"
 
-#: C/shortcuts.page:67(p)
+#: C/shortcuts.page:68(p)
 msgid "<keyseq><key>Ctrl</key><key>=</key></keyseq> or <key>=</key>"
 msgstr "<keyseq><key>Ctrl</key><key>=</key></keyseq> ή <key>=</key>"
 
-#: C/shortcuts.page:70(p)
+#: C/shortcuts.page:71(p)
 msgid "Zoom out"
 msgstr "Σμίκρυνση"
 
-#: C/shortcuts.page:71(p)
+#: C/shortcuts.page:72(p)
 msgid "<keyseq><key>Ctrl</key><key>-</key></keyseq> or <key>-</key>"
 msgstr "<keyseq><key>Ctrl</key><key>-</key></keyseq> ή <key>-</key>"
 
-#: C/shortcuts.page:74(p)
+#: C/shortcuts.page:75(p)
 msgid "Reset zoom"
 msgstr "Επαναφορά εστίασης"
 
-#: C/shortcuts.page:75(p)
+#: 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> ή <key>0</key>"
 
-#: C/shortcuts.page:78(p) C/preferences.page:10(title)
+#: C/shortcuts.page:79(p)
+#: C/preferences.page:10(title)
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: C/shortcuts.page:79(key)
+#: C/shortcuts.page:80(key)
 msgid "E"
 msgstr "E"
 
-#: C/shortcuts.page:82(p) C/accounts.page:10(title)
+#: C/shortcuts.page:83(p)
+#: C/accounts.page:10(title)
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#: C/shortcuts.page:83(key)
+#: C/shortcuts.page:84(key)
 msgid "M"
 msgstr "M"
 
-#: C/shortcuts.page:86(p)
+#: C/shortcuts.page:87(p)
 msgid "Close composer window"
 msgstr "Κλείσιμο παραθύρου σύνταξης"
 
-#: C/shortcuts.page:87(key)
+#: C/shortcuts.page:88(key)
 msgid "W"
 msgstr "W"
 
-#: C/shortcuts.page:90(p)
+#: C/shortcuts.page:91(p)
 msgid "Jump to search box"
 msgstr "Μετάβαση στο πλαίσιο αναζήτησης"
 
-#: C/shortcuts.page:94(p)
+#: C/shortcuts.page:95(p)
 msgid "Find in current conversation"
 msgstr "Εύρεση στην τρέχουσα συνομιλία"
 
-#: C/shortcuts.page:95(key)
+#: C/shortcuts.page:96(key)
 msgid "F"
 msgstr "F"
 
-#: C/shortcuts.page:98(p)
+#: C/shortcuts.page:99(p)
 msgid "Find next in current conversation"
 msgstr "Εύρεση επόμενου στην τρέχουσα συνομιλία"
 
-#: C/shortcuts.page:99(key) C/shortcuts.page:103(key)
+#: C/shortcuts.page:100(key)
+#: C/shortcuts.page:104(key)
 msgid "G"
 msgstr "G"
 
-#: C/shortcuts.page:102(p)
+#: C/shortcuts.page:103(p)
 msgid "Find previous in current conversation"
 msgstr "Εύρεση προηγούμενου στην τρέχουσα συνομιλία"
 
-#: C/shortcuts.page:103(key)
+#: C/shortcuts.page:104(key)
 msgid "Shift"
 msgstr "Shift"
 
@@ -396,146 +309,171 @@
 msgstr "Αναζήτηση"
 
 #: 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 υποστηρίζει μια πλήρη αναζήτηση κειμένου ανά λογαριασμό. Για να "
-"αρχίσετε μια αναζήτηση, επιλέξτε έναν φάκελο που συσχετίζεται με τον "
-"λογαριασμό που θα θέλατε να αναζητήσετε. Έπειτα πατήστε στο πλαίσιο "
-"αναζήτησης στην εργαλειοθήκη (ή πατήστε <keyseq><key>Ctrl</key><key>S</key></"
-"keyseq>) και αρχίστε να πληκτρολογείτε. Τα αποτελέσματα θα εμφανιστούν μετά "
-"από μια σύντομη καθυστέρηση."
+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 υποστηρίζει μια πλήρη αναζήτηση κειμένου ανά λογαριασμό. Για να αρχίσετε μια αναζήτηση, επιλέξτε έναν φάκελο που συσχετίζεται με τον λογαριασμό που θα θέλατε να αναζητήσετε. Έπειτα πατήστε στο πλαίσιο αναζήτησης στην εργαλειοθήκη (ή πατήστε <keyseq><key>Ctrl</key><key>S</key></keyseq>) και αρχίστε να πληκτρολογείτε. Τα αποτελέσματα θα εμφανιστούν μετά από μια σύντομη καθυστέρηση."
 
 #: 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 ""
-"Η πλήρης αναζήτηση κειμένου περιλαμβάνει κείμενο μηνύματος, διευθύνσεων "
-"αλληλογραφίας (πρός, από, και αντίγραφο), γραμμές θέματος και ονόματα "
-"αρχείων συνημμένων."
+msgid "The full text search includes email text, email addresses (to, from, and cc), subject lines and attachment filenames."
+msgstr "Η πλήρης αναζήτηση κειμένου περιλαμβάνει κείμενο μηνύματος, διευθύνσεων αλληλογραφίας (πρός, από, και κοινοποίηση), γραμμές θέματος και ονόματα αρχείων συνημμένων."
 
 #: C/search.page:19(p)
-msgid ""
-"Keywords that match your search are highlighted the message view. Geary will "
-"match different forms of the same word, for example searching for \"walk\" "
-"will also match \"walking\" and \"walked.\""
-msgstr ""
-"Οι λέξεις-κλειδιά που ταιριάζουν με την αναζήτησή σας επισημαίνονται στην "
-"προβολή μηνυμάτων. Το Geary θα ταιριάξει διαφορετικές μορφές της ίδιας "
-"λέξης, για παράδειγμα η αναζήτηση για \"ωραίος\" θα ταιριάξει επίσης \"ωραίο"
-"\" και \"ωραίοι\"."
+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 "Οι λέξεις-κλειδιά που ταιριάζουν με την αναζήτησή σας επισημαίνονται στην προβολή μηνυμάτων. Το Geary θα ταιριάξει διαφορετικές μορφές της ίδιας λέξης, για παράδειγμα η αναζήτηση για \"walk\" θα ταιριάξει επίσης \"walking\" και \"walked\"."
+
+#: C/search.page:23(title)
+msgid "Search operators"
+msgstr "Τελεστές αναζήτησης"
+
+#: C/search.page:24(p)
+msgid "Geary supports the following operators to limit the scope of searches:"
+msgstr "Το Geary υποστηρίζει τους ακόλουθους τελεστές για να περιορίσουν το πεδίο των αναζητήσεων:"
+
+#: C/search.page:27(var)
+msgid "filename"
+msgstr "όνομα αρχείου"
+
+#: C/search.page:27(input)
+msgid "attachment:<placeholder-1/>"
+msgstr "συνημμένο:<placeholder-1/>"
+
+#: C/search.page:28(p)
+msgid "Finds messages with attachments whose name matches <var>filename</var>."
+msgstr "Βρίσκει μηνύματα με συνημμένα των οποίων το όνομα ταιριάζει με το <var>όνομα αρχείου</var>."
+
+#: C/search.page:31(var)
+#: C/search.page:39(var)
+#: C/search.page:51(var)
+msgid "recipient"
+msgstr "παραλήπτης"
+
+#: C/search.page:31(input)
+msgid "bcc:<placeholder-1/>"
+msgstr "κρυφή κοιν.:<placeholder-1/>"
+
+#: C/search.page:32(p)
+msgid "Finds messages where <var>recipient</var> matches the BCC header."
+msgstr "Βρίσκει μηνύματα όπου ο <var>παραλήπτης</var> ταιριάζει με την κεφαλίδα Κρυφής κοιν."
+
+#: C/search.page:35(var)
+#: C/search.page:47(var)
+msgid "text"
+msgstr "κείμενο"
+
+#: C/search.page:35(input)
+msgid "body:<placeholder-1/>"
+msgstr "σώμα κειμένου:<placeholder-1/>"
+
+#: C/search.page:36(p)
+msgid "Finds messages whose body contains <var>text</var>."
+msgstr "Βρίσκει μηνύματα του οποίου το σώμα περιέχει <var>κείμενο</var>."
+
+#: C/search.page:39(input)
+msgid "cc:<placeholder-1/>"
+msgstr "κοιν.:<placeholder-1/>"
+
+#: C/search.page:40(p)
+msgid "Finds messages where <var>recipient</var> matches the CC header."
+msgstr "Βρίσκει μηνύματα όπου ο <var>παραλήπτης</ var> ταιριάζει με την κεφαλίδα Κοιν."
+
+#: C/search.page:43(var)
+msgid "sender"
+msgstr "αποστολέας"
+
+#: C/search.page:43(input)
+msgid "from:<placeholder-1/>"
+msgstr "από:<placeholder-1/>"
+
+#: C/search.page:44(p)
+msgid "Finds messages where <var>sender</var> matches the From header."
+msgstr "Βρίσκει μηνύματα όπου ο <var>αποστολέας</ var> ταιριάζει με την κεφαλίδα Από."
+
+#: C/search.page:47(input)
+msgid "subject:<placeholder-1/>"
+msgstr "θέμα:<placeholder-1/>"
+
+#: C/search.page:48(p)
+msgid "Finds messages whose subject contains <var>text</var>."
+msgstr "Βρίσκει μηνύματα του οποίου το θέμα περιέχει <var>κείμενο</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 "Βρίσκει μηνύματα όπου ο <var>αποστολέας</ var> ταιριάζει με τις κεφαλίδες Πρός, Κοιν., Κρυφή Κοιν.."
+
+#: 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 "Σαν μια ειδική περίπτωση οι τελεστές <input>κρυφή κοιν.</input>, <input>κοιν.</input>, <input>από</input>, και <input>προς</input> υποστηρίζουν και το <input>εμένα</input> ως επιχείρημά τους, που κάνει αναζήτηση για τη διεύθυνση ηλεκτρονικού ταχυδρομείου του λογαριασμού σας στο κατάλληλο πλαίσιο."
 
 #: C/preferences.page:11(p)
-msgid ""
-"To set preferences in Geary, click the gear menu at the upper right of the "
-"toolbar and choose <gui>Preferences</gui>."
-msgstr ""
-"Για να ορίσετε τις προτιμήσεις στο Geary, πατήστε το μενού με το γρανάζι στα "
-"πάνω δεξιά της εργαλειοθήκης και επιλέξτε <gui>Προτιμήσεις</gui>."
+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 "Η επιλογή <gui>Προτιμήσεις</gui> είναι διαθέσιμη είτε στο μενού εφαρμογών του Geary ή το μενού με το γρανάζι στην επάνω δεξιά γωνία της γραμμής εργαλείων. (Η θέση εξαρτάται από την εγκατάσταση του κελύφους επιφάνειας εργασίας. Για το κέλυφος GNOME και το Unity, το μενού της εφαρμογής είναι διαθέσιμο κοντά στην επάνω αριστερή γωνία της οθόνης.)"
 
-#: C/preferences.page:15(title)
+#: C/preferences.page:17(title)
 msgid "Reading"
 msgstr "Ανάγνωση"
 
-#: C/preferences.page:18(gui)
+#: C/preferences.page:20(gui)
 msgid "Automatically select next message"
 msgstr "Αυτόματη επιλογή επόμενου μηνύματος"
 
-#: C/preferences.page:19(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 ""
-"Όταν αυτή η επιλογή είναι ενεργή, το Geary επιλέγει αυτόματα το τελευταίο "
-"μήνυμα στον φάκελο όταν μπαίνετε στον φάκελο. Επιπλέον, μετά την "
-"αρχειοθέτηση ενός μηνύματος, το Geary επιλέγει αυτόματα ένα γειτονικό μήνυμα."
+#: 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 "Όταν αυτή η επιλογή είναι ενεργή, το Geary επιλέγει αυτόματα το τελευταίο μήνυμα στον φάκελο όταν μπαίνετε στον φάκελο. Επιπλέον, μετά την αρχειοθέτηση ενός μηνύματος, το Geary επιλέγει αυτόματα ένα παρακείμενο μήνυμα."
 
-#: C/preferences.page:24(gui)
+#: C/preferences.page:26(gui)
 msgid "Display conversation preview"
 msgstr "Να εμφανίζεται η προεπισκόπηση συνομιλίας"
 
-#: C/preferences.page:25(p)
-msgid ""
-"Enables message previews in the conversation list. Previews show the first "
-"few lines of each message."
-msgstr ""
-"Ενεργοποιεί τις προεπισκοπήσεις μηνυμάτων στον κατάλογο συνομιλιών. Οι "
-"προεπισκοπήσεις εμφανίζουν τις πρώτες λίγες γραμμές κάθε μηνύματος."
+#: C/preferences.page:27(p)
+msgid "Enables message previews in the conversation list. Previews show the first few lines of each message."
+msgstr "Ενεργοποιεί τις προεπισκοπήσεις μηνυμάτων στον κατάλογο συνομιλιών. Οι προεπισκοπήσεις εμφανίζουν τις πρώτες γραμμές κάθε μηνύματος."
 
-#: C/preferences.page:32(title)
+#: C/preferences.page:34(title)
 msgid "Composer"
 msgstr "Σύνταξη"
 
-#: C/preferences.page:35(gui)
+#: C/preferences.page:37(gui)
 msgid "Enable spell checking"
 msgstr "Ενεργοποίηση ορθογραφικού ελέγχου"
 
-#: C/preferences.page:36(p)
-msgid ""
-"When set, Geary automatically spell checks a message as you write it, "
-"underlying each misspelled word in red."
-msgstr ""
-"Αν οριστεί, το Geary ελέγχει αυτόματα ορθογραφικά ένα μήνυμα καθώς γράφετε, "
-"υπογραμμίζοντας κάθε ανορθόγραφη λέξη με κόκκινο."
+#: 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 "Αν οριστεί, το Geary ελέγχει αυτόματα ορθογραφικά ένα μήνυμα καθώς γράφετε, υπογραμμίζοντας κάθε ανορθόγραφη λέξη με κόκκινο."
 
-#: C/preferences.page:43(title)
+#: C/preferences.page:45(title)
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"
 
-#: C/preferences.page:46(gui)
+#: C/preferences.page:48(gui)
 msgid "Play notification sounds"
 msgstr "Αναπαραγωγή ήχων ειδοποίησης"
 
-#: C/preferences.page:47(p)
+#: C/preferences.page:49(p)
 msgid "When set, Geary plays a sound whenever a new message arrives."
 msgstr "Αν οριστεί, το Geary παίζει έναν ήχο όποτε φτάνει ένα νέο μήνυμα."
 
-#: C/preferences.page:50(gui)
+#: C/preferences.page:52(gui)
 msgid "Show notifications for new mail"
 msgstr "Εμφάνιση ειδοποιήσεων για νέα μηνύματα"
 
-#: C/preferences.page:51(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 ""
-"Αν οριστεί, το Geary εμφανίζει μια <em>ειδοποίηση</em> κάθε φορά που φτάνει "
-"ένα νέο μήνυμα. Οι ειδοποιήσεις εμφανίζονται με έναν τρόπο εξαρτημένου "
-"συστήματος. Στο κέλυφος GNOME, οι ειδοποιήσεις εμφανίζονται στο τέλος της "
-"οθόνης. Στο Ουμπούντου Unity, οι ειδοποιήσεις εμφανίζονται στα πάνω δεξιά "
-"της οθόνης."
+#: 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 "Αν οριστεί, το Geary εμφανίζει μια <em>ειδοποίηση</em> κάθε φορά που φτάνει ένα νέο μήνυμα. Οι ειδοποιήσεις εμφανίζονται με έναν τρόπο εξαρτημένου συστήματος. Στο κέλυφος GNOME, οι ειδοποιήσεις εμφανίζονται στο κάτω μέρος της οθόνης. Στο Ubuntu Unity, οι ειδοποιήσεις εμφανίζονται στο πάνω δεξιά μέρος της οθόνης."
 
 #: C/overview.page:8(title)
 msgid "Overview"
 msgstr "Επισκόπηση"
 
 #: 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 είναι ένας ελαφρύς αναγνώστης αλληλογραφίας για την επιφάνεια "
-"εργασίας <link href=\"http://gnome.org\">GNOME</link>. Δουλεύει με "
-"διακομιστές αλληλογραφίας που υποστηρίζουν το πρωτόκολλο IMAP, "
-"συμπεριλαμβανομένων δημοφιλών υπηρεσιών όπως Gmail, Yahoo Mail και Outlook."
-"com."
+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 είναι μια ελαφρυά εφαρμογή ανάγνωσης αλληλογραφίας για την επιφάνεια εργασίας <link href=\"http://gnome.org\">GNOME</link>. Δουλεύει με διακομιστές αλληλογραφίας που υποστηρίζουν το πρωτόκολλο IMAP, συμπεριλαμβανομένων δημοφιλών υπηρεσιών όπως Gmail, Yahoo Mail και 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 ομαδοποιεί τα μηνύματα αλληλογραφίας σε <em>συνομιλίες</em>. Μια "
-"συνομιλία περιέχει όλα τα μηνύματα σε ένα μοναδικό νήμα συζήτησης."
+msgid "Geary groups mail messages into <em>conversations</em>. A conversation contains all messages in a single thread of discussion."
+msgstr "Το Geary ομαδοποιεί τα μηνύματα αλληλογραφίας σε <em>συνομιλίες</em>. Μια συνομιλία περιέχει όλα τα μηνύματα σε ένα μοναδικό νήμα συζήτησης."
 
 #: C/overview.page:17(p)
 msgid "The main Geary window is divided into several areas:"
@@ -543,141 +481,67 @@
 
 #: C/overview.page:20(title)
 msgid "Folder list"
-msgstr "Κατάλογος φακέλων"
+msgstr "Λίστα φακέλων"
 
 #: 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 ""
-"Ο <em>κατάλογος φακέλων</em> στα αριστερά εμφανίζει όλους τους <em>φακέλους</"
-"em> και τις <em>ετικέτες</em> στον λογαριασμό αλληλογραφίας σας. Το Geary "
-"χρησιμοποιεί τον όρο <em>ετικέτα</em> για οποιονδήποτε φάκελο έχετε "
-"δημιουργήσει για να βοηθήσει την οργάνωση των μηνυμάτων σας. (Η διεπαφή "
-"ιστού Gmail χρησιμοποιεί επίσης αυτόν τον όρο· οι περισσότερες άλλες "
-"υπηρεσίες δεν τον χρησιμοποιούν.)"
+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 "Η <em>λίστα φακέλων</em> στα αριστερά εμφανίζει όλους τους <em>φακέλους</em> και τις <em>ετικέτες</em> στον λογαριασμό αλληλογραφίας σας. Το Geary χρησιμοποιεί τον όρο <em>ετικέτα</em> για οποιονδήποτε φάκελο έχετε δημιουργήσει για να βοηθήσει την οργάνωση των μηνυμάτων σας. (Η διεπαφή ιστού Gmail χρησιμοποιεί επίσης αυτόν τον όρο· οι περισσότερες άλλες υπηρεσίες δεν τον χρησιμοποιούν.)"
 
 #: C/overview.page:28(title)
 msgid "Conversation list"
-msgstr "Κατάλογος συνομιλιών"
+msgstr "Λίστα συνομιλιών"
 
 #: 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 ""
-"Ο <em>κατάλογος συνομιλιών</em> εμφανίζει έναν κατάλογο συνομιλιών στον "
-"επιλεγμένο φάκελο. Οι νεότερες συνομιλίες εμφανίζονται στην κορυφή."
+msgid "The <em>conversation list</em> displays a list of conversations in the selected folder. Newer conversations appear at the top."
+msgstr "Η <em>λίστα συνομιλιών</em> εμφανίζει μια λίστα συνομιλιών στον επιλεγμένο φάκελο. Οι νεότερες συνομιλίες εμφανίζονται στην κορυφή."
 
 #: 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 ""
-"Κάθε όνομα αποστολέα εμφανίζεται έντονος αν υπάρχουν αδιάβαστα μηνύματα από "
-"αυτόν τον αποστολέα. Αν μια συνομιλία έχει περισσότερα από ένα μηνύματα, το "
-"Geary εμφανίζει ένα αριθμό μηνυμάτων στη συνομιλία."
+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 "Κάθε όνομα αποστολέα εμφανίζεται έντονα αν υπάρχουν αδιάβαστα μηνύματα από αυτόν τον αποστολέα. Αν μια συνομιλία έχει περισσότερα από ένα μηνύματα, το Geary εμφανίζει ένα αριθμό μηνυμάτων στη συνομιλία."
 
 #: 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 δεν μεταφορτώνει αυτόματα όλα τα μηνύματα σε όλους τους φακέλους "
-"αλληλογραφίας. Όταν πρωτοεπισκέπτεστε τα εισερχόμενα ή οποιονδήποτε άλλον "
-"φάκελο, το Geary μεταφορτώνει τα 50 πιο πρόσφατα μηνύματα σε αυτόν τον "
-"φάκελο. Για να δείτε περισσότερα μηνύματα, απλά κυλήστε προς τα κάτω τον "
-"κατάλογο συνομιλιών και το Geary θα προσκομίσει περισσότερα μηνύματα "
-"αυτόματα."
+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 δεν κάνει αυτόματη λήψη όλων των μηνυμάτων σε όλους τους φακέλους αλληλογραφίας. Όταν πρωτοεπισκέπτεστε τα εισερχόμενα ή οποιονδήποτε άλλον φάκελο, το Geary κάνει λήψη των 50 πιο πρόσφατων μηνυμάτων σε αυτόν τον φάκελο. Για να δείτε περισσότερα μηνύματα, απλά κυλήστε προς τα κάτω τον κατάλογο συνομιλιών και το Geary θα ανακτήσει περισσότερα μηνύματα αυτόματα."
 
 #: 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 ""
-"Κάποιες εντολές στο Geary μπορούν να δράσουν σε μια ομάδα συνομιλιών. Για να "
-"επιλέξετε πολλές συνομιλίες, κρατήστε πατημένο το πλήκτρο <key>Ctrl</key> "
-"και πατήστε κάθε συνομιλία με τη σειρά της στον κατάλογο συνομιλιών. "
-"Εναλλακτικά, πατήστε την πρώτη συνομιλία σε μια περιοχή, έπειτα κρατήστε "
-"πατημένο το <key>Shift</key> και πατήστε την τελευταία συνομιλία."
+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 "Κάποιες εντολές στο Geary μπορούν να δράσουν σε μια ομάδα συνομιλιών. Για να επιλέξετε πολλές συνομιλίες, κρατήστε πατημένο το πλήκτρο <key>Ctrl</key> και πατήστε κάθε συνομιλία με τη σειρά της στην λίστα συνομιλιών. Εναλλακτικά, πατήστε την πρώτη συνομιλία σε μια περιοχή, έπειτα κρατήστε πατημένο το <key>Shift</key> και πατήστε την τελευταία συνομιλία."
 
 #: C/overview.page:44(title)
 msgid "Message area"
 msgstr "Περιοχή μηνυμάτων"
 
 #: 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 ""
-"Η <em>περιοχή μηνυμάτων</em> εμφανίζει όλα τα μηνύματα στην επιλεγμένη "
-"συνομιλία, με τα πιο παλιά μηνύματα στην κορυφή."
+msgid "The <em>message area</em> displays all messages in the selected conversation, with the oldest message at the top."
+msgstr "Η <em>περιοχή μηνυμάτων</em> εμφανίζει όλα τα μηνύματα στην επιλεγμένη συνομιλία, με τα πιο παλιά μηνύματα στην κορυφή."
 
 #: 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 ""
-"Στα πάνω δεξιά κάθε μηνύματος, το Geary εμφανίζει ένα πτυσσόμενο βέλος που "
-"σας επιτρέπει να ανοίξετε το <em>μενού μηνυμάτων</em> με εντολές που "
-"επιδρούν στο μήνυμα."
+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 "Επάνω δεξιά σε κάθε μήνυμα, το Geary εμφανίζει ένα αναπτυσσόμενο βέλος που σας επιτρέπει να ανοίξετε το <em>μενού μηνυμάτων</em> με εντολές που επιδρούν στο μήνυμα."
 
 #: 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 ""
-"Όταν προβάλετε μια συνομιλία, το Geary συμπτύσσει τα μηνύματα που έχετε ήδη "
-"διαβάσει. Πατήστε τα συνεπτυγμένα μηνύματα για να επεκτείνετε. Πατήστε την "
-"κεφαλίδα ενός επεκταμένου μηνύματος για να το συμπτύξετε."
+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 "Όταν προβάλετε μια συνομιλία, το Geary συμπτύσσει τα μηνύματα που έχετε ήδη διαβάσει. Πατήστε τα συνεπτυγμένα μηνύματα για να τα αναπτύξετε. Πατήστε την κεφαλίδα ενός ανεπτυγμένου μηνύματος για να το συμπτύξετε."
 
 #: 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."
-msgstr ""
-"Όλα τα συνημμένα σε ένα μήνυμα εμφανίζονται στο τέλος του μηνύματος. "
-"Μπορείτε να πατήσετε ένα συνημμένο για να το ανοίξετε."
+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 "Όλα τα συνημμένα σε ένα μήνυμα εμφανίζονται στο τέλος του μηνύματος. Μπορείτε να κάνετε κλικ σε ένα συνημμένο για να το ανοίξετε ή δεξί κλικ για να το αποθηκεύσετε."
+
+#: 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 χρησιμοποιεί το <link href=\"https://secure.gravatar.com/\">Gravatar</link> για να εμφανίσετε ένα άβαταρ για τον αποστολέα κάθε μηνύματος στην επικεφαλίδα του."
 
 #: C/limits.page:11(title)
 msgid "Limitations"
 msgstr "Περιορισμοί"
 
 #: 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 είναι ακόμα στην πρώιμη ανάπτυξη. Το Geary υποστηρίζει IMAP και "
-"έχει δοκιμαστεί με Gmail, Yahoo και τον ελεύθερο διακομιστή αλληλογραφίας "
-"Dovecot. Πειραματική υποστήριξη παρέχεται για το Outlook.com. Το Geary "
-"ενδέχεται να μην δουλεύει ακόμα καλά με κάποιους διακομιστές IMAP. Αυτήν την "
-"περίοδο στο Geary λείπουν ακόμα πολυάριθμά γνωρίσματα συμπεριλαμβανόμενης "
-"της λειτουργίας χωρίς σύνδεση."
+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 είναι ακόμα στην πρώιμη ανάπτυξη. Το Geary υποστηρίζει IMAP και έχει δοκιμαστεί με Gmail, Yahoo και τον ελεύθερο διακομιστή αλληλογραφίας Dovecot. Πειραματική υποστήριξη παρέχεται για το Outlook.com. Το Geary ενδέχεται να μην δουλεύει ακόμα καλά με κάποιους διακομιστές IMAP. Αυτήν την περίοδο στο Geary λείπουν ακόμα πολυάριθμες λειτουργίες συμπεριλαμβανόμενης της λειτουργίας χωρίς σύνδεση."
 
 #: 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=\"http://redmine.yorba.org/projects/geary/"
-"wiki\">Redmine page</link>."
-msgstr ""
-"Για να μάθετε περισσότερα για τα γνωρίσματα στα οποία δουλεύουμε και το "
-"μέλλον του Geary, παρακαλούμε επισκεφτείτε τη <link href=\"http://redmine."
-"yorba.org/projects/geary/wiki\">σελίδα Redmine</link> του Geary."
+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 "Για να μάθετε περισσότερα για τις λειτουργίες στις οποίες δουλεύουμε και το μέλλον του Geary, παρακαλούμε επισκεφτείτε τη <link href=\"https://wiki.gnome.org/Apps/Geary\">σελίδα wiki</link> του Geary."
 
 #: C/label.page:10(title)
 msgid "Label or move a conversation"
@@ -688,66 +552,36 @@
 msgstr "Ονομάστε μια συνομιλία"
 
 #: 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 σας επιτρέπει να εφαρμόσετε μία ή περισσότερες <em>ετικέτες</em> "
-"για κάθε συνομιλία. Οι ετικέτες Geary αντιστοιχούν σε Gmail, ή σε κοινούς "
-"φακέλους σε άλλες υπηρεσίες αλληλογραφίας."
+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 σας επιτρέπει να εφαρμόσετε μία ή περισσότερες <em>ετικέτες</em> για κάθε συνομιλία. Οι ετικέτες Geary αντιστοιχούν στου Gmail, ή σε κοινούς φακέλους σε άλλες υπηρεσίες αλληλογραφίας."
 
 #: C/label.page:15(p)
-msgid ""
-"To label one or more conversations, first select the conversation(s), then "
-"do either of the following:"
-msgstr ""
-"Για να ονομάσετε μία ή περισσότερες συνομιλίες, επιλέξτε πρώτα τις "
-"συνομιλίες, έπειτα κάντε ένα από τα ακόλουθα:"
+msgid "To label one or more conversations, first select the conversation(s), then do either of the following:"
+msgstr "Για να ονομάσετε μία ή περισσότερες συνομιλίες, επιλέξτε πρώτα τις συνομιλίες, έπειτα κάντε ένα από τα ακόλουθα:"
 
 #: 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 ""
-"Πατήστε στο πλήκτρο <gui>ετικέτα</gui> στην εργαλειοθήκη και επιλέξτε μια "
-"ετικέτα από το τελικό πτυσσόμενο μενού."
+msgid "Click the <gui>Label</gui> button on the toolbar and select a label from the resulting drop-down menu."
+msgstr "Πατήστε στο πλήκτρο <gui>ετικέτα</gui> στην εργαλειοθήκη και επιλέξτε μια ετικέτα από το τελικό αναπτυσσόμενο μενού."
 
 #: 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 ""
-"Κρατήστε πατημένο το πλήκτρο <key>Ctrl</key> και μεταφέρτε τις συνομιλίες "
-"από τον κατάλογο συνομιλιών στην ετικέτα στην πλευρική στήλη."
+msgid "Hold down the <key>Ctrl</key> key and drag the conversation(s) from the conversation list to the label in the sidebar."
+msgstr "Κρατήστε πατημένο το πλήκτρο <key>Ctrl</key> και μεταφέρτε τις συνομιλίες από τον κατάλογο συνομιλιών στην ετικέτα της πλευρικής στήλης."
 
 #: C/label.page:25(title)
 msgid "Move a conversation to a folder or label"
 msgstr "Μετακίνηση μιας συνομιλίας σε έναν φάκελο ή ετικέτα"
 
 #: 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 ""
-"Για να μετακινήσετε μία ή περισσότερες συνομιλίες σε έναν φάκελο ή ετικέτα, "
-"επιλέξτε πρώτα τις συνομιλίες, έπειτα κάντε ένα από τα παρακάτω:"
+msgid "To move one or more conversations to a folder or label, first select the conversation(s), then do either of the following:"
+msgstr "Για να μετακινήσετε μία ή περισσότερες συνομιλίες σε έναν φάκελο ή ετικέτα, επιλέξτε πρώτα τις συνομιλίες, έπειτα κάντε ένα από τα παρακάτω:"
 
 #: 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 ""
-"Πατήστε στο πλήκτρο <gui>Μετακίνηση</gui> στην εργαλειοθήκη και επιλέξτε "
-"έναν φάκελο ή μια ετικέτα από το τελικό πτυσσόμενο μενού."
+msgid "Click the <gui>Move</gui> button on the toolbar and select a folder or label from the resulting drop-down menu."
+msgstr "Πατήστε στο πλήκτρο <gui>Μετακίνηση</gui> στην εργαλειοθήκη και επιλέξτε έναν φάκελο ή μια ετικέτα από το τελικό αναπτυσσόμενο μενού."
 
 #: C/label.page:31(p)
-msgid ""
-"Drag the conversation(s) from the conversation list to the folder or label "
-"in the sidebar."
-msgstr ""
-"Μεταφέρτε τις συνομιλίες από τον κατάλογο συνομιλιών στον φάκελο ή στην "
-"ετικέτα στην πλευρική στήλη."
+msgid "Drag the conversation(s) from the conversation list to the folder or label in the sidebar."
+msgstr "Μεταφέρτε τις συνομιλίες από τον κατάλογο συνομιλιών στον φάκελο ή στην ετικέτα της πλευρικής στήλης."
 
 #. 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.
@@ -776,139 +610,110 @@
 msgstr "Νομίζετε ότι έχετε βρει ένα σφάλμα;"
 
 #: C/bugs.page:9(p)
-msgid ""
-"If you suspect you've found a bug in Geary, follow these steps to report it:"
-msgstr ""
-"Αν υποψιάζεστε ότι έχετε βρει ένα σφάλμα στο Geary, ακολουθήστε αυτά τα "
-"βήματα για να το αναφέρετε:"
+msgid "If you suspect you've found a bug in Geary, follow these steps to report it:"
+msgstr "Αν υποψιάζεστε ότι έχετε βρει ένα σφάλμα στο Geary, ακολουθήστε αυτά τα βήματα για να το αναφέρετε:"
 
 #: C/bugs.page:11(p)
-msgid ""
-"Search Geary's Redmine<link href=\"http://redmine.yorba.org/projects/geary/"
-"issues\"> issue tracker </link>to see if someone else has reported the bug."
-msgstr ""
-"Αναζητήστε το Redmine του Geary <link href=\"http://redmine.yorba.org/"
-"projects/geary/issues\">ανιχνευτής θεμάτων</link> για να δείτε αν κάποιος "
-"άλλος έχει αναφέρει το σφάλμα."
-
-#: C/bugs.page:12(p)
-msgid ""
-"Don't see your bug listed? Congratulations! You've found a new bug. To "
-"create an bug report, create an account on Redmine and create a new issue. "
-"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 ""
-"Δεν βλέπετε το σφάλμα σας καταχωρισμένο; Συγχαρητήρια! Έχετε βρεί ένα νέο "
-"σφάλμα. Για να δημιουργήσετε μια αναφορά σφάλματος, δημιουργήστε έναν "
-"λογαριασμό στο Redmine και δημιουργήστε ένα νέο θέμα. Να είστε όσο "
-"περισσότερο συγκεκριμένοι μπορείτε και να περιγράψετε τα βήματα για την "
-"αναπαραγωγή του. Μην ξεχάσετ‎ε να συμπεριλάβετε λεπτομέρειες για το "
-"λειτουργικό σας σύστημα και ποια έκδοση του Geary τρέχετε."
+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 "Αναζητήστε στην <link href=\"https://bugzilla.gnome.org/browse.cgi?product=geary\">βάση δεδομένων σφαλμάτων</link> του Geary για να δείτε αν κάποιος άλλος έχει αναφέρει το σφάλμα."
 
 #: C/bugs.page:13(p)
-msgid ""
-"For general inquiries, please join the <link href=\"http://lists.yorba.org/"
-"cgi-bin/mailman/listinfo/geary\"> Geary mailing list</link>."
-msgstr ""
-"Για γενικές αναζητήσεις, παρακαλούμε συμμετάσχετε στον <link href=\"http://"
-"lists.yorba.org/cgi-bin/mailman/listinfo/geary\">κατάλογο αλληλογραφίας "
-"Geary</link>."
+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 "Δεν βλέπετε το σφάλμα σας καταχωρισμένο; Συγχαρητήρια! Έχετε βρεί ένα νέο σφάλμα. Για να δημιουργήσετε μια αναφορά σφάλματος, δημιουργήστε έναν λογαριασμό στο Bugzilla του GNOME και <link href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=geary\">υποβάλετε ένα νέο σφάλμα</link>. Να είστε όσο περισσότερο συγκεκριμένοι μπορείτε και να περιγράψετε τα βήματα για την αναπαραγωγή του. Μην ξεχάσετε να συμπεριλάβετε λεπτομέρειες για το λειτουργικό σας σύστημα και ποια έκδοση του Geary εκτελείτε."
+
+#: 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 "Για γενικές αναζητήσεις, παρακαλούμε συμμετάσχετε στην <link href=\"https://mail.gnome.org/mailman/listinfo/geary-list\">λίστα αλληλογραφίας Geary</link>."
 
 #: C/archive.page:10(title)
 msgid "Delete or archive a message"
 msgstr "Διαγραφή ή αρχειοθέτηση μηνύματος"
 
 #: 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 ""
-"Όταν χρησιμοποιείτε το Geary με έναν λογαριασμό Gmail, το Geary σας "
-"επιτρέπει να <em>αρχειοθετείτε</em> μηνύματα. Το πλήκτρο εργαλειοθήκης "
-"<gui>Αρχειοθήκη</gui> αρχειοθετεί τις επιλεγμένες συνομιλίες. Τα "
-"αρχειοθετημένα μηνύματα εμφανίζονται στον φάκελο <gui>Όλη η αλληλογραφία</"
-"gui>."
+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 "Όταν χρησιμοποιείτε το Geary με έναν λογαριασμό Gmail, το Geary σας επιτρέπει να <em>αρχειοθετείτε</em> μηνύματα. Το πλήκτρο εργαλειοθήκης <gui>Αρχειοθήκη</gui>, αρχειοθετεί τις επιλεγμένες συνομιλίες. Τα αρχειοθετημένα μηνύματα εμφανίζονται στον φάκελο <gui>Όλη η αλληλογραφία</gui>."
 
 #: C/archive.page:16(p)
-msgid ""
-"With other mail servers, you can delete but not archive messages. To delete "
-"one or more conversations, select them and press the <gui>Delete</gui> "
-"button on the toolbar."
-msgstr ""
-"Με άλλους διακομιστές αλληλογραφίας, μπορείτε να διαγράψετε αλλά όχι να "
-"αρχειοθετήσετε μηνύματα. Για να διαγράψετε μία ή περισσότερες συνομιλίες, "
-"επιλέξτε τες και πατήστε το πλήκτρο <gui>Διαγραφή</gui> στην εργαλειοθήκη."
+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 "Με άλλους διακομιστές αλληλογραφίας, μπορείτε να στείλετε στα απορρίματα ή να διαγράψετε, αλλά όχι να αρχειοθετήσετε, μηνύματα. Για να μετακινήσετε μία ή περισσότερες συνομιλίες στον φάκελο<gui>Απορρίματα</gui>, επιλέξτε και πατήστε το κουμπί<gui>Απορρίματα</gui> στη γραμμή εργαλείων. Για να διαγράψετε οριστικά τις συζητήσεις, κρατήστε πατημένο το πλήκτρο <key>Shift</key> και πιέστε το κουμπί <gui>Delete</gui> που εμφανίζεται στη θέση του κουμπιού <gui>Απορρίματα<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 "Η διαγραφή δεν είναι διαθέσιμη από κάθε φάκελο όπως η αναζήτηση. Η διαγραφή δεν είναι επίσης διαθέσιμη για το Gmail. Για το Gmail, τα <gui>Απορρίματα</gui> θα μετακινήσουν τα μηνύματα στο φάκελο απορριμάτων στον διακομιστή, όπου ο χρήστης μπορεί στη συνέχεια να τα διαγράψει χειροκίνητα. Ο διακομιστής θα αφαιρέσει αυτόματα μηνύματα που στάλθηκαν στα απορρίματα μετά από 30 ημέρες."
 
 #: C/accounts.page:13(title)
 msgid "Adding accounts"
 msgstr "Προσθήκη λογαριασμών"
 
 #: 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 ""
-"Την πρώτη φορά που ξεκινάτε το Geary, θα σας ζητηθεί να προσθέσετε έναν "
-"λογαριασμό αλληλογραφίας. Σε αυτήν την οθόνη, επιλέξτε αν ο λογαριασμός σας "
-"είναι Gmail, Yahoo, Outlook.com, ή άλλος. Για άλλους τύπους λογαριασμών, θα "
-"χρειαστεί να εισάγετε τις ρυθμίσεις σύνδεσης IMAP και SMTP χειροκίνητα."
+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 "Την πρώτη φορά που ξεκινάτε το Geary, θα σας ζητηθεί να προσθέσετε έναν λογαριασμό αλληλογραφίας. Σε αυτήν την οθόνη, επιλέξτε αν ο λογαριασμός σας είναι Gmail, Yahoo, Outlook.com, ή άλλος. Για άλλους τύπους λογαριασμών, θα χρειαστεί να εισάγετε τις ρυθμίσεις σύνδεσης IMAP και SMTP χειροκίνητα."
 
 #: C/accounts.page:19(p)
-msgid ""
-"Additional accounts can be added from the Accounts dialog. Click Accounts in "
-"the Gear menu (or press <keyseq><key>Ctrl</key><key>M</key></keyseq>) to "
-"open the Accounts dialog. To add an account, click the + button."
-msgstr ""
-"Πρόσθετοι λογαριασμοί μπορούν να προστεθούν από τον διάλογο λογαριασμοί. "
-"Πατήστε λογαριασμοί στο μενού Gear (ή πατήστε <keyseq><key>Ctrl</key><key>M</"
-"key></keyseq>) για να ανοίξετε τον διάλογο λογαριασμοί. Για να προσθέσετε "
-"έναν λογαριασμό, πατήστε το πλήκτρο +."
+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 "Πρόσθετοι λογαριασμοί μπορούν να προστεθούν από το παράθυρο διαλόγου Λογαριασμοί. Η επιλογή <gui>Λογαριασμοί</ gui> είναι διαθέσιμη είτε στο μενού εφαρμογών Geary ή στο μενού με το γρανάζι στην επάνω δεξιά γωνία της γραμμής εργαλείων. (Η θέση εξαρτάται από την εγκατάσταση του κελύφους επιφάνειας εργασίας. Για το κέλυφος GNOME και Unity, το μενού της εφαρμογής είναι διαθέσιμο κοντά στην επάνω αριστερή γωνία της οθόνης.) Εναλλακτικά, το <keyseq><key>Ctrl</key><key>M</key></keyseq> θα ανοίξει το παράθυρο διαλόγου Λογαριασμοί. Για να προσθέσετε ένα λογαριασμό, πατήστε το κουμπί +."
 
-#: C/accounts.page:25(title)
+#: C/accounts.page:28(title)
 msgid "Editing existing accounts"
 msgstr "Επεξεργασία υπαρχόντων λογαριασμών"
 
-#: C/accounts.page:27(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 ""
-"Από τον διάλογο λογαριασμών, επιλέξτε έναν λογαριασμό και πατήστε το "
-"εικονίδιο μολυβιού για να αλλάξετε ποικίλες ρυθμίσεις. Παρακαλούμε σημειώστε "
-"ότι το Geary δεν μπορεί να αλλάξει τις ρυθμίσεις διακομιστή σε έναν "
-"υπάρχοντα λογαριασμό. Αν χρειαστείτε να αλλάξετε τον διακομιστή σας IMAP ή "
-"SMTP, θα χρειαστείτε να διαγράψετε τον λογαριασμό και να τον ξαναπροσθέσετε."
-
-#: C/accounts.page:31(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 ""
-"Για να αλλάξετε τη σειρά που εμφανίζονται οι λογαριασμοί στον κατάλογο "
-"φακέλων, μεταφέρτε τους λογαριασμούς στον διάλογο λογαριασμών με την "
-"επιθυμητή σειρά."
-
-#: C/accounts.page:37(title)
+#: 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 "Από τον διάλογο λογαριασμών, επιλέξτε έναν λογαριασμό και πατήστε το εικονίδιο μολυβιού για να αλλάξετε ποικίλες ρυθμίσεις. Παρακαλούμε σημειώστε ότι το Geary δεν μπορεί να αλλάξει τις ρυθμίσεις διακομιστή σε έναν υπάρχοντα λογαριασμό. Αν χρειαστείτε να αλλάξετε τον διακομιστή σας IMAP ή SMTP, θα χρειαστείτε να διαγράψετε τον λογαριασμό και να τον ξαναπροσθέσετε."
+
+#: 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 "Για να αλλάξετε τη σειρά που εμφανίζονται οι λογαριασμοί στην λίστα φακέλων, μεταφέρτε τους λογαριασμούς στον διάλογο λογαριασμών με την επιθυμητή σειρά."
+
+#: C/accounts.page:37(p)
+msgid "There are some advanced options available when editing accounts:"
+msgstr "Υπάρχουν κάποιες προηγμένες επιλογές που είναι διαθέσιμες κατά την επεξεργασία των λογαριασμών:"
+
+#: 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 "Το πλαίσιο ελέγχου <gui>Αποθήκευση απεσταλμένων</gui> ελέγχει αν το Geary θα προωθήσει με επιτυχία τα απεσταλμένα μηνύματα στον φάκελο <gui>Απεσταλμένων</gui> του λογαριασμού σας. Για τους λογαριασμούς Gmail, αυτό συμβαίνει αυτόματα. Το Yahoo και ορισμένοι άλλοι πελάτες μπορούν να ρυθμιστούν για να γίνει αυτό αυτόματα. Για άλλους λογαριασμούς, αν απενεργοποιήσετε αυτή τη ρύθμιση, μπορεί να μην είστε σε θέση, να δείτε τα μηνύματα που έχετε στείλει."
+
+#: 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 "Η αναπτυσσόμενη <gui>Λήψη αλληλογραφίας</gui> σας επιτρέπει να ρυθμίσετε πόσα μηνύματα αλληλογραφίας θα κρατήσει το Geary τοπικά. Το Geary μπορεί να χρησιμοποιήσει μόνο μηνύματα σε τοπικό επίπεδο κατα την αναζήτηση και διαμόρφωση συνομιλιών."
+
+#: C/accounts.page:53(title)
 msgid "Removing accounts"
 msgstr "Αφαίρεση λογαριασμών"
 
-#: C/accounts.page:39(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 ""
-"Για να διαγράψετε έναν λογαριασμό, ανοίξτε τον διάλογο λογαριασμών, επιλέξτε "
-"τον λογαριασμό και πατήστε το πλήκτρο -. Το Geary θα διαγράψει όλες τις "
-"πληροφορίες που σχετίζονται με τον λογαριασμό."
+#: 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 "Για να διαγράψετε έναν λογαριασμό, ανοίξτε τον διάλογο λογαριασμών, επιλέξτε τον λογαριασμό και πατήστε το πλήκτρο -. Το Geary θα διαγράψει όλες τις πληροφορίες που σχετίζονται με τον λογαριασμό."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
 #: C/accounts.page:0(None)
 msgid "translator-credits"
-msgstr "Δημήτρης Σπίγγος <[e-mail]>, 2014"
+msgstr ""
+"Δημήτρης Σπίγγος <[e-mail]>, 2014\n"
+"Μαρία Μαυρίδου <[e-mail]>, 2014"
+
+#~ msgid ""
+#~ "To set preferences in Geary, click the gear menu at the upper right of "
+#~ "the toolbar and choose <gui>Preferences</gui>."
+#~ msgstr ""
+#~ "Για να ορίσετε τις προτιμήσεις στο Geary, πατήστε το μενού με το γρανάζι "
+#~ "στα πάνω δεξιά της εργαλειοθήκης και επιλέξτε <gui>Προτιμήσεις</gui>."
+
+#~ msgid ""
+#~ "With other mail servers, you can delete but not archive messages. To "
+#~ "delete one or more conversations, select them and press the <gui>Delete</"
+#~ "gui> button on the toolbar."
+#~ msgstr ""
+#~ "Με άλλους διακομιστές αλληλογραφίας, μπορείτε να διαγράψετε αλλά όχι να "
+#~ "αρχειοθετήσετε μηνύματα. Για να διαγράψετε μία ή περισσότερες συνομιλίες, "
+#~ "επιλέξτε τες και πατήστε το πλήκτρο <gui>Διαγραφή</gui> στην εργαλειοθήκη."
+
+#~ msgid ""
+#~ "Additional accounts can be added from the Accounts dialog. Click Accounts "
+#~ "in the Gear menu (or press <keyseq><key>Ctrl</key><key>M</key></keyseq>) "
+#~ "to open the Accounts dialog. To add an account, click the + button."
+#~ msgstr ""
+#~ "Πρόσθετοι λογαριασμοί μπορούν να προστεθούν από τον διάλογο λογαριασμοί. "
+#~ "Πατήστε λογαριασμοί στο μενού Gear (ή πατήστε <keyseq><key>Ctrl</"
+#~ "key><key>M</key></keyseq>) για να ανοίξετε τον διάλογο λογαριασμοί. Για "
+#~ "να προσθέσετε έναν λογαριασμό, πατήστε το πλήκτρο +."

=== modified file 'help/es/es.po'
--- help/es/es.po	2014-12-29 05:40:07 +0000
+++ help/es/es.po	2015-07-10 22:31:23 +0000
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the geary package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # Daniel Mustieles <[e-mail]>, 2014.
+# Adolfo Jayme Barrientos <[e-mail]>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
-"POT-Creation-Date: 2014-09-16 17:03+0000\n"
-"PO-Revision-Date: 2014-09-22 13:46+0200\n"
-"Last-Translator: Daniel Mustieles <[e-mail]>\n"
-"Language-Team: Español; Castellano <[e-mail]>\n"
+"POT-Creation-Date: 2014-12-21 05:55+0000\n"
+"PO-Revision-Date: 2014-12-21 04:06-0600\n"
+"Last-Translator: Adolfo Jayme Barrientos <[e-mail]>\n"
+"Language-Team: Español; Castellano <>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,11 +93,19 @@
 "del editor, y suéltelo en los campos de texto en la parte superior de la "
 "ventana o en la barra de herramientas inferior."
 
-#: C/write.page:37(title)
+#: C/write.page:35(p)
+msgid ""
+"A number of keyboard shortcuts are available in the composer; see <link xref="
+"\"shortcuts#composer\"/> for details."
+msgstr ""
+"Hay disponibles varios atajos de teclado en la ventana de redacción; "
+"consulte <link xref=\"shortcuts#composer\"/> para obtener más información."
+
+#: C/write.page:39(title)
 msgid "Drafts"
 msgstr "Borradores"
 
-#: C/write.page:39(p)
+#: C/write.page:41(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 "
@@ -107,7 +116,7 @@
 "editor sin enviarlo, Geary le preguntará si quiere mantener o descartar el "
 "borrador."
 
-#: C/write.page:42(p)
+#: C/write.page:44(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."
@@ -116,7 +125,7 @@
 "lista de carpetas, elija el mensaje y pulse en «Editar el borrador» en el "
 "visor de mensajes."
 
-#: C/write.page:45(p)
+#: C/write.page:47(p)
 msgid "Geary deletes the draft when you send the message."
 msgstr "Geary eliminará el borrador cuando envíe el mensaje."
 
@@ -265,7 +274,7 @@
 msgid "Unstar"
 msgstr "Quitar el destaque"
 
-#: C/shortcuts.page:48(key)
+#: C/shortcuts.page:48(key) C/shortcuts.page:126(key)
 msgid "D"
 msgstr "D"
 
@@ -308,6 +317,11 @@
 #: 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)
+#: C/shortcuts.page:114(key) C/shortcuts.page:118(key)
+#: C/shortcuts.page:126(key) C/shortcuts.page:134(key)
+#: C/shortcuts.page:138(key) C/shortcuts.page:142(key)
+#: C/shortcuts.page:146(key) C/shortcuts.page:150(key)
+#: C/shortcuts.page:154(key)
 msgid "Ctrl"
 msgstr "Ctrl"
 
@@ -391,6 +405,99 @@
 msgid "Shift"
 msgstr "Mayús"
 
+#: C/shortcuts.page:109(title)
+#| msgid "Keyboard shortcuts"
+msgid "Composer shortcuts"
+msgstr "Atajos de teclado de la ventana de redacción"
+
+#: C/shortcuts.page:110(p)
+msgid "These shortcuts are active whenever focus is in a composer."
+msgstr ""
+"Estas combinaciones de teclas se activan siempre que la ventana de redacción "
+"esté enfocada."
+
+#: C/shortcuts.page:113(p)
+msgid "Quote text"
+msgstr "Citar texto"
+
+#: C/shortcuts.page:114(key)
+msgid "]"
+msgstr "]"
+
+#: C/shortcuts.page:117(p)
+msgid "Unquote text"
+msgstr "Eliminar cita de texto"
+
+#: C/shortcuts.page:118(key)
+msgid "["
+msgstr "["
+
+#: C/shortcuts.page:121(p)
+#| msgid "Close composer window"
+msgid "Close composer"
+msgstr "Cerrar la ventana de redacción"
+
+#: C/shortcuts.page:122(p)
+#| msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq> or <key>N</key>"
+msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq> or <key>Esc</key>"
+msgstr "<keyseq><key>Ctrl</key><key>W</key></keyseq> o <key>Esc</key>"
+
+#: C/shortcuts.page:125(p)
+msgid "Detach composer"
+msgstr "Desacoplar la ventana de redacción"
+
+#: C/shortcuts.page:130(p)
+msgid "These shortcuts are only active in composers in rich text mode."
+msgstr ""
+
+#: C/shortcuts.page:133(p)
+msgid "Bold text"
+msgstr "Texto en negritas"
+
+#: C/shortcuts.page:134(key)
+msgid "B"
+msgstr "B"
+
+#: C/shortcuts.page:137(p)
+msgid "Italicize text"
+msgstr "Texto en cursiva"
+
+#: C/shortcuts.page:138(key)
+msgid "I"
+msgstr "I"
+
+#: C/shortcuts.page:141(p)
+msgid "Underline text"
+msgstr "Subrayar el texto"
+
+#: C/shortcuts.page:142(key)
+msgid "U"
+msgstr "U"
+
+#: C/shortcuts.page:145(p)
+msgid "Strike text"
+msgstr "Tachar el texto"
+
+#: C/shortcuts.page:146(key)
+msgid "K"
+msgstr "K"
+
+#: C/shortcuts.page:149(p)
+msgid "Insert a link"
+msgstr "Insertar un enlace"
+
+#: C/shortcuts.page:150(key)
+msgid "L"
+msgstr "L"
+
+#: C/shortcuts.page:153(p)
+msgid "Remove formatting"
+msgstr "Eliminar el formato"
+
+#: C/shortcuts.page:154(key)
+msgid "Space"
+msgstr "Espacio"
+
 #: C/search.page:10(title)
 msgid "Search"
 msgstr "Búsqueda"
@@ -402,12 +509,20 @@
 "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 puede realizar búsquedas de texto completo por cada cuenta. Para "
+"comenzar una búsqueda, seleccione una carpeta asociada con la cuenta que "
+"quiera buscar. Luego, pulse en el cuadro de búsqueda ubicado en la barra de "
+"herramientas (o bien, presione <keyseq><key>Ctrl</key><key>S</key></keyseq>) "
+"y comience a escribir. Los resultados aparecerán tras una breve pausa."
 
 #: 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 búsqueda de texto completo incluye texto del correo electrónico, "
+"direcciones (remitente, destinatario y CC), asuntos y nombres de archivos "
+"adjuntos."
 
 #: C/search.page:19(p)
 msgid ""
@@ -426,7 +541,7 @@
 
 #: C/search.page:27(var)
 msgid "filename"
-msgstr ""
+msgstr "filename"
 
 #: C/search.page:27(input)
 msgid "attachment:<placeholder-1/>"
@@ -578,7 +693,7 @@
 
 #: C/overview.page:8(title)
 msgid "Overview"
-msgstr ""
+msgstr "Información general"
 
 #: C/overview.page:10(p)
 msgid ""
@@ -587,6 +702,10 @@
 "protocol, including popular services such as Gmail, Yahoo Mail, and Outlook."
 "com."
 msgstr ""
+"Geary es un lector de correo electrónico ligero para el escritorio <link "
+"href=\"http://gnome.org\">GNOME</link>. Funciona con cualquier servidor de "
+"correo electrónico que admita el protocolo IMAP, incluyendo servicios "
+"populares como Gmail, Yahoo Mail y Outlook.com."
 
 #: C/overview.page:14(p)
 msgid ""
@@ -674,6 +793,9 @@
 "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 ""
+"Los archivos adjuntos de un mensaje aparecerán en la parte inferior de este. "
+"Pulse en un archivo adjunto para abrirlo o use el botón secundario del ratón "
+"para guardarlo."
 
 #: C/overview.page:52(p)
 msgid ""
@@ -715,34 +837,46 @@
 "labels correspond to labels in Gmail, or ordinary folders in other mail "
 "services."
 msgstr ""
+"Geary le permite aplicar una o más <em>etiquetas</em> a cada conversación. "
+"Las etiquetas de Geary corresponden a las etiquetas de Gmail o a las "
+"carpetas en otros servicios de correo electrónico."
 
 #: C/label.page:15(p)
 msgid ""
 "To label one or more conversations, first select the conversation(s), then "
 "do either of the following:"
 msgstr ""
+"Para etiquetar una o más conversaciones, selecciónelas y siga uno de los "
+"procedimientos descritos a continuación:"
 
 #: 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 ""
+"Pulse en el botón <gui>Etiquetar</gui> de la barra de herramientas y "
+"seleccione una de las etiquetas disponibles en el menú que aparecerá."
 
 #: 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 ""
+"Mantenga presionada la tecla <key>Ctrl</key> y arrastre las conversaciones "
+"de la lista de conversaciones hasta la etiqueta de la barra lateral que "
+"prefiera."
 
 #: C/label.page:25(title)
 msgid "Move a conversation to a folder or label"
-msgstr ""
+msgstr "Mover una conversación a una carpeta o etiqueta"
 
 #: 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 ""
+"Para mover una o más conversaciones a una carpeta o etiqueta, selecciónelas "
+"y siga uno de los procedimientos descritos a continuación:"
 
 #: C/label.page:29(p)
 msgid ""
@@ -764,7 +898,7 @@
 
 #: C/index.page:5(title)
 msgid "<media type=\"image\" src=\"figures/geary.svg\"/> Geary"
-msgstr ""
+msgstr "<media type=\"image\" src=\"figures/geary.svg\"/> Geary"
 
 #: C/index.page:9(title)
 msgid "Introduction"

=== modified file 'help/it/it.po'
--- help/it/it.po	2014-10-02 02:02:09 +0000
+++ help/it/it.po	2015-07-10 22:31:23 +0000
@@ -1,15 +1,15 @@
 # Italian translation for geary.
 # Copyright (C) 2014 geary's COPYRIGHT HOLDER
 # This file is distributed under the same license as the geary package.
-# Federico Bruni <[e-mail]>, 2014.
+# Federico Bruni <[e-mail]>, 2014, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: geary master\n"
-"POT-Creation-Date: 2014-04-05 05:18+0000\n"
-"PO-Revision-Date: 2014-04-05 16:03+0200\n"
+"Project-Id-Version: geary help master\n"
+"POT-Creation-Date: 2015-02-24 05:56+0000\n"
+"PO-Revision-Date: 2015-02-25 16:53+0100\n"
 "Last-Translator: Federico Bruni <[e-mail]>\n"
-"Language-Team: Italiano < [e-mail]>\n"
+"Language-Team: Italiano <[e-mail]>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,11 +89,28 @@
 "rilasciarlo sui campi testuali in cima alla finestra o sulla barra degli "
 "strumenti in basso."
 
-#: C/write.page:37(title)
+#: C/write.page:35(p)
+msgid ""
+"A number of keyboard shortcuts are available in the composer; see <link xref="
+"\"shortcuts#composer\"/> for details."
+msgstr ""
+"Sono disponibili varie scorciatoie da tastiera nella finestra di "
+"composizione, come è spiegato dettagliatamente in <link xref="
+"\"shortcuts#composer\"/>."
+
+#: C/write.page:37(p)
+msgid ""
+"You may specify a signature to be inserted into the composer in the <link "
+"xref=\"accounts\"/> dialog."
+msgstr ""
+"Si può indicare una firma da inserire nella finestra di composizione nelle "
+"opzioni <link xref=\"accounts\"/>."
+
+#: C/write.page:42(title)
 msgid "Drafts"
 msgstr "Bozze"
 
-#: C/write.page:39(p)
+#: C/write.page:44(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 "
@@ -103,16 +120,16 @@
 "automaticamente il messaggio mentre lo si scrive. Se si chiude il "
 "compositore senza inviare, Geary chiede se conservare la bozza o scartarla."
 
-#: C/write.page:42(p)
+#: C/write.page:47(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 ""
 "Per modificare una bozza esistente, entrare nella cartella Bozze nell'elenco "
-"delle cartelle, selezionare il messaggio e cliccare \"Modifica bozza\" nel "
-"visualizzatore del messaggio."
+"delle cartelle, selezionare il messaggio e fare clic su \"Modifica bozza\" "
+"nel visualizzatore del messaggio."
 
-#: C/write.page:45(p)
+#: C/write.page:50(p)
 msgid "Geary deletes the draft when you send the message."
 msgstr "Geary elimina la bozza quando il messaggio viene inviato."
 
@@ -156,8 +173,8 @@
 "conversation list."
 msgstr ""
 "Geary contrassegna automaticamente i messaggi come letti quando vengono "
-"letti. Per segnare manualmente una conversazione come letta o non letta "
-"cliccare l'icona del cerchio nell'elenco delle conversazioni."
+"letti. Per segnare manualmente una conversazione come letta o non letta fare "
+"clic sull'icona del cerchio nell'elenco delle conversazioni."
 
 #: C/star.page:22(p)
 msgid ""
@@ -261,7 +278,7 @@
 msgid "Unstar"
 msgstr "Non speciale"
 
-#: C/shortcuts.page:48(key)
+#: C/shortcuts.page:48(key) C/shortcuts.page:126(key)
 msgid "D"
 msgstr "D"
 
@@ -304,6 +321,11 @@
 #: 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)
+#: C/shortcuts.page:114(key) C/shortcuts.page:118(key)
+#: C/shortcuts.page:126(key) C/shortcuts.page:134(key)
+#: C/shortcuts.page:138(key) C/shortcuts.page:142(key)
+#: C/shortcuts.page:146(key) C/shortcuts.page:150(key)
+#: C/shortcuts.page:154(key)
 msgid "Ctrl"
 msgstr "Ctrl"
 
@@ -387,6 +409,103 @@
 msgid "Shift"
 msgstr "Maiusc"
 
+#: C/shortcuts.page:109(title)
+#| msgid "Keyboard shortcuts"
+msgid "Composer shortcuts"
+msgstr "Scorciatoie della finestra di composizione"
+
+#: C/shortcuts.page:110(p)
+msgid "These shortcuts are active whenever focus is in a composer."
+msgstr ""
+"Queste scorciatoie da tastiera sono attive quando si lavora nella finestra "
+"di composizione."
+
+#: C/shortcuts.page:113(p)
+msgid "Quote text"
+msgstr "Cita testo"
+
+#: C/shortcuts.page:114(key)
+msgid "]"
+msgstr "]"
+
+#: C/shortcuts.page:117(p)
+msgid "Unquote text"
+msgstr "Togli citazione"
+
+#: C/shortcuts.page:118(key)
+msgid "["
+msgstr "["
+
+#: C/shortcuts.page:121(p)
+#| msgid "Close composer window"
+msgid "Close composer"
+msgstr "Chiudi la finestra di composizione"
+
+#: C/shortcuts.page:122(p)
+#| msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq> or <key>N</key>"
+msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq> or <key>Esc</key>"
+msgstr "<keyseq><key>Ctrl</key><key>W</key></keyseq> o <key>Esc</key>"
+
+#: C/shortcuts.page:125(p)
+#| msgid "Composer"
+msgid "Detach composer"
+msgstr "Stacca la finestra di composizione"
+
+#: C/shortcuts.page:130(p)
+msgid "These shortcuts are only active in composers in rich text mode."
+msgstr ""
+"Queste scorciatoie sono attive solo se nella finestra di composizione è "
+"spuntata la modalità di testo formattato."
+
+#: C/shortcuts.page:133(p)
+#| msgid "text"
+msgid "Bold text"
+msgstr "Testo in grassetto"
+
+#: C/shortcuts.page:134(key)
+msgid "B"
+msgstr "B"
+
+#: C/shortcuts.page:137(p)
+msgid "Italicize text"
+msgstr "Testo in corsivo"
+
+#: C/shortcuts.page:138(key)
+msgid "I"
+msgstr "I"
+
+#: C/shortcuts.page:141(p)
+msgid "Underline text"
+msgstr "Testo sottolineato"
+
+#: C/shortcuts.page:142(key)
+msgid "U"
+msgstr "U"
+
+#: C/shortcuts.page:145(p)
+msgid "Strike text"
+msgstr "Testo barrato"
+
+#: C/shortcuts.page:146(key)
+msgid "K"
+msgstr "K"
+
+#: C/shortcuts.page:149(p)
+msgid "Insert a link"
+msgstr "Inserisci un collegamento"
+
+#: C/shortcuts.page:150(key)
+msgid "L"
+msgstr "L"
+
+#: C/shortcuts.page:153(p)
+msgid "Remove formatting"
+msgstr "Togli formattazione"
+
+#: C/shortcuts.page:154(key)
+msgid "Space"
+msgstr "Spazio"
+
 #: C/search.page:10(title)
 msgid "Search"
 msgstr "Ricerca"
@@ -400,7 +519,7 @@
 msgstr ""
 "Geary supporta una ricerca «full text» per account. Per avviare una ricerca, "
 "selezionare una cartella associata all'account in cui si vuole fare la "
-"ricerca, cliccare la casella di ricerca nella barra degli strumenti (o "
+"ricerca, fare clic sulla casella di ricerca nella barra degli strumenti (o "
 "premere <keyseq><key>Ctrl</key><key>S</key></keyseq>) e iniziare a scrivere. "
 "I risultati appariranno dopo un breve ritardo."
 
@@ -439,7 +558,7 @@
 
 #: C/search.page:27(input)
 msgid "attachment:<placeholder-1/>"
-msgstr "attachment:<placeholder-1/>"
+msgstr "allegato:<placeholder-1/>"
 
 #: C/search.page:28(p)
 msgid "Finds messages with attachments whose name matches <var>filename</var>."
@@ -452,13 +571,13 @@
 
 #: C/search.page:31(input)
 msgid "bcc:<placeholder-1/>"
-msgstr "bcc:<placeholder-1/>"
+msgstr "ccn:<placeholder-1/>"
 
 #: C/search.page:32(p)
 msgid "Finds messages where <var>recipient</var> matches the BCC header."
 msgstr ""
 "Trova i messaggi in cui <var>destinatario</var> corrisponde "
-"nell'intestazione Ccn (Bcc in inglese)."
+"nell'intestazione Ccn."
 
 #: C/search.page:35(var) C/search.page:47(var)
 msgid "text"
@@ -466,7 +585,7 @@
 
 #: C/search.page:35(input)
 msgid "body:<placeholder-1/>"
-msgstr "body:<placeholder-1/>"
+msgstr "corpo:<placeholder-1/>"
 
 #: C/search.page:36(p)
 msgid "Finds messages whose body contains <var>text</var>."
@@ -488,7 +607,7 @@
 
 #: C/search.page:43(input)
 msgid "from:<placeholder-1/>"
-msgstr "from:<placeholder-1/>"
+msgstr "da:<placeholder-1/>"
 
 #: C/search.page:44(p)
 msgid "Finds messages where <var>sender</var> matches the From header."
@@ -498,7 +617,7 @@
 
 #: C/search.page:47(input)
 msgid "subject:<placeholder-1/>"
-msgstr "subject:<placeholder-1/>"
+msgstr "oggetto:<placeholder-1/>"
 
 #: C/search.page:48(p)
 msgid "Finds messages whose subject contains <var>text</var>."
@@ -506,7 +625,7 @@
 
 #: C/search.page:51(input)
 msgid "to:<placeholder-1/>"
-msgstr "to:<placeholder-1/>"
+msgstr "a:<placeholder-1/>"
 
 #: C/search.page:52(p)
 msgid ""
@@ -534,6 +653,11 @@
 "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 ""
+"L'opzione <gui>Preferenze</gui> è disponibile nel menù dell'applicazione o "
+"nel menù dell'icona con la ruota dentata in alto a destra (la posizione "
+"dipende dall'ambiente grafico utilizzato: in GNOME Shell e Unity il menù "
+"dell'applicazione si trova vicino all'angolo superiore sinistro dello "
+"schermo)."
 
 #: C/preferences.page:17(title)
 msgid "Reading"
@@ -700,9 +824,9 @@
 msgstr ""
 "Alcuni comandi in Geary possono agire su un gruppo di conversazioni. Per "
 "selezionare più di una conversazione, tenere premuto il tasto <key>Ctrl</"
-"key> e cliccare su ogni conversazione nell'elenco delle conversazioni. "
-"Oppure cliccare la prima conversazione di una serie consecutiva, tenere "
-"premuto il tasto <key>Maiusc</key> e cliccare sull'ultima conversazione."
+"key> e fare clic su ogni conversazione nell'elenco delle conversazioni. "
+"Oppure fare clic sulla prima conversazione di una serie consecutiva, tenere "
+"premuto il tasto <key>Maiusc</key> e fare clic sull'ultima conversazione."
 
 #: C/overview.page:44(title)
 msgid "Message area"
@@ -733,8 +857,8 @@
 "header to collapse it."
 msgstr ""
 "Quando si legge una conversazione, Geary contrae i messaggi già letti. "
-"Cliccare sui messaggi compressi per espanderli; cliccare l'intestazione di "
-"un messaggio espanso per contrarlo."
+"Cliccare sui messaggi compressi per espanderli; fare clic sull'intestazione "
+"di un messaggio espanso per contrarlo."
 
 #: C/overview.page:50(p)
 msgid ""
@@ -742,7 +866,7 @@
 "click an attachment to open it or right-click to save it."
 msgstr ""
 "Gli allegati di un messaggio appaiono in fondo al messaggio. È possibile "
-"cliccare sull'allegato per aprirlo o usare il clic destro per salvarlo."
+"fare clic sull'allegato per aprirlo o usare il clic destro per salvarlo."
 
 #: C/overview.page:52(p)
 msgid ""
@@ -958,6 +1082,12 @@
 "Trash folder on the server, where the user can then manually delete them. "
 "The server will automatically remove trashed messages after 30 days."
 msgstr ""
+"Il pulsante Elimina non è disponibile in tutte le cartelle, come ad esempio "
+"nella ricerca. È del tutto assente negli account Gmail. Questi hanno a "
+"disposizione solo il pulsante <gui>Cestina</gui>, che sposta i messaggi "
+"nella cartella Cestino sul server, dove l'utente può poi eliminarli "
+"manualmente. Il server eliminerà automaticamente i messaggi cestinati dopo "
+"30 giorni."
 
 #: C/accounts.page:13(title)
 msgid "Adding accounts"
@@ -976,12 +1106,6 @@
 "impostazioni di login per IMAP e SMTP."
 
 #: C/accounts.page:19(p)
-#, fuzzy
-#| msgid ""
-#| "Additional accounts can be added from the Accounts dialog. Click Accounts "
-#| "in the application menu or gear menu (or press <keyseq><key>Ctrl</"
-#| "key><key>M</key></keyseq>) to open the Accounts dialog. To add an "
-#| "account, click the + button."
 msgid ""
 "Additional accounts can be added from the Accounts dialog. The "
 "<gui>Accounts</gui> option is available in either Geary's application menu "
@@ -992,10 +1116,13 @@
 "To add an account, click the + button."
 msgstr ""
 "Si possono aggiungere ulteriori account tramite la finestra di dialogo degli "
-"Account. Cliccare Account nel menù dell'applicazione o nel menù dell'icona "
-"con la ruota dentata (o premere <keyseq><key>Ctrl</key><key>M</key></"
-"keyseq>) per aprire la finestra di dialogo degli account. Per aggiungere un "
-"account cliccare il pulsante +."
+"Account. L'opzione <gui>Account</gui> è disponibile nel menù "
+"dell'applicazione o nel menù dell'icona con la ruota dentata in alto a "
+"destra (la posizione dipende dall'ambiente grafico utilizzato: in GNOME "
+"Shell e Unity il menù dell'applicazione si trova vicino all'angolo superiore "
+"sinistro dello schermo). Altrimenti, premere <keyseq><key>Ctrl</key><key>M</"
+"key></keyseq> per aprire la finestra di dialogo degli account. Per "
+"aggiungere un account fare clic sul pulsante +."
 
 #: C/accounts.page:28(title)
 msgid "Editing existing accounts"
@@ -1008,7 +1135,7 @@
 "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 ""
-"Dalla finestra di dialogo degli account, selezionare un account e cliccare "
+"Dalla finestra di dialogo degli account, selezionare un account e fare clic "
 "sull'icona della matita per cambiare le varie impostazioni. Attenzione: "
 "Geary non può cambiare le impostazioni server di un account esistente. Se si "
 "deve modificare il proprio server IMAP o SMTP, bisogna eliminare l'account e "
@@ -1045,6 +1172,32 @@
 
 #: C/accounts.page:45(p)
 msgid ""
+"The <gui>Sign emails</gui> checkbox indicates whether a signature will be "
+"automatically inserted when a composer is opened. You may enter the "
+"signature into the box immediately below. You may use HTML tags to style the "
+"text. Switch to a preview of the signature using the buttons to the right."
+msgstr ""
+"La casella di spunta <gui>Firma email</gui> indica se una firma sarà "
+"inserita automaticamente quando si apre una finestra di composizione. Si può "
+"inserire la firma nel riquadro in basso. È consentito l'uso di tag HTML per "
+"formattare il testo. Usare i pulsanti a destra per passare a un'anteprima "
+"della firma."
+
+#: C/accounts.page:50(p)
+msgid ""
+"If you leave the signature in the Accounts dialog blank, Geary will use the "
+"<file>.signature</file> file in your home directory, if it exists. This file "
+"may contain either plain text or HTML markup. In the latter case, the markup "
+"will be inserted directly into the composer, without any escaping."
+msgstr ""
+"Se il campo della firma nelle opzioni account è lasciato vuoto, Geary userà "
+"il file <file>.signature</file> della directory home, se esiste. Questo file "
+"può contenere sia testo semplice che testo con marcatori HTML. Nel secondo "
+"caso i marcatori saranno inseriti direttamente nel compositore, senza alcun "
+"carattere di escape."
+
+#: C/accounts.page:55(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."
@@ -1054,11 +1207,11 @@
 "disponibile localmente quando si fa una ricerca o si formano le "
 "conversazioni."
 
-#: C/accounts.page:53(title)
+#: C/accounts.page:63(title)
 msgid "Removing accounts"
 msgstr "Eliminare account"
 
-#: C/accounts.page:55(p)
+#: C/accounts.page:65(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 "

=== modified file 'icons/CMakeLists.txt'
--- icons/CMakeLists.txt	2014-10-02 02:02:09 +0000
+++ icons/CMakeLists.txt	2015-07-10 22:31:23 +0000
@@ -1,25 +1,25 @@
-set(ICONS_DEST share/geary/icons)
+set(ICONS_DEST share/icons/hicolor/scalable/actions)
 
 set(ICON_FILES
-    archive-symbolic.svg
+    mail-archive-symbolic.svg
     close-symbolic.svg
     detach-symbolic.svg
-    document-symbolic.svg
+    text-x-generic-symbolic.svg
     edit-symbolic.svg
     format-text-remove-symbolic.svg
-    forward-symbolic.svg
-    forward-rtl-symbolic.svg
-    inbox-symbolic.svg
+    mail-forward-symbolic.svg
+    mail-forward-rtl-symbolic.svg
+    mail-inbox-symbolic.svg
     marker-symbolic.svg
-    outbox-symbolic.svg
-    reply-all-symbolic.svg
-    reply-all-rtl-symbolic.svg
-    reply-symbolic.svg
-    reply-rtl-symbolic.svg
-    sent-symbolic.svg
-    sent-rtl-symbolic.svg
-    spam-symbolic.svg
-    spam-rtl-symbolic.svg
+    mail-outbox-symbolic.svg
+    mail-reply-all-symbolic.svg
+    mail-reply-all-rtl-symbolic.svg
+    mail-reply-sender-symbolic.svg
+    mail-reply-sender-rtl-symbolic.svg
+    mail-sent-symbolic.svg
+    mail-sent-rtl-symbolic.svg
+    mail-spam-symbolic.svg
+    mail-spam-rtl-symbolic.svg
     tag-symbolic.svg
     tag-rtl-symbolic.svg
 )

=== added file 'icons/mail-archive-symbolic.svg'
--- icons/mail-archive-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-archive-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='archive-symbolic.svg' inkscape:export-filename='/home/sam/dev/geary-symbolic/src/source-symbolic.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.48+devel r' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='true' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='7.6390264' inkscape:cy='1.692314' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#333333' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='true' showgrid='false' showguides='true' inkscape:showpageshadow='true' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='true' inkscape:snap-bbox-midpoints='true' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='715' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-180.00001px' originy='-36px' snapvisiblegridlinesonly='true' spacingx='0.25px' spacingy='0.25px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <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/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient5606' osb:paint='solid'>
+      <stop id='stop5608' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
+    </linearGradient>
+  </defs>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-421.00021,-181)'>
+    <path inkscape:connector-curvature='0' d='m 425.0002,182 c -1,0 -1,1 -1,1 l 10,0 c 0,0 0,-1 -1,-1 l -8,0 z m -1,2 c -0.97227,0 -1,1 -1,1 l 12,0 c 0,0 0,-1 -1,-1 l -10,0 z m -1,2 c -0.46464,0 -0.83592,0.32 -0.94922,0.74805 l 6.94922,4.15039 6.94922,-4.15039 C 435.83612,186.32 435.46484,186 435.0002,186 l -12,0 z m -1,1.88477 0,7.11523 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-7.11523 -7,4.21679 -7,-4.21679 z' id='rect4927' style='fill:#dddddd;fill-opacity:1;fill-rule:nonzero;stroke:none'/>
+    
+  </g>
+</svg>

=== added file 'icons/mail-forward-rtl-symbolic.svg'
--- icons/mail-forward-rtl-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-forward-rtl-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="100px"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="forward-symbolic.svg"><metadata
+     id="metadata9"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="993"
+     inkscape:window-height="811"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="50"
+     inkscape:cy="50"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 45.074,19.967 c -1.919,0 -3.812,0.131 -5.664,0.379 L 37.546,2.5 12.857,33.585 43.395,58.469 41.085,36.371 c 0.421,-0.014 0.839,-0.041 1.264,-0.041 19.789,0 35.834,16.043 35.834,35.832 0,9.896 -4.009,18.854 -10.493,25.338 C 79.383,90.028 87.142,76.943 87.142,62.036 87.143,38.804 68.31,19.967 45.074,19.967 z"
+     id="path3"
+     style="fill:#bebebe;fill-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file

=== added file 'icons/mail-forward-symbolic.svg'
--- icons/mail-forward-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-forward-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="100px"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="back.svg"><metadata
+     id="metadata9"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="993"
+     inkscape:window-height="811"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="50"
+     inkscape:cy="50"
+     inkscape:window-x="2565"
+     inkscape:window-y="164"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 54.925,19.967 c 1.919,0 3.812,0.131 5.664,0.379 L 62.453,2.5 87.142,33.585 56.604,58.469 58.914,36.371 C 58.493,36.357 58.075,36.33 57.65,36.33 c -19.789,0 -35.834,16.043 -35.834,35.832 0,9.896 4.009,18.854 10.493,25.338 C 20.616,90.028 12.857,76.943 12.857,62.036 12.856,38.804 31.689,19.967 54.925,19.967 z"
+     id="path3"
+     style="fill:#bebebe;fill-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file

=== added file 'icons/mail-inbox-symbolic.svg'
--- icons/mail-inbox-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-inbox-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100"
+   height="100"
+   viewBox="0 2.044 100 99.999997"
+   enable-background="new 0 2.044 100 95.912"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="inbox-symbolic.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1074"
+     inkscape:window-height="677"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="2.4605888"
+     inkscape:cx="-37.54477"
+     inkscape:cy="47.561559"
+     inkscape:window-x="632"
+     inkscape:window-y="190"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><path
+     transform="translate(0,2.0439987)"
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     d="M 39,12 39,6 24.031,6 0,61.377 0,100 100,100 100,61.377 75.969,6 61,6 61,12 72.031,12 93.296,61 69,61 58,72 42,72 31,61 6.704,61 27.969,12 z"
+     id="polygon3" /><path
+     transform="translate(0,2.0439987)"
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     d="M 30,41 50,61 70,41 57,41 57,0 43,0 43,41 z"
+     id="polygon5" /></svg>
\ No newline at end of file

=== added file 'icons/mail-outbox-symbolic.svg'
--- icons/mail-outbox-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-outbox-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="100px"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="outbox-symbolic.svg"><metadata
+     id="metadata11"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs9" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1274"
+     inkscape:window-height="717"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="-27.966102"
+     inkscape:cy="50"
+     inkscape:window-x="232"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     style="fill:#bebebe;fill-opacity:1"
+     d="M 75.969,6 61,6 61,12 72.031,12 93.296,61 69,61 58,72 42,72 31,61 6.704,61 27.969,12 39,12 39,6 24.031,6 0,61.377 0,100 l 100,0 0,-38.623 z"
+     id="polygon3" /><path
+     transform="matrix(1,0,0,-1,0,67)"
+     style="fill:#bebebe;fill-opacity:1"
+     d="M 57,41 57,0 43,0 43,41 30,41 50,61 70,41 z"
+     id="polygon5" /></svg>
\ No newline at end of file

=== added file 'icons/mail-reply-all-rtl-symbolic.svg'
--- icons/mail-reply-all-rtl-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-reply-all-rtl-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="100px"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="reply-all-symbolic.svg"><metadata
+     id="metadata9"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1177"
+     inkscape:window-height="766"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="4.72"
+     inkscape:cx="47.951201"
+     inkscape:cy="57.020569"
+     inkscape:window-x="0"
+     inkscape:window-y="58"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 43.195344,19.967 c 1.919,0 3.812,0.131 5.664,0.379 l 1.864,-17.846 24.689,31.085 -30.538,24.884 2.31,-22.098 c -0.421,-0.014 -0.839,-0.041 -1.264,-0.041 -19.789,0 -35.834,16.043 -35.834,35.832 0,9.896 4.009,18.854 10.493,25.338 C 8.8863443,90.028 1.1273443,76.943 1.1273443,62.036 1.1263443,38.804 19.959344,19.967 43.195344,19.967 z"
+     id="path3"
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     mask="none"
+     d="m 72.4545,3.4757167 24.6875,31.0937503 -30.53125,24.875 c 0.51184,-4.700225 0.52737,-6.593597 0.875,-9.761622 L 87.898356,33.788217 C 69.540146,9.6091097 71.193057,13.146026 71.193907,13.146797 71.478207,10.328029 72.08964,7.0749067 72.4545,3.4757167 z"
+     id="path3-8-2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" /></svg>
\ No newline at end of file

=== added file 'icons/mail-reply-all-symbolic.svg'
--- icons/mail-reply-all-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-reply-all-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="100px"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="reply-all-symbolic.svg"><metadata
+     id="metadata9"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1177"
+     inkscape:window-height="766"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="4.72"
+     inkscape:cx="47.951201"
+     inkscape:cy="57.020569"
+     inkscape:window-x="2551"
+     inkscape:window-y="220"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 55.074,19.967 c -1.919,0 -3.812,0.131 -5.664,0.379 L 47.546,2.5 22.857,33.585 53.395,58.469 51.085,36.371 c 0.421,-0.014 0.839,-0.041 1.264,-0.041 19.789,0 35.834,16.043 35.834,35.832 0,9.896 -4.009,18.854 -10.493,25.338 C 89.383,90.028 97.142,76.943 97.142,62.036 97.143,38.804 78.31,19.967 55.074,19.967 z"
+     id="path3"
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     mask="none"
+     d="M 25.814844,3.4757167 1.1273443,34.569467 l 30.5312497,24.875 c -0.51184,-4.700225 -0.52737,-6.593597 -0.875,-9.761622 L 10.370988,33.788217 C 28.729198,9.6091097 27.076287,13.146026 27.075437,13.146797 26.791137,10.328029 26.179704,7.0749067 25.814844,3.4757167 z"
+     id="path3-8-2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" /></svg>
\ No newline at end of file

=== added file 'icons/mail-reply-sender-rtl-symbolic.svg'
--- icons/mail-reply-sender-rtl-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-reply-sender-rtl-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="100px"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="reply-symbolic.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="50"
+     inkscape:cy="50"
+     inkscape:window-x="0"
+     inkscape:window-y="58"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 54.925,19.967 c 1.919,0 3.812,0.131 5.664,0.379 L 62.453,2.5 87.142,33.585 56.604,58.469 58.914,36.371 C 58.493,36.357 58.075,36.33 57.65,36.33 c -19.789,0 -35.834,16.043 -35.834,35.832 0,9.896 4.009,18.854 10.493,25.338 C 20.616,90.028 12.857,76.943 12.857,62.036 12.856,38.804 31.689,19.967 54.925,19.967 z"
+     id="path3"
+     style="fill:#bebebe;fill-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file

=== added file 'icons/mail-reply-sender-symbolic.svg'
--- icons/mail-reply-sender-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-reply-sender-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="100px"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="back.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="50"
+     inkscape:cy="50"
+     inkscape:window-x="2943"
+     inkscape:window-y="352"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="M45.074,19.967c-1.919,0-3.812,0.131-5.664,0.379L37.546,2.5L12.857,33.585l30.538,24.884l-2.31-22.098  c0.421-0.014,0.839-0.041,1.264-0.041c19.789,0,35.834,16.043,35.834,35.832c0,9.896-4.009,18.854-10.493,25.338  c11.693-7.472,19.452-20.557,19.452-35.464C87.143,38.804,68.31,19.967,45.074,19.967z"
+     id="path3"
+     style="fill:#bebebe;fill-opacity:1" /></svg>
\ No newline at end of file

=== added file 'icons/mail-sent-rtl-symbolic.svg'
--- icons/mail-sent-rtl-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-sent-rtl-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="90.476997"
+   height="57.429001"
+   viewBox="0 0 90.476997 57.429001"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sent-symbolic.svg"><metadata
+     id="metadata12"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs10" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview8"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="2.36"
+     inkscape:cx="45.477"
+     inkscape:cy="27"
+     inkscape:window-x="0"
+     inkscape:window-y="58"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" /><g
+     id="Captions"
+     transform="matrix(-1,0,0,1,95,-19.571)" /><path
+     style="fill:#bebebe;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="M 90.477,18.945 69.9,34.93 69.944,57.429 53.537,46.557 59.335,41.043 36.561,57.429 0,0 90.477,18.945 z M 8.117,5.421 58.105,37.347 66.257,51.199 66.13,33.602 8.117,5.421 z" /></svg>
\ No newline at end of file

=== added file 'icons/mail-sent-symbolic.svg'
--- icons/mail-sent-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-sent-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='sent-symbolic.svg' height='15.973852' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16.000013' xmlns='http://www.w3.org/2000/svg'>
+  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='true' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='-7.72741' inkscape:cy='-5.6488858' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#333333' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='true' showgrid='false' showguides='true' inkscape:showpageshadow='true' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='true' inkscape:snap-bbox-midpoints='true' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='711' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='6.2866212'>
+    <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-64px' originy='-16.026148px' snapvisiblegridlinesonly='true' spacingx='0.25px' spacingy='0.25px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <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>Moka Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title id='title8473'>Moka Symbolic Icon Theme</title>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient5606' osb:paint='solid'>
+      <stop id='stop5608' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
+    </linearGradient>
+  </defs>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-305.0002,-201)'>
+    
+    <path inkscape:connector-curvature='0' d='m 321.0002,203.90625 -16,3.34375 3,2.34375 0,4.65625 3.5,-2 0,0 -1,-1.09375 4.03125,2.90625 z m -1.4375,0.96875 -8.84375,5.625 -0.875,1.3125 -0.84375,0.53125 0,-2.34375 z' id='path6' sodipodi:nodetypes='ccccccccccccccc' style='fill:#dddddd;fill-opacity:1;stroke:none'/>
+  </g>
+</svg>

=== added file 'icons/mail-spam-rtl-symbolic.svg'
--- icons/mail-spam-rtl-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-spam-rtl-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="67px"
+   viewBox="0 0 100 67"
+   enable-background="new 0 0 100 67"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="spam-symbolic.svg"><metadata
+     id="metadata11"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs9" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1078"
+     inkscape:window-height="607"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="2.92"
+     inkscape:cx="-13.013699"
+     inkscape:cy="33.5"
+     inkscape:window-x="0"
+     inkscape:window-y="66"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><circle
+     cx="86.75"
+     cy="26.046"
+     r="0.602"
+     id="circle3"
+     sodipodi:cx="86.75"
+     sodipodi:cy="26.046"
+     sodipodi:rx="0.602"
+     sodipodi:ry="0.602"
+     transform="matrix(-1,0,0,1,99.953834,0)"
+     style="fill:#000000" /><path
+     d="m -0.01616592,29.455 c 0.058,-1.15 0.507,-2.121 1.64600002,-2.121 0.475,0 1.995,0.453 3.346,0.252 1.376,-0.203 2.584,-1.066 3.186,-1.527 1.475,-1.127 3.2049999,-5.732 5.9629999,-7.596 0.536,-0.363 1.584,-1.057 2.022,-1.531 0.459,-0.498 0.616,-1.324 0.616,-1.982 0,-0.742 -0.235,-1.418 -0.625,-2.041 -0.952,-1.527 1.81,-1.701 2.713,-1.701 1.558,0 3.032,0.592 4.482,1.102 1.114,0.391 2.867,0.41 4.207,-0.385 1.697,-1.01 3.093,-2.506 4.714,-3.647 1.743,-1.228 3.594,-2.302 5.515,-3.228 6.575,-3.173 13.923,-4.638 21.203,-4.638 12.008,0 26.186,4.583 33.44,14.134 0.05,0.078 0.1,0.137 0.15,0.209 0.092,0.125 0.18,0.25 0.27,0.377 1.204,1.559 2.418,1.859 3.771,1.291 0.996,-0.42 1.516,-1.174 1.633,-2.191 0.159,-1.393 -0.717,-2.27 -1.832,-2.35 -1.251,-0.09 -2.071,0.777 -2.031,1.713 0.016,0.365 0.292,0.918 0.996,1.115 0.776,0.219 1.243,-0.527 1.473,-0.379 0.181,0.115 -0.139,0.896 -0.617,1.115 -1.224,0.561 -2.051,0.039 -2.576,-0.652 -0.423,-0.555 -0.545,-0.84 -0.603,-1.607 -0.094,-1.244 0.988,-3.166 3.417,-3.031 2.342,0.128 3.813996,2.178 3.463,4.613 -0.204,1.418 -1.25,3.012 -2.705,3.725 -0.44,0.215 -0.914,0.336 -1.391,0.432 -0.971,0.197 -0.465,0.789 -0.21,1.365 0.375,0.846 0.619,1.783 0.84,2.678 0.467,1.891 0.688,3.838 0.688,5.787 0,18.9 -9.929,17.838 -11.309,28.455 -0.101,0.777 -0.174,1.568 -0.383,2.326 -0.211,0.762 -0.583,1.461 -0.98,2.141 -0.398,0.68 -0.822,1.344 -1.246,2.01 -0.548,0.857 -1.061,2.035 -1.989,2.543 -0.653,0.359 -1.225,0.338 -1.943,0.34 -0.687,0.002 -3.859,-0.014 -4.758,-0.035 -0.442,-0.012 -2.022,0.014 -2.108,-0.377 -0.061,-0.275 0.283,-0.537 0.431,-0.729 0.189,-0.244 0.364,-0.506 0.52,-0.773 0.336,-0.576 0.592,-1.195 0.796,-1.83 0.393,-1.215 0.6,-2.486 0.724,-3.756 0.114,-1.166 0.486,-3.293 -0.63,-4.152 -1.328,-1.021 -5.162,0.312 -6.698,0.568 -2.841,0.475 -5.722,0.703 -8.601,0.703 -1.854,0 -3.708,-0.096 -5.552,-0.289 -0.942,-0.098 -1.889,-0.211 -2.822,-0.375 -0.638,-0.113 -1.741,-0.203 -2.4,-0.234 -0.827,-0.041 -2.128,0.217 -2.924,1.092 -0.957,1.053 -1.123,4.965 -1.858,6.033 -0.426,0.619 -2.82,3.715 -3.555,4.076 -0.213,0.104 -0.563,0.062 -0.791,0.072 -0.555,0.02 -1.11,0.021 -1.666,0.023 -1.396,0.004 -2.791,-0.01 -4.187,-0.023 -0.453,-0.004 -1.342,0.17 -1.635,-0.295 -0.195,-0.307 0.005,-0.752 0.135,-1.039 0.202,-0.449 0.398,-0.904 0.562,-1.369 3.553,-10.064 0.133,-14.666 -6.437,-15.24 -1.574,-0.139 -3.405,0.1 -5.774,-0.104 -5.137,-0.438 -9.74,-6.35 -10.8409999,-7.299 -0.773,-0.664 -2.838,-1.641 -3.349,-2.484 -0.242,-0.398 -0.411,-0.682 -0.795,-0.943 -0.859,-0.582 -2.746,-1.045 -3.465,-1.867 -1.42400002,-1.621 -1.69500002,-5.33 -1.63600002,-6.47 z M 12.380834,28.169 c 0.484,0 0.876,-0.393 0.876,-0.875 0,-0.484 -0.392,-0.877 -0.876,-0.877 -0.484,0 -0.876,0.393 -0.876,0.877 0,0.483 0.392,0.875 0.876,0.875 z"
+     id="path5"
+     style="fill:#bebebe;fill-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file

=== added file 'icons/mail-spam-symbolic.svg'
--- icons/mail-spam-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/mail-spam-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="67px"
+   viewBox="0 0 100 67"
+   enable-background="new 0 0 100 67"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="spam-symbolic.svg"><metadata
+     id="metadata11"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs9" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1078"
+     inkscape:window-height="607"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="2.92"
+     inkscape:cx="-13.013699"
+     inkscape:cy="33.5"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><circle
+     fill="#000000"
+     cx="86.75"
+     cy="26.046"
+     r="0.602"
+     id="circle3" /><path
+     fill="#000000"
+     d="M99.97,29.455c-0.058-1.15-0.507-2.121-1.646-2.121c-0.475,0-1.995,0.453-3.346,0.252  c-1.376-0.203-2.584-1.066-3.186-1.527c-1.475-1.127-3.205-5.732-5.963-7.596c-0.536-0.363-1.584-1.057-2.022-1.531  c-0.459-0.498-0.616-1.324-0.616-1.982c0-0.742,0.235-1.418,0.625-2.041c0.952-1.527-1.81-1.701-2.713-1.701  c-1.558,0-3.032,0.592-4.482,1.102c-1.114,0.391-2.867,0.41-4.207-0.385c-1.697-1.01-3.093-2.506-4.714-3.647  c-1.743-1.228-3.594-2.302-5.515-3.228C55.61,1.877,48.262,0.412,40.982,0.412c-12.008,0-26.186,4.583-33.44,14.134  c-0.05,0.078-0.1,0.137-0.15,0.209c-0.092,0.125-0.18,0.25-0.27,0.377c-1.204,1.559-2.418,1.859-3.771,1.291  c-0.996-0.42-1.516-1.174-1.633-2.191c-0.159-1.393,0.717-2.27,1.832-2.35c1.251-0.09,2.071,0.777,2.031,1.713  c-0.016,0.365-0.292,0.918-0.996,1.115c-0.776,0.219-1.243-0.527-1.473-0.379c-0.181,0.115,0.139,0.896,0.617,1.115  c1.224,0.561,2.051,0.039,2.576-0.652c0.423-0.555,0.545-0.84,0.603-1.607c0.094-1.244-0.988-3.166-3.417-3.031  c-2.342,0.128-3.814,2.178-3.463,4.613c0.204,1.418,1.25,3.012,2.705,3.725c0.44,0.215,0.914,0.336,1.391,0.432  c0.971,0.197,0.465,0.789,0.21,1.365c-0.375,0.846-0.619,1.783-0.84,2.678c-0.467,1.891-0.688,3.838-0.688,5.787  c0,18.9,9.929,17.838,11.309,28.455c0.101,0.777,0.174,1.568,0.383,2.326c0.211,0.762,0.583,1.461,0.98,2.141  c0.398,0.68,0.822,1.344,1.246,2.01c0.548,0.857,1.061,2.035,1.989,2.543c0.653,0.359,1.225,0.338,1.943,0.34  c0.687,0.002,3.859-0.014,4.758-0.035c0.442-0.012,2.022,0.014,2.108-0.377c0.061-0.275-0.283-0.537-0.431-0.729  c-0.189-0.244-0.364-0.506-0.52-0.773c-0.336-0.576-0.592-1.195-0.796-1.83c-0.393-1.215-0.6-2.486-0.724-3.756  c-0.114-1.166-0.486-3.293,0.63-4.152c1.328-1.021,5.162,0.312,6.698,0.568c2.841,0.475,5.722,0.703,8.601,0.703  c1.854,0,3.708-0.096,5.552-0.289c0.942-0.098,1.889-0.211,2.822-0.375c0.638-0.113,1.741-0.203,2.4-0.234  c0.827-0.041,2.128,0.217,2.924,1.092c0.957,1.053,1.123,4.965,1.858,6.033c0.426,0.619,2.82,3.715,3.555,4.076  c0.213,0.104,0.563,0.062,0.791,0.072c0.555,0.02,1.11,0.021,1.666,0.023c1.396,0.004,2.791-0.01,4.187-0.023  c0.453-0.004,1.342,0.17,1.635-0.295c0.195-0.307-0.005-0.752-0.135-1.039c-0.202-0.449-0.398-0.904-0.562-1.369  c-3.553-10.064-0.133-14.666,6.437-15.24c1.574-0.139,3.405,0.1,5.774-0.104c5.137-0.438,9.74-6.35,10.841-7.299  c0.773-0.664,2.838-1.641,3.349-2.484c0.242-0.398,0.411-0.682,0.795-0.943c0.859-0.582,2.746-1.045,3.465-1.867  C99.758,34.304,100.029,30.595,99.97,29.455z M87.573,28.169c-0.484,0-0.876-0.393-0.876-0.875c0-0.484,0.392-0.877,0.876-0.877  s0.876,0.393,0.876,0.877C88.449,27.777,88.057,28.169,87.573,28.169z"
+     id="path5"
+     style="fill:#bebebe;fill-opacity:1" /></svg>
\ No newline at end of file

=== added file 'icons/text-x-generic-symbolic.svg'
--- icons/text-x-generic-symbolic.svg	1970-01-01 00:00:00 +0000
+++ icons/text-x-generic-symbolic.svg	2015-07-10 22:31:23 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="79.001px"
+   height="100px"
+   viewBox="0 0 79.001 100"
+   enable-background="new 0 0 79.001 100"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="document-symbolic.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1052"
+     inkscape:window-height="726"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="39.5005"
+     inkscape:cy="50"
+     inkscape:window-x="363"
+     inkscape:window-y="122"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="M56.2,0H0v100h79l0.001-78.285L56.2,0z M58.001,10.001L68.5,20l-10.499,0V10.001z M6,94V6h46.001v20l21,0L73,94H6z"
+     id="path3"
+     style="fill:#bebebe;fill-opacity:1" /></svg>
\ No newline at end of file

=== modified file 'po/LINGUAS'
--- po/LINGUAS	2014-12-29 05:40:07 +0000
+++ po/LINGUAS	2015-07-10 22:31:23 +0000
@@ -1,4 +1,5 @@
 ar
+bs
 ca
 cs
 da

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-12-29 05:40:07 +0000
+++ po/POTFILES.in	2015-07-10 22:31:23 +0000
@@ -4,6 +4,7 @@
 [type: gettext/ini]desktop/geary-attach.contract.in
 src/client/accounts/account-dialog-account-list-pane.vala
 src/client/accounts/account-dialog-add-edit-pane.vala
+src/client/accounts/account-dialog-edit-alternate-emails-pane.vala
 src/client/accounts/account-dialog-pane.vala
 src/client/accounts/account-dialog-remove-confirm-pane.vala
 src/client/accounts/account-dialog-remove-fail-pane.vala
@@ -12,6 +13,7 @@
 src/client/accounts/account-spinner-page.vala
 src/client/accounts/add-edit-page.vala
 src/client/accounts/login-dialog.vala
+src/client/application/autostart-manager.vala
 src/client/application/geary-action-adapter.vala
 src/client/application/geary-application.vala
 src/client/application/geary-args.vala
@@ -28,13 +30,16 @@
 src/client/components/monitored-progress-bar.vala
 src/client/components/monitored-spinner.vala
 src/client/components/pill-toolbar.vala
+src/client/components/search-bar.vala
 src/client/components/status-bar.vala
 src/client/components/stock.vala
+src/client/components/stylish-webview.vala
+src/client/composer/composer-box.vala
 src/client/composer/composer-container.vala
 src/client/composer/composer-embed.vala
 src/client/composer/composer-headerbar.vala
+src/client/composer/composer-toolbar.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
@@ -78,10 +83,10 @@
 src/client/util/util-gravatar.vala
 src/client/util/util-gtk.vala
 src/client/util/util-international.vala
+src/client/util/util-random.vala
 src/client/util/util-webkit.vala
-src/engine/abstract/geary-abstract-account.vala
-src/engine/abstract/geary-abstract-folder.vala
-src/engine/abstract/geary-abstract-local-folder.vala
+src/console/main.vala
+src/engine/api/geary-abstract-local-folder.vala
 src/engine/api/geary-account-information.vala
 src/engine/api/geary-account.vala
 src/engine/api/geary-aggregated-folder-properties.vala
@@ -106,6 +111,7 @@
 src/engine/api/geary-folder-supports-archive.vala
 src/engine/api/geary-folder-supports-copy.vala
 src/engine/api/geary-folder-supports-create.vala
+src/engine/api/geary-folder-supports-empty.vala
 src/engine/api/geary-folder-supports-mark.vala
 src/engine/api/geary-folder-supports-move.vala
 src/engine/api/geary-folder-supports-remove.vala
@@ -114,13 +120,15 @@
 src/engine/api/geary-named-flags.vala
 src/engine/api/geary-named-flag.vala
 src/engine/api/geary-progress-monitor.vala
+src/engine/api/geary-revokable.vala
 src/engine/api/geary-search-folder.vala
 src/engine/api/geary-search-query.vala
+src/engine/api/geary-service-provider.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
 src/engine/app/app-conversation.vala
+src/engine/app/app-draft-manager.vala
 src/engine/app/app-email-store.vala
 src/engine/app/conversation-monitor/app-append-operation.vala
 src/engine/app/conversation-monitor/app-conversation-operation-queue.vala
@@ -188,17 +196,26 @@
 src/engine/imap-db/imap-db-database.vala
 src/engine/imap-db/imap-db-email-identifier.vala
 src/engine/imap-db/imap-db-folder.vala
+src/engine/imap-db/imap-db-gc.vala
 src/engine/imap-db/imap-db-message-addresses.vala
 src/engine/imap-db/imap-db-message-row.vala
-src/engine/imap-db/imap-db-search-email-identifier.vala
 src/engine/imap-db/outbox/smtp-outbox-email-identifier.vala
 src/engine/imap-db/outbox/smtp-outbox-email-properties.vala
 src/engine/imap-db/outbox/smtp-outbox-folder-properties.vala
 src/engine/imap-db/outbox/smtp-outbox-folder-root.vala
 src/engine/imap-db/outbox/smtp-outbox-folder.vala
+src/engine/imap-db/search/imap-db-search-email-identifier.vala
+src/engine/imap-db/search/imap-db-search-folder-properties.vala
+src/engine/imap-db/search/imap-db-search-folder-root.vala
+src/engine/imap-db/search/imap-db-search-folder.vala
+src/engine/imap-db/search/imap-db-search-query.vala
+src/engine/imap-db/search/imap-db-search-term.vala
 src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
+src/engine/imap-engine/gmail/imap-engine-gmail-all-mail-folder.vala
+src/engine/imap-engine/gmail/imap-engine-gmail-drafts-folder.vala
 src/engine/imap-engine/gmail/imap-engine-gmail-folder.vala
 src/engine/imap-engine/gmail/imap-engine-gmail-search-folder.vala
+src/engine/imap-engine/gmail/imap-engine-gmail-spam-trash-folder.vala
 src/engine/imap-engine/imap-engine-account-synchronizer.vala
 src/engine/imap-engine/imap-engine-batch-operations.vala
 src/engine/imap-engine/imap-engine-contact-store.vala
@@ -209,26 +226,32 @@
 src/engine/imap-engine/imap-engine-minimal-folder.vala
 src/engine/imap-engine/imap-engine-replay-operation.vala
 src/engine/imap-engine/imap-engine-replay-queue.vala
+src/engine/imap-engine/imap-engine-revokable-committed-move.vala
+src/engine/imap-engine/imap-engine-revokable-move.vala
 src/engine/imap-engine/imap-engine-send-replay-operation.vala
 src/engine/imap-engine/imap-engine.vala
 src/engine/imap-engine/other/imap-engine-other-account.vala
 src/engine/imap-engine/other/imap-engine-other-folder.vala
 src/engine/imap-engine/outlook/imap-engine-outlook-account.vala
+src/engine/imap-engine/outlook/imap-engine-outlook-drafts-folder.vala
 src/engine/imap-engine/outlook/imap-engine-outlook-folder.vala
-src/engine/imap-engine/outlook/imap-engine-outlook-drafts-folder.vala
 src/engine/imap-engine/replay-ops/imap-engine-abstract-list-email.vala
 src/engine/imap-engine/replay-ops/imap-engine-copy-email.vala
 src/engine/imap-engine/replay-ops/imap-engine-create-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-empty-folder.vala
 src/engine/imap-engine/replay-ops/imap-engine-fetch-email.vala
 src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala
 src/engine/imap-engine/replay-ops/imap-engine-list-email-by-sparse-id.vala
 src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala
-src/engine/imap-engine/replay-ops/imap-engine-move-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-move-email-commit.vala
+src/engine/imap-engine/replay-ops/imap-engine-move-email-prepare.vala
+src/engine/imap-engine/replay-ops/imap-engine-move-email-revoke.vala
 src/engine/imap-engine/replay-ops/imap-engine-remove-email.vala
 src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala
 src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala
 src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
 src/engine/imap-engine/replay-ops/imap-engine-server-search-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-user-close.vala
 src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala
 src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala
 src/engine/imap/imap-error.vala
@@ -296,6 +319,7 @@
 src/engine/mime/mime-data-format.vala
 src/engine/mime/mime-disposition-type.vala
 src/engine/mime/mime-error.vala
+src/engine/mime/mime-multipart-subtype.vala
 src/engine/nonblocking/nonblocking-abstract-semaphore.vala
 src/engine/nonblocking/nonblocking-batch.vala
 src/engine/nonblocking/nonblocking-concurrent.vala
@@ -315,7 +339,6 @@
 src/engine/rfc822/rfc822-message.vala
 src/engine/rfc822/rfc822-utils.vala
 src/engine/rfc822/rfc822.vala
-src/engine/smtp/smtp-abstract-authenticator.vala
 src/engine/smtp/smtp-authenticator.vala
 src/engine/smtp/smtp-capabilities.vala
 src/engine/smtp/smtp-client-connection.vala
@@ -333,6 +356,7 @@
 src/engine/state/state-machine-descriptor.vala
 src/engine/state/state-machine.vala
 src/engine/state/state-mapping.vala
+src/engine/util/util-ascii.vala
 src/engine/util/util-collection.vala
 src/engine/util/util-converter.vala
 src/engine/util/util-files.vala
@@ -350,6 +374,7 @@
 src/engine/util/util-synchronization.vala
 src/engine/util/util-time.vala
 src/engine/util/util-trillian.vala
+src/mailer/main.vala
 [type: gettext/glade]ui/accelerators.ui
 [type: gettext/glade]ui/account_cannot_remove.glade
 [type: gettext/glade]ui/account_list.glade
@@ -358,6 +383,7 @@
 [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/edit_alternate_emails.glade
 [type: gettext/glade]ui/find_bar.glade
 [type: gettext/glade]ui/login.glade
 [type: gettext/glade]ui/message.glade
@@ -365,5 +391,4 @@
 [type: gettext/glade]ui/preferences.glade
 [type: gettext/glade]ui/remove_confirm.glade
 [type: gettext/glade]ui/toolbar_mark_menu.ui
-[type: gettext/glade]ui/toolbar_menu.ui
 [type: gettext/glade]ui/upgrade_dialog.glade

=== added file 'po/bs.po'
--- po/bs.po	1970-01-01 00:00:00 +0000
+++ po/bs.po	2015-07-10 22:31:23 +0000
@@ -0,0 +1,2088 @@
+# Bosnian translation for bosnianuniversetranslation
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the bosnianuniversetranslation package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bosnianuniversetranslation\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=geary&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-02-27 05:58+0000\n"
+"PO-Revision-Date: 2015-03-03 20:57+0100\n"
+"Last-Translator: Samir Ribic <[e-mail]>\n"
+"Language-Team: Bosnian <[e-mail]>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Poedit 1.7.4\n"
+"X-Launchpad-Export-Date: 2015-02-15 06:28+0000\n"
+
+#: ../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-autostart.desktop.in.h:2
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Mail klijent"
+
+#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
+msgid "Geary Mail"
+msgstr "Geary Mail"
+
+#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
+msgid "Send and receive email"
+msgstr "Šaljite i primajte e-poštu"
+
+#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
+msgid "Email;E-mail;Mail;"
+msgstr "Epošta;E-pošta;pošta;"
+
+#: ../desktop/geary.desktop.in.h:6
+msgid "Compose Message"
+msgstr "Sastavi poruku"
+
+#: ../desktop/geary-attach.contract.in.h:1
+msgid "Send by email"
+msgstr "Poslano e-poštom"
+
+#: ../desktop/geary-attach.contract.in.h:2
+msgid "Send files using Geary"
+msgstr "Šalji datoteke koristeći Geary"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Snimi"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Dodaj"
+
+#. Sets min size.
+#: ../src/client/accounts/account-dialog.vala:20
+msgid "Accounts"
+msgstr "Korisnički računi"
+
+#. Copyright 2011-2015 Yorba Foundation
+#. *
+#. * This software is licensed under the GNU Lesser General Public License
+#. * (version 2.1 or later).  Seje the COPYING file in this distribution.
+#.
+#. Page for adding or editing an account.
+#. / Placeholder text indicating that the user should type their first nami and last nami
+#: ../src/client/accounts/add-edit-page.vala:10
+msgid "First Last"
+msgstr "Prvi Posljednji"
+
+#: ../src/client/accounts/add-edit-page.vala:230
+msgid "Welcome to Geary."
+msgstr "Dobrodošli u Geary."
+
+#: ../src/client/accounts/add-edit-page.vala:230
+msgid "Enter your account information to get started."
+msgstr "Unesite informacije o korisničkom računu za početak."
+
+#: ../src/client/accounts/add-edit-page.vala:249
+msgid "2 weeks back"
+msgstr "2 sedmice unazad"
+
+#. IDs are # of days
+#: ../src/client/accounts/add-edit-page.vala:250
+msgid "1 month back"
+msgstr "1 mjesec unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:251
+msgid "3 months back"
+msgstr "3 mjeseca unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:252
+msgid "6 months back"
+msgstr "6 mjeseci unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "1 year back"
+msgstr "1 godina unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "2 years back"
+msgstr "2 godine unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "4 years back"
+msgstr "4 godine unazad"
+
+#. Separator
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "Everything"
+msgstr "Sve"
+
+#: ../src/client/accounts/add-edit-page.vala:276
+msgid "Edit"
+msgstr "Izmijeni"
+
+#: ../src/client/accounts/add-edit-page.vala:278
+msgid "Preview"
+msgstr "Pregled"
+
+#: ../src/client/accounts/add-edit-page.vala:712
+msgid "Remem_ber passwords"
+msgstr "Pa_mti lozinke"
+
+#: ../src/client/accounts/add-edit-page.vala:719 ../ui/login.glade.h:6
+msgid "Remem_ber password"
+msgstr "Pa_mti lozinku"
+
+#: ../src/client/accounts/add-edit-page.vala:753
+msgid "Unable to validate:\n"
+msgstr "Neuspješna validacija:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:755
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Nadimak korisničkog računa nije dozvoljen..\n"
+
+#: ../src/client/accounts/add-edit-page.vala:758
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Adresa e-pošte je već dodana u Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:762
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP greška veze.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:765
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP korisničko ime ili lozinka nisu tačni.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:768
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP greška veze.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:771
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP korisničko ime ili lozinka nije tačna.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:775
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Greška veze.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Korisničko ime ili lozinka nije tačna.\n"
+
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Zaštita autorskog prava 2011-2015 Yorba Foundation"
+
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Posjeti Yorba internet stranicu"
+
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Započni Geary sa skrivenim glavnim prozorom"
+
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Informacije debugging izlaza"
+
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Prijavite monitoring razgovora"
+
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Prijavite deserijalizaciju mreže"
+
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Prijavite aktivnosti mreže"
+
+#. / The IMAP replay queue is how changes on the server are replicated on the client.
+#. / It could also bje called the IMAP events queue.
+#: ../src/client/application/geary-args.vala:17
+msgid "Log IMAP replay queue"
+msgstr "Prijavite IMAP replay red"
+
+#. / Serialization is how commands and responses are converted into a stream of bytes for
+#. / network transmission
+#: ../src/client/application/geary-args.vala:20
+msgid "Log network serialization"
+msgstr "Prijavite serijalizaciju mreže"
+
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Prijavite periodične aktivnosti"
+
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Prijavite redove baze podataka (generisaće puno poruka)"
+
+#. / "Normalization" can also bje called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Prijavite normalizaciju direktorija"
+
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Dozvolite inspekciju WebView-a"
+
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Opozovi sve certifikate servera sa TSL upozorenjima"
+
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Prikaži verziju programa"
+
+#. This gives a command-line hint on how to opijen new composer windows with mailto:
+#: ../src/client/application/geary-args.vala:51
+#, c-format
+msgid "Use %s to open a new composer window"
+msgstr "Koristite %s da bi ste otvorili novi prozor za sastavljanje"
+
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Molimo vas da ostavite komentar, sugestiju ili prijavite bug na:"
+
+#. i18n: Command linije arguments are invalid
+#: ../src/client/application/geary-args.vala:59
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr "Analiza opcija komandne linije nije uspjela: %s\n"
+
+#: ../src/client/application/geary-args.vala:70
+#, c-format
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opcija komandne linije nije prepoznata  \"%s\"\n"
+
+#: ../src/client/application/geary-controller.vala:60
+msgid "Delete conversation (Shift+Delete)"
+msgstr "Izbriši konverzaciju (Shift+Delete)"
+
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversations (Shift+Delete)"
+msgstr "Izbriši konverzacije (Shift+Delete)"
+
+#. This refers to the action ("move email to the trash"), not the Trash folder itself
+#: ../src/client/application/geary-controller.vala:65
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr "Prebaci konverzaciju u smeće (Delete, Backspace)"
+
+#: ../src/client/application/geary-controller.vala:66
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr "Prebaci konverzacije u smeće (Delete, Backspace)"
+
+#. This refers to the action ("archive an email"), not the Archive folder itself
+#: ../src/client/application/geary-controller.vala:70
+msgid "_Archive"
+msgstr "_Arhiva"
+
+#: ../src/client/application/geary-controller.vala:71
+msgid "Archive conversation (A)"
+msgstr "Arhiviraj konverzaciju (A)"
+
+#: ../src/client/application/geary-controller.vala:72
+msgid "Archive conversations (A)"
+msgstr "Arhiviraj konverzacije (A)"
+
+#: ../src/client/application/geary-controller.vala:75
+msgid "Mark as S_pam"
+msgstr "Označi kao S_pam"
+
+#: ../src/client/application/geary-controller.vala:76
+msgid "Mark as not S_pam"
+msgstr "Označi kao da nije S_pam"
+
+#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:348
+msgid "Mark conversation"
+msgstr "Označi konverzaciju"
+
+#: ../src/client/application/geary-controller.vala:79
+msgid "Mark conversations"
+msgstr "Označi konverzacije"
+
+#: ../src/client/application/geary-controller.vala:80
+msgid "Add label to conversation"
+msgstr "Dodaj oznaku konverzacije"
+
+#: ../src/client/application/geary-controller.vala:81
+msgid "Add label to conversations"
+msgstr "Dodaj oznaku konverzacija"
+
+#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:387
+msgid "Move conversation"
+msgstr "Pomjeri konverzaciju"
+
+#: ../src/client/application/geary-controller.vala:83
+msgid "Move conversations"
+msgstr "Pomjeri konverzacije"
+
+#: ../src/client/application/geary-controller.vala:324
+msgid "A_ccounts"
+msgstr "Korisnički r_ačuni"
+
+#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Podešavanja"
+
+#: ../src/client/application/geary-controller.vala:333
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Pomoć"
+
+#: ../src/client/application/geary-controller.vala:337
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_O programu"
+
+#: ../src/client/application/geary-controller.vala:341
+msgid "_Donate"
+msgstr "_Donirajte"
+
+#: ../src/client/application/geary-controller.vala:345
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_Izađi"
+
+#: ../src/client/application/geary-controller.vala:350
+msgid "_Mark as..."
+msgstr "_Označi kao..."
+
+#: ../src/client/application/geary-controller.vala:356
+msgid "Mark as _Read"
+msgstr "Označi kao _pročitano"
+
+#: ../src/client/application/geary-controller.vala:362
+msgid "Mark as _Unread"
+msgstr "Označi kao _nepročitano"
+
+#: ../src/client/application/geary-controller.vala:368
+msgid "_Star"
+msgstr "_Dodaj zvijezdu"
+
+#: ../src/client/application/geary-controller.vala:373
+msgid "U_nstar"
+msgstr "U_kloni zvijezdu"
+
+#: ../src/client/application/geary-controller.vala:383
+msgid "Add label"
+msgstr "Dodaj oznaku"
+
+#: ../src/client/application/geary-controller.vala:384
+msgid "_Label"
+msgstr "_Oznaka"
+
+#: ../src/client/application/geary-controller.vala:388
+msgid "_Move"
+msgstr "_Premjesti"
+
+#: ../src/client/application/geary-controller.vala:392
+msgid "Compose new message (Ctrl+N, N)"
+msgstr "Stvori novu poruku (Ctrl+N, N)"
+
+#. Reply to a message.
+#: ../src/client/application/geary-controller.vala:396
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_Odgovori"
+
+#: ../src/client/application/geary-controller.vala:397
+msgid "Reply (Ctrl+R, R)"
+msgstr "Odgovori (Ctrl+R, R)"
+
+#: ../src/client/application/geary-controller.vala:401
+msgid "R_eply All"
+msgstr "O_dgovori svima"
+
+#: ../src/client/application/geary-controller.vala:402
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr "Odgovori svima (Ctrl+Shift+R, Shift+R)"
+
+#. Forward a message.
+#: ../src/client/application/geary-controller.vala:407
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_Proslijedi"
+
+#: ../src/client/application/geary-controller.vala:408
+msgid "Forward (Ctrl+L, F)"
+msgstr "Proslijedi (Ctrl+L, F)"
+
+#: ../src/client/application/geary-controller.vala:446
+msgid "Empty"
+msgstr "Isprazni"
+
+#: ../src/client/application/geary-controller.vala:447
+msgid "Empty Spam or Trash folders"
+msgstr "Prazni fascikle sa smećem ili spamom"
+
+#: ../src/client/application/geary-controller.vala:451
+msgid "Empty _Spam…"
+msgstr "Isprazni_spamom"
+
+#: ../src/client/application/geary-controller.vala:455
+msgid "Empty _Trash…"
+msgstr "Isprazni s_meće"
+
+#: ../src/client/application/geary-controller.vala:693
+msgid "Unable to store server trust exception"
+msgstr "NIje moguće pohraniti izuzetak povjerenja prema serveru"
+
+#: ../src/client/application/geary-controller.vala:930
+msgid "Your settings are insecure"
+msgstr "Vaše postavke nisu sigurne"
+
+#: ../src/client/application/geary-controller.vala:931
+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 "
+"you sure you want to do this?"
+msgstr ""
+"Vaše IMAP i/ili SMTP postavke ne specificiraju SSL ili TLS. To znači da vaše "
+"korisničko ime i lozinka mogu biti pročitani od strane druge osobe na mreži. "
+"Želite li ovo da uradite?"
+
+#: ../src/client/application/geary-controller.vala:932
+msgid "Co_ntinue"
+msgstr "Nas_tavi"
+
+#. / Displayed in the space-limited status bar when a message fails to bje sent due to error.
+#: ../src/client/application/geary-controller.vala:1010
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Greška u slanju e-pošte"
+
+#: ../src/client/application/geary-controller.vala:1011
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
+msgstr ""
+"Geary je naišao na grešku prilikom slanja e-pošte. Ako se problem i dalje "
+"postoji, molm da ručno izbrišete e-poštu iz vašeg Outbox direktorija."
+
+#. Displayed in the space-limited status bar when a message fails to bje uploaded
+#. to Sent Mail after being sent.
+#: ../src/client/application/geary-controller.vala:1015
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr "Greška prilikom snimanja poslane e-pošte"
+
+#: ../src/client/application/geary-controller.vala:1016
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
+msgstr ""
+"Geary je naišao na grešku prilikom snimanja poslane poruke u Poslane Poruke. "
+"Ova poruka će ostati u vašem Outbox direktoriju dok je ne izbrišete."
+
+#: ../src/client/application/geary-controller.vala:1085
+msgid "Labels"
+msgstr "Oznake"
+
+#. give the user two options: reset the Account local storije, or exit Geary.  A third
+#. could bje donje to leave the Account in an unopened stati, but we don't currently
+#. have provisions for that.
+#: ../src/client/application/geary-controller.vala:1097
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "Otvaranje baze podataka onemogućeno za %s"
+
+#: ../src/client/application/geary-controller.vala:1098
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronize with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
+msgstr ""
+"Došlo je do kriške prilikom otvaranja lokalne baze potataka e-pošte ovog "
+"korisničkog računa. Ovo je vjerovatno usljed oštećenja datoteke baze "
+"podataka u ovom direktoriju: \n"
+"\n"
+"%s\n"
+"\n"
+"Geary može obnoviti bazu podataka i re-siknronizirati sa serverom ili "
+"izaći.\n"
+"\n"
+"Obnavljanje baze podataka će uništiti svu lokalnu e-poštu i privitke.  <b>To "
+"neće utjecati na poštu na vašem serveru.</b>"
+
+#: ../src/client/application/geary-controller.vala:1100
+msgid "_Rebuild"
+msgstr "_Obnovi"
+
+#: ../src/client/application/geary-controller.vala:1100
+msgid "E_xit"
+msgstr "I_zlaz"
+
+#: ../src/client/application/geary-controller.vala:1109
+#, c-format
+msgid "Unable to rebuild database for \"%s\""
+msgstr "Nije noguće obnoviti bazu podataka za \"%s\""
+
+#: ../src/client/application/geary-controller.vala:1110
+#, c-format
+msgid ""
+"Error during rebuild:\n"
+"\n"
+"%s"
+msgstr ""
+"Greška prilikom obnavljanja:\n"
+"\n"
+"%s"
+
+#. some other problem opening the account ... as with other flow path, can't run
+#. Geary today with an account in unopened stati, so have to exit
+#: ../src/client/application/geary-controller.vala:1132
+#: ../src/client/application/geary-controller.vala:1142
+#: ../src/client/application/geary-controller.vala:1153
+#, c-format
+msgid "Unable to open local mailbox for %s"
+msgstr "NIje moguće otvoriti lokalno poštansko sanduče za %s"
+
+#: ../src/client/application/geary-controller.vala:1133
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to a file permissions problem.\n"
+"\n"
+"Please check that you have read/write permissions for all files in this "
+"directory:\n"
+"\n"
+"%s"
+msgstr ""
+"Došlo je do greške prilikom otvaranja lokalne baze podataka za poštu ovog "
+"korisničkog računa. Ovo je moguć problem usljed dozvola za datoteku. \n"
+"\n"
+"Molim provjerite da li imate dozvole za čitanje/pisanje za sve datoteke u "
+"ovom direktoriju:\n"
+"\n"
+"%s"
+
+#: ../src/client/application/geary-controller.vala:1143
+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 "
+"work with this version of Geary.\n"
+"\n"
+"Please install the latest version of Geary and try again."
+msgstr ""
+"Broj verzije lokalne baze podataka za poštu je pormatiran za noviju verziju "
+"Geary-a. Nažalost baza podataka ne može biti \"izverzirana\" da bi radila sa "
+"ovom verzijom Geary-a. \n"
+"\n"
+"Molimo instalirajte posljednju verziju Geary-a i pokušajte ponovo."
+
+#: ../src/client/application/geary-controller.vala:1154
+msgid ""
+"There was an error opening the local account. This is probably due to "
+"connectivity issues.\n"
+"\n"
+"Please check your network connection and restart Geary."
+msgstr ""
+"Došlo je do greške prilikom otvaranja lokalnog korisničkog računa. Ovo je "
+"nastalo vjerovatno zbog problema sa konekcijom.\n"
+"\n"
+"Molim da provjerite vašu konekciju i da restartujete Geary."
+
+#: ../src/client/application/geary-controller.vala:1662
+#, c-format
+msgid "About %s"
+msgstr "O programu %s"
+
+#. / Translators: add your nami and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <[e-mail]>
+#: ../src/client/application/geary-controller.vala:1665
+msgid "translator-credits"
+msgstr ""
+"   Mirza Krajina https://launchpad.net/~krajina\n"
+"  Samir Ribić https://launchpad.net/~megaribi"
+
+#: ../src/client/application/geary-controller.vala:1931
+msgid "Undo move (Ctrl+Z)"
+msgstr "Poništi pomijeranje (Ctrl+Z)"
+
+#: ../src/client/application/geary-controller.vala:1941
+#, c-format
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Da li ste sigurnu da želite otvoriti \"%s\"?"
+
+#: ../src/client/application/geary-controller.vala:1942
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Privici mogu izazvati štetu na vašem sistemu ako se otvore. Otvarajte "
+"datoteke samo iz pouzdanih izvora."
+
+#: ../src/client/application/geary-controller.vala:1943
+msgid "Don't _ask me again"
+msgstr "Ne _pitaj me ponovo"
+
+#: ../src/client/application/geary-controller.vala:1961
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "Datoteka nazvana „%s“ već postoji.  Želite li da je zamijenite?"
+
+#: ../src/client/application/geary-controller.vala:1963
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+"Datoteka već postoji u „%s“.  Njenom zamjenom ćete presnimiti njen sadržaj."
+
+#: ../src/client/application/geary-controller.vala:1966
+msgid "_Replace"
+msgstr "_Zamijeni"
+
+#. Find out what to do with the inline composers.
+#. TODO: Remove this in favor of automatically saving drafts
+#: ../src/client/application/geary-controller.vala:2264
+msgid "Close open draft messages?"
+msgstr "Zatvori otvorene draft poruke?"
+
+#: ../src/client/application/geary-controller.vala:2394
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Isprazniti svu elektronsku poštu iz vaše %s fascikle?"
+
+#: ../src/client/application/geary-controller.vala:2395
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+"Ovo uklanja elektronsku pošto iz Geary i vađeg servera za elektronsku poštu"
+
+#: ../src/client/application/geary-controller.vala:2396
+msgid "This cannot be undone."
+msgstr "Ovo ne možete poništiti."
+
+#: ../src/client/application/geary-controller.vala:2397
+#, c-format
+msgid "Empty %s"
+msgstr "Isprazni %s"
+
+#: ../src/client/application/geary-controller.vala:2414
+#, c-format
+msgid "Error emptying %s"
+msgstr "Greška prilikom pražnjenja %s"
+
+#         translations.
+#: ../src/client/application/geary-controller.vala:2444
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Da li želite da trajno obrišete poruku?"
+msgstr[1] "Da li želite da trajno obrišete poruke?"
+msgstr[2] "Da li želite da trajno obrišete poruke?"
+
+#: ../src/client/application/geary-controller.vala:2446
+msgid "Delete"
+msgstr "Izbriši"
+
+#: ../src/client/application/geary-controller.vala:2477
+msgid "Undo archive (Ctrl+Z)"
+msgstr "Poništi arhiviranje (Ctrl+Z)"
+
+#: ../src/client/application/geary-controller.vala:2492
+msgid "Undo trash (Ctrl+Z)"
+msgstr "Poništi smeće (Ctrl+Z)"
+
+#: ../src/client/application/geary-controller.vala:2545
+msgid "Undo (Ctrl+Z)"
+msgstr "Poništi (Ctrl+Z)"
+
+#         translations.
+#: ../src/client/components/conversation-find-bar.vala:214
+#, c-format
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i slaganje"
+msgstr[1] "%i slaganja"
+msgstr[2] "%i slaganja"
+
+#         translations.
+#: ../src/client/components/conversation-find-bar.vala:216
+#, c-format
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i slaganje (obavijeno)"
+msgstr[1] "%i slaganja (obavijeno)"
+msgstr[2] "%i slaganja (obavijeno)"
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nije nađeno"
+
+#: ../src/client/components/main-toolbar.vala:11
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "Traži"
+
+#. Search bar.
+#: ../src/client/components/main-toolbar.vala:81
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Traži ključne riječi u svim porukama korisničkog računa (Ctrl+S)"
+
+#: ../src/client/components/main-toolbar.vala:200
+#, c-format
+msgid "Indexing %s account"
+msgstr "Indeksiranje %s korisničkog računa"
+
+#: ../src/client/components/main-toolbar.vala:211
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#, c-format
+msgid "Search %s account"
+msgstr "Pretraži %s korisnički račun"
+
+#: ../src/client/components/main-window.vala:349
+#, 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..."
+msgstr "Šaljem..."
+
+#: ../src/client/components/stock.vala:18
+#: ../ui/account_cannot_remove.glade.h:3
+msgid "_OK"
+msgstr "_U redu"
+
+#: ../src/client/components/stock.vala:19 ../ui/password-dialog.glade.h:5
+#: ../ui/remove_confirm.glade.h:5
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Zatvori"
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Odbaci"
+
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Otvori"
+
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Štampaj..."
+
+#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#. Select all.
+#: ../src/client/components/stock.vala:32
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+msgid "Select _All"
+msgstr "Označi _sve"
+
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Zadrži"
+
+#: ../src/client/composer/composer-widget.vala:59
+msgid "Saved"
+msgstr "Snimljeno"
+
+#: ../src/client/composer/composer-widget.vala:60
+msgid "Saving"
+msgstr "Snimanje"
+
+#: ../src/client/composer/composer-widget.vala:61
+msgid "Error saving"
+msgstr "Greška prilikom snimanja"
+
+#: ../src/client/composer/composer-widget.vala:62
+msgid "Press Backspace to delete quote"
+msgstr "Pritisni Backspace za brisanje navodnika"
+
+#. A list of keywords, separated by pipe ("|") characters, that suggest an attachment; sinci
+#. this is full-word checking, include all variants of each word.  No spaces are allowed.
+#: ../src/client/composer/composer-widget.vala:123
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
+msgstr ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
+
+#: ../src/client/composer/composer-widget.vala:1048
+#: ../src/client/composer/composer-widget.vala:1052
+msgid "Do you want to discard this message?"
+msgstr "Da li želite da odbacite ovu poruku?"
+
+#: ../src/client/composer/composer-widget.vala:1185
+msgid "Send message with an empty subject and body?"
+msgstr "Slati poruku sa praznim naslovom i tijelom?"
+
+#: ../src/client/composer/composer-widget.vala:1187
+msgid "Send message with an empty subject?"
+msgstr "Slati poruku sa praznim naslovom?"
+
+#: ../src/client/composer/composer-widget.vala:1189
+msgid "Send message with an empty body?"
+msgstr "Slati poruku sa praznim tijelom?"
+
+#: ../src/client/composer/composer-widget.vala:1191
+msgid "Send message without an attachment?"
+msgstr "Slati poruku bez privitka?"
+
+#: ../src/client/composer/composer-widget.vala:1453
+msgid "Cannot add attachment"
+msgstr "Ne možete dodati privitak"
+
+#: ../src/client/composer/composer-widget.vala:1464
+#, c-format
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" se ne može naći."
+
+#: ../src/client/composer/composer-widget.vala:1471
+#, c-format
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" je direktorij."
+
+#: ../src/client/composer/composer-widget.vala:1478
+#, c-format
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" je prazana datoteka."
+
+#: ../src/client/composer/composer-widget.vala:1492
+#, c-format
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" ne može biti otvoren za čitanje."
+
+#: ../src/client/composer/composer-widget.vala:1499
+#, c-format
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" je već u prilogu za isporuku."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1508
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1568
+msgid "To: "
+msgstr "Za: "
+
+#: ../src/client/composer/composer-widget.vala:1571
+msgid "Cc: "
+msgstr "Cc: "
+
+#: ../src/client/composer/composer-widget.vala:1574