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

[Nathan Dyer]

Updated to 0.8.3 and patched to use the same icons and iconsizes as the previous version. The update to 0.8.3 is required for Gtk+ 3.14.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-03 00:28:41 +0000
+++ CMakeLists.txt	2014-12-29 05:56:39 +0000
@@ -15,7 +15,7 @@
 #
 set(GETTEXT_PACKAGE "geary")
 set(RELEASE_NAME "Lightweight email client for GNOME.")
-set(VERSION "0.8.0")
+set(VERSION "0.8.3")
 set(VERSION_INFO "Release")
 set(LANGUAGE_SUPPORT_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/locale)
 
@@ -28,6 +28,7 @@
 option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
 option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON)
 option(DESKTOP_VALIDATE "Check generated desktop file for errors during build." ON)
+option(TRANSLATE_HELP "Generate and install translated help documentation." ON)
 
 if (DEBUG)
     message(STATUS "Debug build")
@@ -45,6 +46,10 @@
     message(STATUS "Generated desktop file will be checked for errors")
 endif ()
 
+if (TRANSLATE_HELP)
+    message(STATUS "Help translations will be generated and installed")
+endif ()
+
 find_package(PkgConfig)
 pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
 pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
@@ -56,6 +61,8 @@
 pkg_check_modules(WEBKITGTK20X QUIET webkitgtk-3.0>=2.0.0 webkitgtk-3.0<=2.0.100)
 pkg_check_modules(WEBKITGTK110X QUIET webkitgtk-3.0>=1.10.0 webkitgtk-3.0<=1.10.2)
 
+pkg_check_modules(GTK312X QUIET gtk+-3.0>=3.12.0)
+
 # intl
 include(Gettext)
 if (XGETTEXT_FOUND)

=== modified file 'COPYING.icons'
--- COPYING.icons	2014-07-26 10:08:43 +0000
+++ COPYING.icons	2014-12-29 05:56:39 +0000
@@ -40,6 +40,14 @@
     Designed for Geary by Sam Hewitt, 2013
 
 
+The following work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+For more information, see: http://creativecommons.org/licenses/by-sa/3.0/
+
+detach-symbolic.svg
+    Modified from view-restore-symbolic by the GNOME Project
+    https://git.gnome.org/browse/adwaita-icon-theme/plain/Adwaita/scalable/actions/view-restore-symbolic.svg
+
+
 The following work is public domain.
 
 tag-symbolic.svg

=== modified file 'INSTALL'
--- INSTALL	2014-07-26 10:08:43 +0000
+++ INSTALL	2014-12-29 05:56:39 +0000
@@ -34,6 +34,7 @@
       * notify
       * sqlite3
       * webkitgtk-3.0
+      * gcr-3
       * messaging-menu (optional; enables support for Ubuntu Unity messaging
         menu)
       * unity (optional; enables support for Ubuntu Unity launcher)
@@ -64,7 +65,7 @@
             desktop-file-utils gnome-doc-utils libcanberra-devel libgee-devel \
             glib2-devel gmime-devel gtk3-devel libnotify-devel sqlite-devel \
             unique3-devel webkitgtk3-devel libsecret-devel libxml2-devel \
-            vala-tools
+            vala-tools gcr-devel
 
 
   * Installing dependencies on Ubuntu
@@ -83,7 +84,7 @@
             libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgtk-3-dev \
             libsecret-1-dev libxml2-dev libnotify-dev libsqlite3-dev \
             libunique-3.0-dev libwebkitgtk-3.0-dev libmessaging-menu-dev \
-            libunity-dev
+            libunity-dev libgcr-3-dev
 
     You should check that you are using the right version of valac by running:
 

=== modified file 'NEWS'
--- NEWS	2014-07-26 10:08:43 +0000
+++ NEWS	2014-12-29 05:56:39 +0000
@@ -1,3 +1,101 @@
+Geary 0.8.3 - 19 December 2014
+------------------------------
+
+  * Prevent race condition causing Geary window not to open (#737811)
+  * Compile with Vala 0.28 (#741077)
+  * Updated SSLv3 POODLE fallback (#741132)
+  * Fixed connection state handler to return to IDLE
+  * Removed unnecessary assertion causing crashes for intl users (#739316)
+  * Updated German help translations
+  * Updated translations
+
+
+Geary 0.8.2 - 4 November 2014
+-----------------------------
+
+  * "View Source" creates temp files only readable by user (#724436)
+  * elementary Contractor support (#734717)
+  * Prevent displaying blank window when Geary first starts (#720360, #737811)
+  * Disable SSLv3 (POODLE attack) (#739019)
+  * Fix IMAP problems when running under Turkish locale (#714892)
+  * Don't crash when closing composer (#739141)
+  * Updated translations
+
+
+Geary 0.8.1 - 7 October 2014
+----------------------------
+
+  * Display properly-scaled icons under GTK+ 3.14
+  * Don't show composer close/detach buttons twice under GTK+ 3.14
+  * Fix code analysis errors reported by newest Vala
+  * gcr-3 minimum version requirement not specified
+  * Properly install French online help
+  * Czech online help added
+  * Updated Spanish, German translations
+
+
+Geary 0.8.0 - 19 September 2014
+-------------------------------
+
+  * Enforce CSS scope style rules when viewing emails
+  * Bug fixes
+  * Updated translations
+
+
+Geary 0.7.2 - 2 September 2014
+------------------------------
+
+  * Warn user of TLS certificate issues when connecting (#713247)
+  * Better scrolling system for inline composer
+  * Improved database performance and reduced lags
+  * IMAP stack fix (old IDLEs causing command completion)
+  * Compile with Vala 0.25 and better
+  * Updated translations
+
+
+Geary 0.7.1 - 20 August 2014
+----------------------------
+
+  * Show attachments lacking a Content-Disposition
+  * Prevent Inbox from being cleared at startup (Dovecot, Zimbra, more)
+  * Major memory leak (due to GMime bindings) fixes
+  * Improved IMAP disconnect/reconnect logic
+  * Autocomplete properly quotes RFC822 strings
+  * Stabilize search results to prevent lost or dropped results
+  * Inline composer polish
+  * Updated translations
+
+
+Geary 0.7.0 - 18 July 2014
+--------------------------
+
+  * Major overhaul of email composer, now inline in main window and redesigned
+  * Composer will automatically add signature to emails
+  * Saving drafts to server can be disabled
+  * Improved main window interface, now using GtkHeaderBar
+  * Database speed optimizations to reduce lags and improve read times
+  * Improved connection retry
+  * Various bug fixes
+  * Updated translations
+
+
+Geary 0.6.3 - 2 September 2014
+------------------------------
+
+  * Warn user of TLS certificate issues when connecting (#713247)
+  * Fix wrong timestamp in composed email Date: header (#714376)
+  * Compile with Vala 0.25 and better
+
+
+Geary 0.6.2 - 20 August 2014
+----------------------------
+
+  * Patch major memory leak due to GMime bindings
+  * Prevent Vala 0.26 compiler error
+  * Stabilize search sorting to prevent dropped search results
+  * Prevent Inbox from being cleared on startup w/ Dovecot, Zimbra, and more.
+
+
 Geary 0.6.1 - 1 July 2014
 -------------------------
 

=== modified file 'README'
--- README	2014-07-26 10:08:43 +0000
+++ README	2014-12-29 05:56:39 +0000
@@ -4,10 +4,10 @@
 
   * Introduction
 
-    Geary is an email client built for the GNOME desktop environment.  It
+    Geary is an IMAP email client built for the GNOME desktop environment.  It
     allows you to read and send email with a simple, modern interface.
 
-    Visit http://www.yorba.org/geary to read about the current state of
+    Visit https://wiki.gnome.org/Apps/Geary to read about the current state of
     Geary's development and to make sure you're running the latest version.
 
 

=== modified file 'THANKS'
--- THANKS	2014-07-26 10:08:43 +0000
+++ THANKS	2014-12-29 05:56:39 +0000
@@ -5,6 +5,7 @@
 Yosef Or Boczko <[e-mail]>
 Martijn Braam <[e-mail]>
 Attila Bukor <[e-mail]>
+Matthias Clasen <[e-mail]>
 Andrea Corbellini <[e-mail]>
 Sergey Shnatsel Davidoff <[e-mail]>
 Joanmarie Diggs <[e-mail]>
@@ -17,6 +18,7 @@
 Michael Gratton <[e-mail]>
 Sven Hagemann <[e-mail]>
 Mathias Hasselmann <[e-mail]>
+Mohamed Ibrahim <[e-mail]>
 Timo Kluck <[e-mail]>
 Charles Lehner <[e-mail]>
 Avi Levy <[e-mail]>
@@ -30,12 +32,14 @@
 Philipp Nordhus <[e-mail]>
 Andreas Obergrusberger <[e-mail]>
 Martin Olsson <[e-mail]>
+Mark Pariente <[e-mail]>
 Robert Park <[e-mail]>
-ritchiew <[e-mail]>
 Mario Sanchez Prada <[e-mail]>
 Tiago Quelhas <[e-mail]>
+Viko Adi Rahmawan <[e-mail]>
 Didier Roche <[e-mail]>
 Janosch Rolles <[e-mail]>
+Gustavo Rubio <[e-mail]>
 Michel Alexandre Salim <[e-mail]>
 Anirudh Sanjeev <[e-mail]>
 Jakub Steiner <[e-mail]>
@@ -43,4 +47,5 @@
 Jakob Unterwurzacher <[e-mail]>
 Colin Walters <[e-mail]>
 Alexander Wilms <[e-mail]>
+ritchiew <[e-mail]>
 

=== modified file 'cmake/FindIntltool.cmake'
--- cmake/FindIntltool.cmake	2014-10-02 02:02:09 +0000
+++ cmake/FindIntltool.cmake	2014-12-29 05:56:39 +0000
@@ -26,5 +26,12 @@
         )
         install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-autostart.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
     endmacro (INTLTOOL_MERGE_AUTOSTART_DESKTOP desktop_id po_dir)
+    macro (INTLTOOL_MERGE_CONTRACT desktop_id po_dir)
+        add_custom_target (geary-attach.contract ALL
+            ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir}
+                ${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.contract.in ${desktop_id}.contract
+        )
+        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-attach.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
+    endmacro (INTLTOOL_MERGE_CONTRACT desktop_id po_dir)
 endif (INTLTOOL_MERGE_FOUND)
 

=== modified file 'configure'
--- configure	2014-07-26 10:08:43 +0000
+++ configure	2014-12-29 05:56:39 +0000
@@ -24,6 +24,8 @@
 	
 	  --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
@@ -34,6 +36,12 @@
 	                        Disable checking for errors in generated desktop file.
 	  --disable-icon-update
 	                        Disable icon cache update.
+	  --disable-documentation
+	                        Disable generating and installing translated help documentation.
+	  --disable-contractor
+	                        Disable installing Contractor files.
+	  --disable-poodle-ssl3
+	                        Disable POODLE SSLv3 GnuTLS priority fix. (Not recommended.)
 
 	Some influential environment variables:
 	  PKG_CONFIG_PATH       Adds directories to pkg-config's search path.
@@ -88,6 +96,10 @@
                             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"
@@ -104,6 +116,18 @@
         --disable-desktop-validate)
                             CMDLINE="${CMDLINE} -DDESKTOP_VALIDATE=OFF"
                             ;;
+
+        --disable-documentation)
+                            CMDLINE="${CMDLINE} -DTRANSLATE_HELP=OFF"
+                            ;;
+        
+        --disable-contractor)
+                            CMDLINE="${CMDLINE} -DDISABLE_CONTRACT=ON"
+                            ;;
+        
+        --disable-poodle-ssl3)
+                            CMDLINE="${CMDLINE} -DDISABLE_POODLE=ON"
+                            ;;
         
         VALAC)              [ ! $value ] && abort $1
                             VALAC=$value

=== modified file 'desktop/CMakeLists.txt'
--- desktop/CMakeLists.txt	2014-10-02 02:02:09 +0000
+++ desktop/CMakeLists.txt	2014-12-29 05:56:39 +0000
@@ -45,3 +45,20 @@
     )
 endif ()
 
+if (DISABLE_CONTRACT)
+    message (STATUS "Install Contractor contract: OFF")
+else (DISABLE_CONTRACT)
+    message (STATUS "Install Contractor contract: ON")
+    if (INTLTOOL_MERGE_FOUND)
+        INTLTOOL_MERGE_CONTRACT (geary-attach po)
+        
+        if (DESKTOP_VALIDATE)
+            if (DESKTOP_FILE_VALIDATE_FOUND)
+                VALIDATE_DESKTOP_FILE (geary-attach)
+            else (DESKTOP_FILE_VALIDATE_FOUND)
+                message (FATAL_ERROR "desktop-file-validate must be installed to validate generated .desktop file")
+            endif (DESKTOP_FILE_VALIDATE_FOUND)
+        endif (DESKTOP_VALIDATE)
+    endif (INTLTOOL_MERGE_FOUND)
+    install (PROGRAMS geary-attach DESTINATION bin)
+endif (DISABLE_CONTRACT)

=== added file 'desktop/geary-attach'
--- desktop/geary-attach	1970-01-01 00:00:00 +0000
+++ desktop/geary-attach	2014-12-29 05:56:39 +0000
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# This is a wrapper script to attach several files to an email in Geary.
+# Written by Viko Adi Rahmawan <[e-mail]>
+# License: 3-clause BSD
+
+#TODO: define a Gettext domain
+
+# Disable history substitution on "!" symbols so we can have them in strings
+set +H
+
+if [ -z "$1" ] || [ "$1" = '-h' ] || [ "$1" = '--help' ]; then
+    echo $"Usage: $0 /path/to/file [/path/to/another/file...]
+Relative paths are also supported."
+    exit 1 # so that calling without parameters is counted as a failure
+fi
+
+#we dont do file checking as geary is clever enough
+ARG="mailto:?attachment=$1" #add first file
+shift
+while [ -n "$1" ]; do
+    ARG="$ARG&attachment=$1" #add more file if 
+    shift
+done
+
+if [ -n "$ARG" ]; then
+    # Finally execute geary
+    geary "${ARG}"
+else
+    exit 1
+fi

=== added file 'desktop/geary-attach.contract.in'
--- desktop/geary-attach.contract.in	1970-01-01 00:00:00 +0000
+++ desktop/geary-attach.contract.in	2014-12-29 05:56:39 +0000
@@ -0,0 +1,6 @@
+[Contractor Entry]
+_Name=Send by email
+Icon=mail-send
+_Description=Send files using Geary
+MimeType=!inode;
+Exec=geary-attach %F

=== modified file 'geary.doap'
--- geary.doap	2014-07-26 10:08:43 +0000
+++ geary.doap	2014-12-29 05:56:39 +0000
@@ -7,10 +7,14 @@
 
   <name xml:lang="en">geary</name>
   <shortdesc xml:lang="en">Email client</shortdesc>
-  <homepage rdf:resource="http://www.yorba.org/projects/geary/" />
+  <description>Geary is an IMAP email client built for the GNOME desktop environment.  It
+    allows you to read and send email with a simple, modern interface.</description>
+
+  <homepage rdf:resource="https://wiki.gnome.org/Apps/Geary" />
   <mailing-list rdf:resource="https://mail.gnome.org/mailman/listinfo/geary-list" />
   <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=geary" />
-  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
+  <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
+  <programming-language>Vala</programming-language>
 
   <maintainer>
     <foaf:Person>
@@ -20,12 +24,4 @@
     </foaf:Person>
   </maintainer>
 
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Charles Lindsay</foaf:name>
-      <foaf:mbox rdf:resource="mailto:[e-mail]" />
-      <gnome:userid>clindsay</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
 </Project>

=== modified file 'help/CMakeLists.txt'
--- help/CMakeLists.txt	2014-10-02 02:02:09 +0000
+++ help/CMakeLists.txt	2014-12-29 05:56:39 +0000
@@ -15,8 +15,11 @@
 
 # FIXME: don't re-specify this here, instead read it from Makefile.am.
 set(TRANSLATED
+    cs
+    de
     el
     es
+    fr
     it
 )
 

=== modified file 'help/Makefile.am'
--- help/Makefile.am	2014-10-02 02:02:09 +0000
+++ help/Makefile.am	2014-12-29 05:56:39 +0000
@@ -16,4 +16,5 @@
 	star.page \
 	write.page
 
-DOC_LINGUAS = el es fr it
+# NOTE: If you add a language here it *must* also be added to help/CMakeLists.txt!
+DOC_LINGUAS = cs de el es fr it

=== added directory 'help/cs'
=== added file 'help/cs/cs.po'
--- help/cs/cs.po	1970-01-01 00:00:00 +0000
+++ help/cs/cs.po	2014-12-29 05:56:39 +0000
@@ -0,0 +1,1062 @@
+# 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.
+#
+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"
+"Last-Translator: Marek Černocký <[e-mail]>\n"
+"Language-Team: čeština <[e-mail]>\n"
+"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#: C/write.page:9(title)
+msgid "Write a message"
+msgstr "Psaní zprávy"
+
+#: C/write.page:12(p)
+msgid ""
+"To compose a new message in Geary, press the <gui>New Message</gui> button "
+"on the toolbar."
+msgstr ""
+"Když chcete v Geary napsat novou zprávu, zmáčkněte na nástrojové liště "
+"tlačítko <gui>Nová zpráva</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 ""
+"Když chcete odpovědět na zprávu, otevřete nabídku zprávy v pravém horním "
+"rohu zprávy a zvolte <gui>Odpovědět</gui>, <gui>Odpovědět všem</gui> nebo "
+"<gui>Přeposlat</gui>. Můžete také odpovědět na poslední zprávu v konverzaci "
+"přes tlačítka <gui>Odpovědět</gui>, <gui>Odpovědět všem</gui> nebo "
+"<gui>Přeposlat</gui> na nástrojové liště."
+
+#: C/write.page:20(title)
+msgid "Features"
+msgstr "Funkce"
+
+#: 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 ""
+"Při psaní e-mailů v Geary si můžete přizpůsobit písmo, velikost a barvu "
+"textu. Rovněž můžete do zpráv vkládat hypertextové odkazy."
+
+#: 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 ""
+"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."
+
+#: C/write.page:27(p)
+msgid ""
+"You can attach a file to a message you're writing in either of these ways:"
+msgstr "K napsané zprávě můžete přiložit soubory a to následujícími způsoby:"
+
+#: 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 ""
+"Zmáčkněte tlačítko <gui>Přiložit soubor</gui> v levém dolním rohu okna "
+"editoru a následně vyberte soubor, který chcete přiložit."
+
+#: 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 ""
+"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)
+msgid "Drafts"
+msgstr "Koncepty"
+
+#: 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 ""
+"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."
+
+#: 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 ""
+"Až chcete ve psaní stávajícího konceptu pokračovat, vyberte v seznamu složek "
+"složku Koncepty, vyberte zprávu a klikněte v prohlížeči zpráv na „Upravit "
+"koncept“ ."
+
+#: C/write.page:45(p)
+msgid "Geary deletes the draft when you send the message."
+msgstr "Po odeslání zprávy Geary koncept smaže."
+
+#: C/star.page:10(title)
+msgid "Star a message or mark it as read/unread"
+msgstr "Označení zprávy hvězdičkou nebo jako přečtená/nepřečtená"
+
+#: C/star.page:12(title)
+msgid "Star messages"
+msgstr "Označení zpráv hvězdičkou"
+
+#: 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 ""
+"Zprávy si můžete označovat hvězdičkou, abyste věděli, že jsou pro vás "
+"důležité. Pokud tak chcete učinit, klikněte na ikonu hvězdičky u konverzace "
+"v seznamu konverzací. Hvězdičkou můžete označit i jednotlivou zprávu, stačí "
+"kliknout na hvězdičku v pravém horním rohu zprávy."
+
+#: C/star.page:15(p)
+msgid ""
+"With Gmail accounts, starred messages appear in the Starred folder in the "
+"folder list."
+msgstr ""
+"V účtech Gmail se zprávy označené hvězdičkou objeví ve složce „S hvězdičkou“ "
+"v seznamu složek."
+
+#: C/star.page:18(title)
+msgid "Mark messages as read or unread"
+msgstr "Označování zpráv, jako přečtené nebo nepřečtené"
+
+#: 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 označuje zprávy automaticky jako přečtené, když si je přečtete. Když "
+"chcete zprávu jako přečtenou či nepřečtenou označit ručně, klikněte na ikonu "
+"kolečka v seznamu konverzace."
+
+#: 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 ""
+"Případně můžete k přepnutí stavu přečteno/nepřečteno u vybrané konverzace "
+"použít <gui>Označit jako přečtené</gui> či <gui>Označit jako nepřečtené</"
+"gui> v nabídce <gui>Označit</gui> na nástrojové liště."
+
+#: C/star.page:25(p)
+msgid ""
+"To mark an individual message as read, select <gui>Mark as Read</gui> from "
+"the dropdown menu."
+msgstr ""
+"Pro označení jednotlivé zprávy jako přečtené vyberte <gui>Označit jako "
+"přečtené</gui> v rozbalovací nabídce."
+
+#: C/shortcuts.page:11(title)
+msgid "Keyboard shortcuts"
+msgstr "Klávesové zkratky"
+
+#: C/shortcuts.page:12(p)
+msgid "Geary has keyboard shortcuts for most common operations."
+msgstr "Geary má klávesové zkratky pro většinu běžných činností."
+
+#: C/shortcuts.page:15(p)
+msgid "Compose a new message"
+msgstr "Napsat novou zprávu"
+
+#: 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> nebo <key>N</key>"
+
+#: C/shortcuts.page:19(p)
+msgid "Reply to sender"
+msgstr "Odpovědět odesilateli"
+
+#: 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> nebo <key>R</key>"
+
+#: C/shortcuts.page:23(p)
+msgid "Reply to all"
+msgstr "Odpovědět všem"
+
+#: 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> nebo "
+"<keyseq><key>Shift</key><key>R</key></keyseq>"
+
+#: C/shortcuts.page:27(p)
+msgid "Forward"
+msgstr "Přeposlat"
+
+#: 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> nebo <key>F</key>"
+
+#: C/shortcuts.page:31(p)
+msgid "Archive"
+msgstr "Archivovat"
+
+#: C/shortcuts.page:32(key)
+msgid "A"
+msgstr "A"
+
+#: C/shortcuts.page:35(p)
+msgid "Trash"
+msgstr "Přesunout do koše"
+
+#: C/shortcuts.page:36(p)
+msgid "<key>Delete</key> or <key>Backspace</key>"
+msgstr "<key>Delete</key> nebo <key>Backspace</key>"
+
+#: C/shortcuts.page:39(p)
+msgid "Delete"
+msgstr "Smazat"
+
+#: 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> nebo <keyseq><key>Shift</"
+"key><key>Backspace</key></keyseq>"
+
+#: C/shortcuts.page:43(p)
+msgid "Star"
+msgstr "Přidělit hvězdičku"
+
+#: C/shortcuts.page:44(key) C/shortcuts.page:92(key)
+msgid "S"
+msgstr "S"
+
+#: C/shortcuts.page:47(p)
+msgid "Unstar"
+msgstr "Odebrat hvězdičku"
+
+#: C/shortcuts.page:48(key)
+msgid "D"
+msgstr "D"
+
+#: C/shortcuts.page:51(p)
+msgid "Mark read"
+msgstr "Označit jako přečtené"
+
+#: 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> nebo <keyseq><key>Shift</"
+"key><key>I</key></keyseq>"
+
+#: C/shortcuts.page:55(p)
+msgid "Mark unread"
+msgstr "Označit jako nepřečtené"
+
+#: 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> nebo <keyseq><key>Shift</"
+"key><key>U</key></keyseq>"
+
+#: C/shortcuts.page:59(p)
+msgid "Toggle spam"
+msgstr "Označit jako spam/zrušit označení"
+
+#: 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> nebo <key>!</key>"
+
+#: C/shortcuts.page:63(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)
+msgid "Q"
+msgstr "Q"
+
+#: C/shortcuts.page:67(p)
+msgid "Zoom in"
+msgstr "Přiblížit"
+
+#: C/shortcuts.page:68(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)
+msgid "Zoom out"
+msgstr "Oddálit"
+
+#: C/shortcuts.page:72(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)
+msgid "Reset zoom"
+msgstr "Přiblížení na výchozí velikost"
+
+#: 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> nebo <key>0</key>"
+
+#: C/shortcuts.page:79(p) C/preferences.page:10(title)
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: C/shortcuts.page:80(key)
+msgid "E"
+msgstr "E"
+
+#: C/shortcuts.page:83(p) C/accounts.page:10(title)
+msgid "Accounts"
+msgstr "Účty"
+
+#: C/shortcuts.page:84(key)
+msgid "M"
+msgstr "M"
+
+#: C/shortcuts.page:87(p)
+msgid "Close composer window"
+msgstr "Zavřít okno editoru"
+
+#: C/shortcuts.page:88(key)
+msgid "W"
+msgstr "W"
+
+#: C/shortcuts.page:91(p)
+msgid "Jump to search box"
+msgstr "Přejít do vyhledávacího pole"
+
+#: C/shortcuts.page:95(p)
+msgid "Find in current conversation"
+msgstr "Hledat v aktuální konverzaci"
+
+#: C/shortcuts.page:96(key)
+msgid "F"
+msgstr "F"
+
+#: C/shortcuts.page:99(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)
+msgid "G"
+msgstr "G"
+
+#: C/shortcuts.page:103(p)
+msgid "Find previous in current conversation"
+msgstr "Najít předchozí v aktuální konverzaci"
+
+#: C/shortcuts.page:104(key)
+msgid "Shift"
+msgstr "Shift"
+
+#: C/search.page:10(title)
+msgid "Search"
+msgstr "Hledání"
+
+#: 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 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."
+
+#: 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 ""
+"Rozsah vyhledávání pokrývá text zpráv, e-mailové adresy (od, komu a kopie), "
+"řádek s předmětem a názvy souborů v přílohách."
+
+#: C/search.page:19(p)
+msgid ""
+"Keywords that match your search are highlighted in the message view. Geary "
+"will match different forms of the same word, for example searching for \"walk"
+"\" will also match \"walking\" and \"walked.\""
+msgstr ""
+"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"
+msgstr "Operátory vyhledávání"
+
+#: C/search.page:24(p)
+msgid "Geary supports the following operators to limit the scope of searches:"
+msgstr "Geary podporuje následující operátory omezující rozsah vyhledávání:"
+
+#: C/search.page:27(var)
+msgid "filename"
+msgstr "název_souboru"
+
+#: C/search.page:27(input)
+msgid "attachment:<placeholder-1/>"
+msgstr "attachment:<placeholder-1/>"
+
+#: C/search.page:28(p)
+msgid "Finds messages with attachments whose name matches <var>filename</var>."
+msgstr ""
+"Najít zprávy, jejich přílohy mají název odpovídající <var>názvu_souboru</"
+"var>."
+
+#: C/search.page:31(var) C/search.page:39(var) C/search.page:51(var)
+msgid "recipient"
+msgstr "příjemce"
+
+#: C/search.page:31(input)
+msgid "bcc:<placeholder-1/>"
+msgstr "bcc:<placeholder-1/>"
+
+#: C/search.page:32(p)
+msgid "Finds messages where <var>recipient</var> matches the BCC header."
+msgstr ""
+"Najít zprávy, ve kterých <var>příjemce</var> odpovídá údaji „Skrytá kopie“ v "
+"hlavičce."
+
+#: C/search.page:35(var) C/search.page:47(var)
+msgid "text"
+msgstr "text"
+
+#: C/search.page:35(input)
+msgid "body:<placeholder-1/>"
+msgstr "body:<placeholder-1/>"
+
+#: C/search.page:36(p)
+msgid "Finds messages whose body contains <var>text</var>."
+msgstr "Najít zprávy, jejichž tělo obsahuje <var>text</var>."
+
+#: C/search.page:39(input)
+msgid "cc:<placeholder-1/>"
+msgstr "cc:<placeholder-1/>"
+
+#: C/search.page:40(p)
+msgid "Finds messages where <var>recipient</var> matches the CC header."
+msgstr ""
+"Najít zprávy, ve kterých <var>příjemce</var> odpovídá údaji „Kopie“ v "
+"hlavičce."
+
+#: C/search.page:43(var)
+msgid "sender"
+msgstr "odesilatel"
+
+#: C/search.page:43(input)
+msgid "from:<placeholder-1/>"
+msgstr "from:<placeholder-1/>"
+
+#: 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."
+
+#: C/search.page:47(input)
+msgid "subject:<placeholder-1/>"
+msgstr "subject:<placeholder-1/>"
+
+#: C/search.page:48(p)
+msgid "Finds messages whose subject contains <var>text</var>."
+msgstr "Najít zprávy, jejichž předmět obsahuje <var>text</var>."
+
+#: C/search.page:51(input)
+msgid "to:<placeholder-1/>"
+msgstr "to:<placeholder-1/>"
+
+#: C/search.page:52(p)
+msgid ""
+"Finds messages where <var>sender</var> matches the To, CC, or BCC header."
+msgstr ""
+"Najít zprávy, ve kterých <var>odesilatel</var> odpovídá údajům „Komu“, "
+"„Kopi“ nebo „Skrytá kopie“ v hlavičce."
+
+#: 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 ""
+"Jako speciální případ podporují operátory <input>bcc</input>, <input>cc</"
+"input>, <input>from</input> a <input>to</input> argument <input>me</input>, "
+"který hledá e-mailové adresy účtu v příslušném kontextu."
+
+#: C/preferences.page:11(p)
+msgid ""
+"The <gui>Preferences</gui> option is available in either Geary's application "
+"menu or the gear menu in the upper-right of the toolbar. (The location "
+"depends on the install desktop shell. For GNOME Shell and Unity, the "
+"application menu is available near the top-left corner of the screen.)"
+msgstr ""
+"Položku <gui>Předvolby</gui> najdete v aplikační nabídce Geary a v nabídce v "
+"pravém horním rohu nástrojové lišty. (Přesné umístění záleží na "
+"nainstalovaném pracovním prostředí. V GNOME Shell a Unity se aplikační "
+"nabídky nachází poblíž levého horního rohu obrazovky.)"
+
+#: C/preferences.page:17(title)
+msgid "Reading"
+msgstr "Čtení"
+
+#: C/preferences.page:20(gui)
+msgid "Automatically select next message"
+msgstr "Automaticky vybrat další zprávu"
+
+#: 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 ""
+"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."
+
+#: C/preferences.page:26(gui)
+msgid "Display conversation preview"
+msgstr "Zobrazit náhled konverzace"
+
+#: C/preferences.page:27(p)
+msgid ""
+"Enables message previews in the conversation list. Previews show the first "
+"few lines of each message."
+msgstr ""
+"Povoluje náhled zpráv v seznamu konverzací. V náhledu se zobrazuje pár "
+"prvních řádků od každé zprávy."
+
+#: C/preferences.page:34(title)
+msgid "Composer"
+msgstr "Editor"
+
+#: C/preferences.page:37(gui)
+msgid "Enable spell checking"
+msgstr "Zapnout kontrolu pravopisu"
+
+#: 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 ""
+"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"
+msgstr "Upozornění"
+
+#: C/preferences.page:48(gui)
+msgid "Play notification sounds"
+msgstr "Přehrávat zvuková upozornění"
+
+#: C/preferences.page:49(p)
+msgid "When set, Geary plays a sound whenever a new message arrives."
+msgstr "Když je zapnuto, Geary přehraje zvuk pokaždé, když dorazí nová zpráva."
+
+#: C/preferences.page:52(gui)
+msgid "Show notifications for new mail"
+msgstr "Zobrazit upozornění na nový e-mail"
+
+#: 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 ""
+"Když je zapnuto, zobrazí Geary <em>upozornění</em> pokaždé, když dorazí nová "
+"zpráva. Upozornění se zobrazují podle zvyklostí systému. V GNOME Shell se "
+"zobrazují ve spodní části obrazovky, v Ubuntu Unity v pravém horním rohu "
+"obrazovky."
+
+#: C/overview.page:8(title)
+msgid "Overview"
+msgstr "Přehled"
+
+#: 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 je lehká čtečka e-mailů pro pracovní prostředí <link href=\"http://"
+"gnome.org\">GNOME</link>. Pracuje s poštovními servery, které podporují "
+"protokol IMAP, včetně populárních služeb jako je Gmail, Yahoo Mail a 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 seskupuje poštu do takzvaných <em>konverzací</em>. Konverzace obsahuje "
+"všechny zprávy v jednom vlákně diskuze."
+
+#: C/overview.page:17(p)
+msgid "The main Geary window is divided into several areas:"
+msgstr "Hlavní okno Geary je rozděleno na několik částí:"
+
+#: C/overview.page:20(title)
+msgid "Folder list"
+msgstr "Seznam složek"
+
+#: 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>Seznam složek</em> nalevo zobrazuje všechny <em>složky</em> a "
+"<em>štítky</em> ve vašem poštovním účtu. Geary používá výraz <em>štítek</em> "
+"pro libovolnou složku, kterou jste vytvořili kvůli roztřídění svých zpráv. "
+"(Webové rozhraní Gmail používá tento výraz také, většina ostatních služeb "
+"jej ale nepoužívá.)"
+
+#: C/overview.page:28(title)
+msgid "Conversation list"
+msgstr "Seznam konverzací"
+
+#: 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>Seznam konverzací</em> zobrazuje seznam konverzací ve vybrané složce. "
+"Nejnovější konverzace se zobrazují nahoře."
+
+#: 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 ""
+"Jméno každého odesilatele, od kterého máte nějakou nepřečtenou zprávu, se "
+"zobrazí tučně. Pokud je v konverzaci více než jedna zpráva, zobrazí Geary "
+"počet zpráv v konverzaci."
+
+#: 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 automaticky nestahuje všechny zprávy ve všech vašich poštovních "
+"složkách. Když poprvé navštívíte svoji složku s doručenou poštou (nebo "
+"nějakou jinou), Geary stáhne 50 nejnovějších zpráv ve složce. Abyste viděli "
+"více zpráv, stačí se v seznamu konverzace posouvat dolů a další zprávy se "
+"boudou automaticky získávat."
+
+#: 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 ""
+"Některé příkazy lze v Geary použít na skupinu konverzací. Abyste označili "
+"více konverzací, držte zmáčknutou klávesu <key>Ctrl</key> a postupně v "
+"seznamu konverzací klikněte na každou konverzaci, kterou chcete vybrat. "
+"Případně můžete označit celý blok tak, že kliknete na první konverzaci, "
+"podržíte <key>Shift</key> a kliknete na poslední konverzaci."
+
+#: C/overview.page:44(title)
+msgid "Message area"
+msgstr "Oblast zpráv"
+
+#: 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 ""
+"V <em>oblasti zpráv</em> jsou zobrazeny všechny zprávy z vybrané konverzace, "
+"přičemž nejstarší zpráva je nejvíc nahoře."
+
+#: 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 ""
+"V pravém horním rohu každé zprávy zobrazuje Geary rozbalovací šipku, pomocí "
+"které můžete otevřít <em>nabídku zprávy</em> s příkazy týkajícími se zprávy."
+
+#: 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 ""
+"Když si zobrazíte konverzaci, Geary sbalí zprávy, které jste již četli. "
+"Kliknutím na sbalené zprávy je rozbalíte. Kliknutím na hlavičku rozbalené "
+"zprávy je sbalíte."
+
+#: C/overview.page:50(p)
+msgid ""
+"Any attachments in a message appear at the bottom of the message. You can "
+"click an attachment to open it or right-click to save it."
+msgstr ""
+"Případné přílohy zprávy se objeví ve spodní části zprávy. Kliknutím na "
+"přílohu ji otevřete, kliknutím pravým tlačítkem ji uložíte."
+
+#: 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 používá <link href=\"https://secure.gravatar.com/\">Gravatar</link> "
+"pro zobrazení avatara u odesilatele zprávy v hlavičce zprávy."
+
+#: C/limits.page:11(title)
+msgid "Limitations"
+msgstr "Omezení"
+
+#: 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 je prozatím ve stádiu ranného vývoje. Podporuje IMAP a byl testován "
+"vůči poštovním serverům Gmail, Yahoo a svobodnému Dovecotu. Pokusně je "
+"poskytována podpora pro Outlook.com. S některými jinými servery IMAP nemusí "
+"Geary pracovat úplně správně. V současnosti schází také řada různých funkcí, "
+"včetně práce při odpojení od sítě."
+
+#: C/limits.page:14(p)
+msgid ""
+"To learn more about the features we're working on and the future of Geary, "
+"please visit Geary's <link href=\"https://wiki.gnome.org/Apps/Geary\">wiki "
+"page</link>."
+msgstr ""
+"Jestli se chcete dozvědět více od funkcích, na kterých se pracuje a o "
+"budoucnosti Geary, navštivte <link href=\"https://wiki.gnome.org/Apps/Geary"
+"\">wikistránku</link> projektu Geary."
+
+#: C/label.page:10(title)
+msgid "Label or move a conversation"
+msgstr "Přiřazování štítků a přesun konverzací"
+
+#: C/label.page:12(title)
+msgid "Label a conversation"
+msgstr "Přidělení štítku konverzaci"
+
+#: 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 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."
+
+#: C/label.page:15(p)
+msgid ""
+"To label one or more conversations, first select the conversation(s), then "
+"do either of the following:"
+msgstr ""
+"Když chcte jedné či více konverzacím přidělit štítek, nejprve je vyberte a "
+"potom použijte jeden z následujících postupů:"
+
+#: 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 ""
+"Klikněte na tlačítko <gui>Štítek</gui> na nástrojové liště a vyberte štítek "
+"z výsledné rozbalovací nabídky."
+
+#: 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 ""
+"Držte zmáčknutou klávesu <key>Ctrl</key> a přetáhněte konverzaci či "
+"konverzace ze seznamu konverzací do štítku v postranním panelu."
+
+#: C/label.page:25(title)
+msgid "Move a conversation to a folder or label"
+msgstr "Přesunutí konverzace do složky nebo štítku"
+
+#: 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 ""
+"Když chcete jednu nebo více konverzací přesunout do složky nebo štítku, "
+"nejprve je vyberte a pak použijte jeden z následujících postupů:"
+
+#: 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 ""
+"Klikněte na tlačítko <gui>Přesunout</gui> na nástrojové liště a vyberte "
+"složku nebo štítek z výsledné rozbalovací nabídky."
+
+# Poznámky:
+# Přidat poznámku
+#: C/label.page:31(p)
+msgid ""
+"Drag the conversation(s) from the conversation list to the folder or label "
+"in the sidebar."
+msgstr ""
+"Přetáhněte konverzaci či konverzace ze seznamu konverzací do složky nebo "
+"štítku v postranním panelu."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:5(None)
+msgid "@@image: 'figures/geary.svg'; md5=18b50c9e10fe5256ae1cb12aaa3a7600"
+msgstr "@@image: 'figures/geary.svg'; md5=18b50c9e10fe5256ae1cb12aaa3a7600"
+
+#: C/index.page:5(title)
+msgid "<media type=\"image\" src=\"figures/geary.svg\"/> Geary"
+msgstr "<media type=\"image\" src=\"figures/geary.svg\"/> Geary"
+
+#: C/index.page:9(title)
+msgid "Introduction"
+msgstr "Úvod"
+
+#: C/index.page:13(title)
+msgid "Using Geary"
+msgstr "Používání Geary"
+
+#: C/index.page:17(title)
+msgid "Bugs"
+msgstr "Chyby"
+
+#: C/bugs.page:8(title)
+msgid "Think you've found a bug?"
+msgstr "Myslíte, že jste našli chybu?"
+
+#: C/bugs.page:9(p)
+msgid ""
+"If you suspect you've found a bug in Geary, follow these steps to report it:"
+msgstr ""
+"Pokud předpokládáte, že jste našli v aplikaci Geary chybu, postupujte "
+"následovně:"
+
+#: C/bugs.page:11(p)
+msgid ""
+"Search Geary's <link href=\"https://bugzilla.gnome.org/browse.cgi?"
+"product=geary\">bug database</link> to see if someone else has reported the "
+"bug."
+msgstr ""
+"Podívejte se do <link href=\"https://bugzilla.gnome.org/browse.cgi?"
+"product=geary\">databáze chyb</link> aplikace Geary, jestli stejnou chybu "
+"nenahlásil již někdo jiný."
+
+#: C/bugs.page:13(p)
+msgid ""
+"Don't see your bug listed? Congratulations! You've found a new bug. To "
+"create an bug report, create an account on GNOME's Bugzilla and <link href="
+"\"https://bugzilla.gnome.org/enter_bug.cgi?product=geary\">file a new bug</"
+"link>. Be as specific as you can and describe the steps to reproduce it. "
+"Don't forget to include details about your operating system and what version "
+"of Geary you're running."
+msgstr ""
+"Nenašli jste ji? Gratulujeme! Našli jste zbrusu novou chybu. Abyste ji mohli "
+"nahlásit, vytvořte si účet v Bugzille projektu GNOME a <link href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=geary\">vyplňte údaje o nové chybě</"
+"link>. Buďte co nejvíce konkrétní a popište kroky, kterými se dá chyba "
+"reprodukovat. Nezapomeňte zahrnout informace o svém operačním systému a "
+"verzi 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 ""
+"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"
+msgstr "Mazání a archivace zpráv"
+
+#: 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 ""
+"Pokud používáte Geary s účtem Gmail, umožní vám Geary zprávy <em>archivovat</"
+"em>. Tlačítko <gui>Archivovat</gui> na nástrojové liště archivuje vybranou "
+"konverzaci. Archivované zprávy se objeví ve složce <gui>Všechny zprávy</gui>."
+
+#: C/archive.page:16(p)
+msgid ""
+"With other mail servers, you can trash or delete, but not archive, messages. "
+"To move one or more conversations to the <gui>Trash</gui> folder, select "
+"them and press the <gui>Trash</gui> button on the toolbar. To permanently "
+"delete the conversations, hold down <key>Shift</key> and press the "
+"<gui>Delete</gui> button that appears in place of the <gui>Trash</gui> "
+"button."
+msgstr ""
+"U ostatních poštovních serverů můžete zprávy mazat a přesouvat do koše, ale "
+"ne je archivovat. Když chcete jednu nebo více konverzací přesunout do složky "
+"<gui>Koš</gui>, vyberte je a zmáčkněte tlačítko <gui>Koš</gui> na nástrojové "
+"liště. Abyste konverzaci smazali trvale, držte zmáčknutý <key>Shift</key> a "
+"zmáčkněte tlačítko <gui>Smazat</gui> vyskytující se vedle tlačítka <gui>Koš</"
+"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 ""
+"Mázání není k dispozici u každé složky, např. není u složky Hledání. Rovněž "
+"není k dispozici pro Gmail. U něj tlačítko <gui>Koš</gui> přesune zprávy do "
+"složky koš na serveru, kde je uživatel může smazat ručně. Případně je smaže "
+"server automaticky po 30 dnech."
+
+#: C/accounts.page:13(title)
+msgid "Adding accounts"
+msgstr "Přidávání účtů"
+
+#: 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 ""
+"Když Geary spustíte poprvé, budete dotázáni na přidání poštovního účtu. Na "
+"této obrazovce vyberte, jestli máte účet Gmail, Yahoo, Outlook.com nebo "
+"jiný. U účtu jiného typu budete muset zadat své nastavení IMAP a SMTP ručně."
+
+#: C/accounts.page:19(p)
+msgid ""
+"Additional accounts can be added from the Accounts dialog. The "
+"<gui>Accounts</gui> option is available in either Geary's application menu "
+"or the gear menu in the upper-right of the toolbar. (The location depends on "
+"the install desktop shell. For GNOME Shell and Unity, the application menu "
+"is available near the top-left corner of the screen.) Alternately, "
+"<keyseq><key>Ctrl</key><key>M</key></keyseq> will open the Accounts dialog. "
+"To add an account, click the + button."
+msgstr ""
+"Další účty můžete přidat v dialogovém okně Účty. Volbu <gui>Účty</gui> "
+"najdete buď v aplikační nabídce Geary nebo v nabídce v pravém horním rohu "
+"nástrojové lišty. (Přesné místo závisí na používaném grafickém shellu. V "
+"GNOME Shell a Unity se aplikační nabídka nachází poblíž levého horního rohu "
+"obrazovky.) Případně můžete dialogové okno Účty otevřít pomocí "
+"<keyseq><key>Ctrl</key><key>M</key></keyseq>. Nový účet přidáte kliknutím na "
+"tlačítko +."
+
+#: C/accounts.page:28(title)
+msgid "Editing existing accounts"
+msgstr "Úprava stávajících účtů"
+
+#: 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 ""
+"V dialogovém okně Účty vyberte účet a po kliknutí na ikonu tužky můžete "
+"měnit různá nastavení. Vezměte ale prosím na vědomí, že Geary neumí změnit u "
+"existujícího účtu server. Pokud potřebujete změnit server IMAP nebo SMTP, "
+"budete muset účet smazat a znovu jej přidat."
+
+#: 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 ""
+"Pro změnu pořadí zobrazení účtů v seznamu složek, stačí účet v dialogovém "
+"okně Účty přetáhnout na požadované místo."
+
+#: C/accounts.page:37(p)
+msgid "There are some advanced options available when editing accounts:"
+msgstr "Během úprav účtu jsou k dispozici některá pokročilá nastavení:"
+
+#: 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 ""
+"Zaškrtávací políčko <gui>Ukládat odeslanou poštu</gui> řídí, jestli se mají "
+"úspěšně odeslané zprávy vkládat do složky <gui>Odeslaná pošta</gui> "
+"náležející k účtu. U Gmailu se tak děje automaticky. Yahoo a některé další "
+"účty lze nastavit, aby se tak dělo také automaticky. U ostatních účtů "
+"nebudete při vypnutí této volby moci procházet zprávy, které jste odeslali."
+
+#: 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 ""
+"V rozbalovacím seznamu <gui>Stahnout e-mail</gui> je možné nastavit, kolik "
+"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)
+msgid "Removing accounts"
+msgstr "Odebírání účtů"
+
+#: 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 ""
+"Když chcete účet smazat, otevřte dialogové okno Účty, vyberte účet a "
+"zmáčkněte tlačítko -. Geary smaže všechny informace související s daným "
+"účtem."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/accounts.page:0(None)
+msgid "translator-credits"
+msgstr "Marek Černocký <[e-mail]>"

=== added directory 'help/de'
=== added file 'help/de/de.po'
--- help/de/de.po	1970-01-01 00:00:00 +0000
+++ help/de/de.po	2014-12-29 05:56:39 +0000
@@ -0,0 +1,1107 @@
+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"
+"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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: C/write.page:9(title)
+msgid "Write a message"
+msgstr "Eine Nachricht schreiben"
+
+#: C/write.page:12(p)
+msgid ""
+"To compose a new message in Geary, press the <gui>New Message</gui> button "
+"on the toolbar."
+msgstr ""
+"Um eine neue Nachricht in Geary zu erstellen, klicken Sie auf den Knopf "
+"<gui>Neue Nachricht</gui> in der Werkzeugleiste."
+
+#: 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 ""
+"Um auf eine Nachricht zu antworten, öffnen Sie das Nachrichten-Menü in der "
+"oberen rechten Ecke der Nachricht und wählen Sie <gui>Antworten</gui>, "
+"<gui>Allen Antworten</gui> oder <gui>Weiterleiten</gui>. Sie können außerdem "
+"auf die letzte Nachricht einer Konversation mit Hilfe der Knöpfe "
+"<gui>Antworten</gui>, <gui>Allen Antworten</gui> und <gui>Weiterleiten</gui> "
+"in der Werkzeugleiste antworten."
+
+#: C/write.page:20(title)
+msgid "Features"
+msgstr "Besonderheiten"
+
+#: 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 ""
+"Der E-Mail-Editor von Geary ermöglicht es Ihnen, die Schriftart, die "
+"Schriftgröße und die Textfarbe anzupassen. Außerdem ist es möglich, Verweise "
+"in Nachrichten einzufügen."
+
+#: 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 kann auch einfache Text-Nachrichten verschicken. Aktivieren oder "
+"deaktivieren Sie »Rich Text« im Auswahl-Menü, um zwischen einfachem Text- "
+"und Rich-Text-Modus zu wechseln."
+
+#: C/write.page:27(p)
+msgid ""
+"You can attach a file to a message you're writing in either of these ways:"
+msgstr ""
+"Sie können eine Datei an eine gerade verfasste Nachricht wie folgt anhängen:"
+
+#: 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 ""
+"Drücken Sie den Knopf <gui>Datei anhängen</gui> in der unteren linken Ecke "
+"des Editor-Fensters und wählen Sie anschließend die anzuhängende Datei."
+
+#: 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 ""
+"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)
+msgid "Drafts"
+msgstr "Entwürfe"
+
+#: 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 ""
+"Unterstützt ein E-Mail Server das Speichern von Entwürfen, speichert Geary "
+"die Nachricht automatisch während Sie schreiben. Schließen Sie den Editor "
+"ohne die Nachricht zu senden, fragt Geary, ob die Nachricht als Entwurf "
+"gespeichert oder verworfen werden soll. "
+
+#: 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 ""
+"Um einen bereits existierenden Entwurf zu bearbeiten, wählen Sie den "
+"Entwürfe-Ordner aus der Ordnerliste, wählen die Nachricht und wählen in der "
+"Nachrichten Ansicht \"Entwurf bearbeiten\"."
+
+#: C/write.page:45(p)
+msgid "Geary deletes the draft when you send the message."
+msgstr "Geary löscht den Entwurf, wenn die Nachricht gesendet wird."
+
+#: C/star.page:10(title)
+msgid "Star a message or mark it as read/unread"
+msgstr ""
+"Eine Nachricht mit Sternchen versehen oder als gelesen/ungelesen  markieren"
+
+#: C/star.page:12(title)
+msgid "Star messages"
+msgstr "Nachrichten mit Sternchen versehen "
+
+#: 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 ""
+"Sie können Nachrichten mit Sternchen versehen, um sie als besonders wichtig "
+"zu kennzeichnen. Um eine Konversation mit einem Sternchen zu versehen, "
+"drücken Sie das Sternchen-Symbol in der Konversationsliste. Eine einzelne "
+"Nachricht können Sie mit einem Sternchen versehen, indem Sie auf das "
+"Sternchen-Symbol in der oberen rechten Ecke der Nachricht drücken."
+
+#: C/star.page:15(p)
+msgid ""
+"With Gmail accounts, starred messages appear in the Starred folder in the "
+"folder list."
+msgstr ""
+"Bei Gmail-Konten erscheinen mit Sternchen markierte Nachrichten im Markiert "
+"Ordner in der Ordnerliste."
+
+#: C/star.page:18(title)
+msgid "Mark messages as read or unread"
+msgstr "Nachrichten als gelesen oder ungelesen markieren"
+
+#: 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 markiert Nachrichten automatisch als gelesen, während Sie sie lesen. "
+"Um eine Konversation von Hand als gelesen oder ungelesen zu markieren, "
+"drücken Sie das Kreis-Symbol in der Konversationsliste."
+
+#: 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 ""
+"Alternativ kann auch <gui>Als ungelesen markieren</gui> aus dem "
+"<gui>Markierungen</gui>-Menü in der Werkzeugleiste verwendet werden, um den "
+"gelesen Status der Konversation zu ändern."
+
+#: C/star.page:25(p)
+msgid ""
+"To mark an individual message as read, select <gui>Mark as Read</gui> from "
+"the dropdown menu."
+msgstr ""
+"Um eine einzelne Nachricht als gelesen zu markieren, wählen Sie <gui>Als "
+"gelesen markieren</gui> aus dem DropDown-Menü."
+
+#: C/shortcuts.page:11(title)
+msgid "Keyboard shortcuts"
+msgstr "Tastaturkürzel"
+
+#: C/shortcuts.page:12(p)
+msgid "Geary has keyboard shortcuts for most common operations."
+msgstr "Geary bietet Tastenkürzel für die meisten gängigen Operationen."
+
+#: C/shortcuts.page:15(p)
+msgid "Compose a new message"
+msgstr "Neue Nachricht erstellen"
+
+#: C/shortcuts.page:16(p)
+msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq> or <key>N</key>"
+msgstr "<keyseq><key>Strg</key><key>N</key></keyseq> oder <key>N</key>"
+
+#: C/shortcuts.page:19(p)
+msgid "Reply to sender"
+msgstr "Antwort an Absender"
+
+#: C/shortcuts.page:20(p)
+msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>R</key>"
+msgstr "<keyseq><key>Strg</key><key>R</key></keyseq> oder <key>R</key>"
+
+#: C/shortcuts.page:23(p)
+msgid "Reply to all"
+msgstr "Allen antworten"
+
+#: 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>Strg</key><key>Umschalt</key><key>R</key></keyseq> oder "
+"<keyseq><key>Umschalt</key><key>R</key></keyseq>"
+
+#: C/shortcuts.page:27(p)
+msgid "Forward"
+msgstr "Weiterleiten"
+
+#: C/shortcuts.page:28(p)
+msgid "<keyseq><key>Ctrl</key><key>L</key></keyseq> or <key>F</key>"
+msgstr "<keyseq><key>Strg</key><key>L</key></keyseq> oder <key>F</key>"
+
+#: C/shortcuts.page:31(p)
+msgid "Archive"
+msgstr "Archiv"
+
+#: C/shortcuts.page:32(key)
+msgid "A"
+msgstr "A"
+
+#: C/shortcuts.page:35(p)
+msgid "Trash"
+msgstr "Papierkorb"
+
+#: C/shortcuts.page:36(p)
+msgid "<key>Delete</key> or <key>Backspace</key>"
+msgstr "<key>Entfernen</key> oder <key>Rücktaste</key>"
+
+#: C/shortcuts.page:39(p)
+msgid "Delete"
+msgstr "Löschen"
+
+#: 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>Umschalt</key><key>Entf</key></keyseq> oder "
+"<keyseq><key>umschalt</key><key>Rücktaste</key></keyseq>"
+
+#: C/shortcuts.page:43(p)
+msgid "Star"
+msgstr "Mit Sternchen markieren"
+
+#: C/shortcuts.page:44(key) C/shortcuts.page:92(key)
+msgid "S"
+msgstr "S"
+
+#: C/shortcuts.page:47(p)
+msgid "Unstar"
+msgstr "Sternchen-Markierung entfernen"
+
+#: C/shortcuts.page:48(key)
+msgid "D"
+msgstr "D"
+
+#: C/shortcuts.page:51(p)
+msgid "Mark read"
+msgstr "Als gelesen markieren"
+
+#: 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>Strg</key><key>I</key></keyseq> oder <keyseq><key>Umschalt</"
+"key><key>I</key></keyseq>"
+
+#: C/shortcuts.page:55(p)
+msgid "Mark unread"
+msgstr "Als unglesen markieren"
+
+#: 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>Strg</key><key>U</key></keyseq> oder <keyseq><key>Umschalt</"
+"key><key>U</key></keyseq>"
+
+#: C/shortcuts.page:59(p)
+msgid "Toggle spam"
+msgstr "Spam-Markierung umschalten"
+
+#: C/shortcuts.page:60(p)
+msgid "<keyseq><key>Ctrl</key><key>J</key></keyseq> or <key>!</key>"
+msgstr "<keyseq><key>Strg</key><key>J</key></keyseq> oder <key>!</key>"
+
+#: C/shortcuts.page:63(p)
+msgid "Quit"
+msgstr "Beenden"
+
+#: 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 "Strg"
+
+#: C/shortcuts.page:64(key)
+msgid "Q"
+msgstr "Q"
+
+#: C/shortcuts.page:67(p)
+msgid "Zoom in"
+msgstr "Heran zoomen"
+
+#: C/shortcuts.page:68(p)
+msgid "<keyseq><key>Ctrl</key><key>=</key></keyseq> or <key>=</key>"
+msgstr "<keyseq><key>Strg</key><key>=</key></keyseq> oder <key>=</key>"
+
+#: C/shortcuts.page:71(p)
+msgid "Zoom out"
+msgstr "Heraus zoomen"
+
+#: C/shortcuts.page:72(p)
+msgid "<keyseq><key>Ctrl</key><key>-</key></keyseq> or <key>-</key>"
+msgstr "<keyseq><key>Strg</key><key>-</key></keyseq> oder <key>-</key>"
+
+#: C/shortcuts.page:75(p)
+msgid "Reset zoom"
+msgstr "Zoom zurücksetzen"
+
+#: C/shortcuts.page:76(p)
+msgid "<keyseq><key>Ctrl</key><key>0</key></keyseq> or <key>0</key>"
+msgstr "<keyseq><key>Strg</key><key>0</key></keyseq> oder <key>0</key>"
+
+#: C/shortcuts.page:79(p) C/preferences.page:10(title)
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: C/shortcuts.page:80(key)
+msgid "E"
+msgstr "E"
+
+#: C/shortcuts.page:83(p) C/accounts.page:10(title)
+msgid "Accounts"
+msgstr "Konten"
+
+#: C/shortcuts.page:84(key)
+msgid "M"
+msgstr "M"
+
+#: C/shortcuts.page:87(p)
+msgid "Close composer window"
+msgstr "Editor-Fenster schließen"
+
+#: C/shortcuts.page:88(key)
+msgid "W"
+msgstr "W"
+
+#: C/shortcuts.page:91(p)
+msgid "Jump to search box"
+msgstr "Zur Suche springen"
+
+#: C/shortcuts.page:95(p)
+msgid "Find in current conversation"
+msgstr "Aktuelle Konversation durchsuchen"
+
+#: C/shortcuts.page:96(key)
+msgid "F"
+msgstr "F"
+
+#: C/shortcuts.page:99(p)
+msgid "Find next in current conversation"
+msgstr "Nächstes in aktueller Konversation finden"
+
+#: C/shortcuts.page:100(key) C/shortcuts.page:104(key)
+msgid "G"
+msgstr "G"
+
+#: C/shortcuts.page:103(p)
+msgid "Find previous in current conversation"
+msgstr "Vorheriges in aktueller Konversation finden"
+
+#: C/shortcuts.page:104(key)
+msgid "Shift"
+msgstr "Umschalttaste"
+
+#: C/search.page:10(title)
+msgid "Search"
+msgstr "Suche"
+
+#: 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 unterstützt eine Volltextsuche je Konto. Um eine Suche zu starten, "
+"wählen Sie einen Ordner des zu durchsuchenden Kontos. Dann drücken Sie auf "
+"das Suchfeld in der Werkzeugleiste (oder Sie drücken <keyseq><key>Strg</"
+"key><key>S</key></keyseq>) und beginnen zu tippen. Die Ergebnisse werden "
+"nach einer kurzen Verzögerung angezeigt."
+
+#: 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 ""
+"Die Volltextsuche umfasst den Text der E-Mail, E-Mail-Adressen (An, Von und "
+"Blindkopie), Betreffzeilen und Dateinamen von Anhängen."
+
+#: C/search.page:19(p)
+msgid ""
+"Keywords that match your search are highlighted in the message view. Geary "
+"will match different forms of the same word, for example searching for \"walk"
+"\" will also match \"walking\" and \"walked.\""
+msgstr ""
+"Stichwörter, die mit Ihrer Suche übereinstimmen, werden in der Nachrichten-"
+"Ansicht hervorgehoben. Geary findet Übereinstimmungen verschiedener Formen "
+"eines Wortes, beispielsweise würde eine Suche nach »Eis« auch »Eisberg« und "
+"»Eisen« finden."
+
+#: C/search.page:23(title)
+msgid "Search operators"
+msgstr "Such-Schalter"
+
+#: C/search.page:24(p)
+msgid "Geary supports the following operators to limit the scope of searches:"
+msgstr "Geary bietet die folgenden Schalter, um den Suchraum zu begrenzen:"
+
+#: C/search.page:27(var)
+msgid "filename"
+msgstr "Dateiname"
+
+#: C/search.page:27(input)
+msgid "attachment:<placeholder-1/>"
+msgstr "attachment:<placeholder-1/>"
+
+#: C/search.page:28(p)
+msgid "Finds messages with attachments whose name matches <var>filename</var>."
+msgstr ""
+"Findet Nachrichten mit Anhängen, deren Name <var>Dateiname</var> entspricht."
+
+#: C/search.page:31(var) C/search.page:39(var) C/search.page:51(var)
+msgid "recipient"
+msgstr "Empfänger"
+
+#: C/search.page:31(input)
+msgid "bcc:<placeholder-1/>"
+msgstr "bcc:<placeholder-1/>"
+
+#: C/search.page:32(p)
+msgid "Finds messages where <var>recipient</var> matches the BCC header."
+msgstr "Findet Nachrichten mit <var>Empfänger</var> im BCC-Feld."
+
+#: C/search.page:35(var) C/search.page:47(var)
+msgid "text"
+msgstr "Text"
+
+#: C/search.page:35(input)
+msgid "body:<placeholder-1/>"
+msgstr "body:<placeholder-1/>"
+
+#: C/search.page:36(p)
+msgid "Finds messages whose body contains <var>text</var>."
+msgstr "Findet Nachrichten deren Inhalt <var>Text</var> enthält."
+
+#: C/search.page:39(input)
+msgid "cc:<placeholder-1/>"
+msgstr "cc:<placeholder-1/>"
+
+#: C/search.page:40(p)
+msgid "Finds messages where <var>recipient</var> matches the CC header."
+msgstr "Findet Nachrichten mit <var>Empfänger</var> im CC-Feld."
+
+#: C/search.page:43(var)
+msgid "sender"
+msgstr "Absender"
+
+#: C/search.page:43(input)
+msgid "from:<placeholder-1/>"
+msgstr "from:<placeholder-1/>"
+
+#: C/search.page:44(p)
+msgid "Finds messages where <var>sender</var> matches the From header."
+msgstr "Findet Nachrichten mit <var>Absender</var> im Von-Feld."
+
+#: C/search.page:47(input)
+msgid "subject:<placeholder-1/>"
+msgstr "subject:<placeholder-1/>"
+
+#: C/search.page:48(p)
+msgid "Finds messages whose subject contains <var>text</var>."
+msgstr "Findet Nachrichten mit <var>Text</var> im Betreff-Feld."
+
+#: C/search.page:51(input)
+msgid "to:<placeholder-1/>"
+msgstr "to:<placeholder-1/>"
+
+#: C/search.page:52(p)
+msgid ""
+"Finds messages where <var>sender</var> matches the To, CC, or BCC header."
+msgstr ""
+"Findet Nachrichten mit <var>Absender</var> im An-Feld, CC-Feld oder BCC-Feld."
+
+#: 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 ""
+"Als Besonderheit akzeptieren die Schalter <input>bcc</input>, <input>cc</"
+"input>, <input>from</input> und <input>to</input> das Argument <input>me</"
+"input>. Damit wird in den genannten Feldern nach der E-Mail-Adresse des "
+"Kontos gesucht."
+
+#: C/preferences.page:11(p)
+msgid ""
+"The <gui>Preferences</gui> option is available in either Geary's application "
+"menu or the gear menu in the upper-right of the toolbar. (The location "
+"depends on the install desktop shell. For GNOME Shell and Unity, the "
+"application menu is available near the top-left corner of the screen.)"
+msgstr ""
+"Das Fenster <gui>Einstellungen</gui> erreichen Sie über das Programm-Menü "
+"oder das Menu in der oberen rechten Ecke der Werkzeugleiste. (Das hängt von "
+"Ihrem Desktop ab. Bei der GNOME Shell und Unity befindet sich das "
+"Programmmenü nahe der oberen linken Ecke des Bildschirms.)"
+
+# There may be a better translation, but I am missing a context.
+#: C/preferences.page:17(title)
+msgid "Reading"
+msgstr "Lesen"
+
+#: C/preferences.page:20(gui)
+msgid "Automatically select next message"
+msgstr "Automatisch die nächste Nachricht auswählen"
+
+#: 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 ""
+"Ist diese Option aktiviert, wählt Geary automatisch die letzte Nachricht im "
+"aktuellen Ordner aus. Wird eine Nachricht aktiviert, wählt Geary automatisch "
+"eine benachbarte Nachricht aus."
+
+#: C/preferences.page:26(gui)
+msgid "Display conversation preview"
+msgstr "Zeige Konversationsvorschau"
+
+#: C/preferences.page:27(p)
+msgid ""
+"Enables message previews in the conversation list. Previews show the first "
+"few lines of each message."
+msgstr ""
+"Aktiviert eine Nachrichten-Vorschau in der Konversationsliste. In einer "
+"Vorschau werden die ersten Zeilen einer Nachricht angezeigt."
+
+#: C/preferences.page:34(title)
+msgid "Composer"
+msgstr "Editor"
+
+#: C/preferences.page:37(gui)
+msgid "Enable spell checking"
+msgstr "Aktiviere Rechtschreibkorrektur"
+
+#: 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 ""
+"Falls aktiviert, überprüft Geary eine Nachricht auf Rechtschreibfehler, noch "
+"während Sie diese schreiben und unterlegt falsch geschriebene Wörter rot."
+
+#: C/preferences.page:45(title)
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: C/preferences.page:48(gui)
+msgid "Play notification sounds"
+msgstr "Abspielen von Benachrichtigungstönen"
+
+#: C/preferences.page:49(p)
+msgid "When set, Geary plays a sound whenever a new message arrives."
+msgstr ""
+"Falls aktiviert, spielt Geary immer einen Ton wenn eine Nachricht ankommt."
+
+#: C/preferences.page:52(gui)
+msgid "Show notifications for new mail"
+msgstr "Anzeigen von Benachrichtigungen für neue Nachrichten"
+
+#: 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 ""
+"Falls aktiviert, zeigt Geary jedes Mal eine <em>Benachrichtigung</em> an, "
+"wenn eine neue Nachricht eintrifft. Benachrichtigungen werden System "
+"abhängig angezeigt. Unter der GNOME Shell werden Benachrichtigungen am "
+"unteren Bildschirmrand angezeigt. Unter Ubuntu Unity werden "
+"Benachrichtigungen in der oberen rechten Ecke des Displays angezeigt. "
+
+#: C/overview.page:8(title)
+msgid "Overview"
+msgstr "Überblick"
+
+#: 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 ist ein schlankes E-Mail-Programm für den <link href=\"http://gnome.org"
+"\">GNOME</link> Desktop. Es arbeitet mit allen E-Mail-Servern, die das IMAP "
+"Protokoll unterstützen, wie beispielsweise Gmail, Yahoo Mail und 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 fasst E-Mail Nachrichten in <em>Konversationen</em> zusammen. Eine "
+"Konversation beinhaltet alle Nachrichten einer einzelnen Diskussion."
+
+#: C/overview.page:17(p)
+msgid "The main Geary window is divided into several areas:"
+msgstr "Das Hauptfenster von Geary ist in verschiedene Bereiche unterteilt:"
+
+#: C/overview.page:20(title)
+msgid "Folder list"
+msgstr "Ordnerliste"
+
+#: 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 ""
+"Die <em>Ordnerliste</em> auf der linken Seite zeigt alle <em>Ordner</em> und "
+"<em>Label</em> Ihres E-Mail-Kontos. Geary verwendet den Begriff <em>Label</"
+"em> für alle Ordner, die Sie erstellt haben, um Ihre Nachrichten zu "
+"organisiern. (Die Gmail Web-Oberfläche nutzt diesen Begriff ebenfalls; die "
+"meisten anderen E-Mail-Dienste tun das nicht.)"
+
+#: C/overview.page:28(title)
+msgid "Conversation list"
+msgstr "Konversationsliste"
+
+#: 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 ""
+"Die <em>Konversationsliste</em> zeigt eine Liste der Konversationen im "
+"ausgewählten Ordner. Neuere Konversationen stehen oben."
+
+#: 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 ""
+"Jeder Absendername erscheint fett, falls es ungelesene Nachrichten von "
+"diesem Absender gibt. Falls eine Konversation mehr als eine Nachricht "
+"enthält, zeigt Geary die Anzahl der Nachrichten in der Konversation an."
+
+#: 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 lädt nicht automatisch alle Nachrichten aus allen E-Mail-Ordnern "
+"herunter. Wenn Sie das erste Mal den Posteingang oder irgendeinen anderen "
+"Ordner besuchen, lädt Geary die letzten 50 Nachrichten in diesem Ordner "
+"herunter. Um mehr Nachrichten zu sehen, müssen Sie sich nur in der Liste der "
+"angezeigten Nachrichten nach unten bewegen und Geary lädt automatisch "
+"weitere Nachrichten nach."
+
+#: 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 ""
+"Manche Befehle in Geary können auf eine Gruppe von Konversationen angewandt "
+"werden. Um mehrere Konversationen auszuwählen, halten Sie die <key>Strg</"
+"key>-Taste gedrückt und wählen die Konversationen durch Anklicken einzeln in "
+"der Konversationsliste aus. Alternativ können Sie auch die erste "
+"Konversation einer Reihe anklicken und bei gedrückter <key>Umschalt</key>-"
+"Taste die letzte Konversation."
+
+#: C/overview.page:44(title)
+msgid "Message area"
+msgstr "Nachrichtenbereich"
+
+#: 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 ""
+"Der <em>Nachrichten Bereich</em> zeigt alle Nachrichten in der ausgewählten "
+"Konversation an, wobei die älteste Nachricht als erstes angezeigt wird."
+
+#: 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 ""
+"In der oberen rechten Ecke jeder Nachricht zeigt Geary einen DropDown-Pfeil "
+"an, um das <em>Nachrichten-Menü</em> zu öffnen. Es enthält Befehlen, die "
+"sich nur auf die jeweilige Nachricht auswirken."
+
+#: 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 ""
+"Wenn Sie eine Konversation ansehen, klappt Geary Nachrichten ein, die Sie "
+"bereits gesehen haben. Drücken Sie auf eingeklappte Nachrichten, um sie "
+"aufzuklappen. Drücken Sie auf die Kopfzeile einer aufgeklappten Nachricht um "
+"sie zu einzuklappen. "
+
+#: C/overview.page:50(p)
+msgid ""
+"Any attachments in a message appear at the bottom of the message. You can "
+"click an attachment to open it or right-click to save it."
+msgstr ""
+"Alle Anhänge einer Nachricht erscheinen am Ende der Nachricht. Sie können "
+"einen Anhang anklicken, um ihn zu öffnen oder mit einem Rechtsklick "
+"speichern."
+
+#: 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 nutzt <link href=\"https://secure.gravatar.com/\">Gravatar</link>, um "
+"ein Benutzerbild des Absenders im Kopf jeder Nachricht anzuzeigen."
+
+#: C/limits.page:11(title)
+msgid "Limitations"
+msgstr "Einschränkungen"
+
+#: 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 befindet sich noch in einem frühen Entwicklungsstadium. Geary "
+"unterstützt IMAP und wurde mit Gmail, Yahoo und dem freien Dovecot E-Mail-"
+"Server getestet. Die Unterstützung von Outlook.com ist noch experimentell. "
+"Es kann sein, dass Geary mit einigen IMAP-Servern noch nicht gut zusammen "
+"arbeitet. Zum aktuellen Zeitpunkt fehlen Geary noch viele Leistungsmerkmale, "
+"wie beispielsweise ein Offline Modus. "
+
+#: C/limits.page:14(p)
+msgid ""
+"To learn more about the features we're working on and the future of Geary, "
+"please visit Geary's <link href=\"https://wiki.gnome.org/Apps/Geary\">wiki "
+"page</link>."
+msgstr ""
+"Um mehr über die angestrebten Funktionen und die Zukunft von Geary zu "
+"erfahren, besuchen Sie bitte <link href=\"https://wiki.gnome.org/Apps/Geary"
+"\">Gearys Wiki</link>."
+
+#: C/label.page:10(title)
+msgid "Label or move a conversation"
+msgstr "Eine Konversation mit einem Label versehen oder verschieben"
+
+#: C/label.page:12(title)
+msgid "Label a conversation"
+msgstr "Eine Konversation mit einem Label versehen"
+
+#: 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 ""
+"Mit Geary können Sie einer Konversation ein oder mehrere <em>Label</em> "
+"zuweisen. Geary Labels entsprechen Gmail-Labels oder normalen Ordnern "
+"anderer E-Mail-Dienste."
+
+#: C/label.page:15(p)
+msgid ""
+"To label one or more conversations, first select the conversation(s), then "
+"do either of the following:"
+msgstr ""
+"Um eine oder mehrere Konversationen mit einem Label zu versehen, wählen Sie "
+"zuerst die Konversation(en) aus und können dann einen der folgenden Wege "
+"nutzen:"
+
+#: 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 ""
+"Drücken Sie den <gui>Label</gui> Knopf in der Werkzeugleiste und wählen Sie "
+"ein Label aus dem erscheinenden DropDown-Menü."
+
+#: 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 ""
+"Drücken Sie die <key>Strg</key>-Taste und ziehen Sie die Konversation(en) "
+"aus der Konversationsliste auf das Label in der Seitenleiste."
+
+#: C/label.page:25(title)
+msgid "Move a conversation to a folder or label"
+msgstr "Verschieben einer Konversation in einen Ordner oder ein Label"
+
+#: 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 ""
+"Um eine oder mehrere Konversationen in einen Ordner oder ein Label zu "
+"verschieben, wählen Sie zunächst die Konversation(en) aus und können dann "
+"einen der folgenden Wege nutzen:"
+
+#: 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 ""
+"Drücken Sie den <gui>Verschieben</gui> Knopf in der Werkzeugleiste und "
+"wählen Sie einen Ordner oder ein Label aus dem erscheinenden DropDown-Menü "
+"aus."
+
+#: C/label.page:31(p)
+msgid ""
+"Drag the conversation(s) from the conversation list to the folder or label "
+"in the sidebar."
+msgstr ""
+"Ziehen Sie die Konversation(en) aus der Konversationsliste auf den Ordner "
+"oder das Label in der Seitenleiste."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:5(None)
+msgid "@@image: 'figures/geary.svg'; md5=18b50c9e10fe5256ae1cb12aaa3a7600"
+msgstr "@@image: 'figures/geary.svg'; md5=18b50c9e10fe5256ae1cb12aaa3a7600"
+
+#: C/index.page:5(title)
+msgid "<media type=\"image\" src=\"figures/geary.svg\"/> Geary"
+msgstr "<media type=\"image\" src=\"figures/geary.svg\"/> Geary"
+
+#: C/index.page:9(title)
+msgid "Introduction"
+msgstr "Einführung"
+
+#: C/index.page:13(title)
+msgid "Using Geary"
+msgstr "Geary verwenden"
+
+#: C/index.page:17(title)
+msgid "Bugs"
+msgstr "Fehler"
+
+#: C/bugs.page:8(title)
+msgid "Think you've found a bug?"
+msgstr "Sie glauben einen Fehler gefunden zu haben?"
+
+#: C/bugs.page:9(p)
+msgid ""
+"If you suspect you've found a bug in Geary, follow these steps to report it:"
+msgstr ""
+"Wenn Sie meinen, einen Fehler in Geary gefunden zu haben, befolgen Sie die "
+"folgenden Schritte um ihn zu melden:"
+
+#: C/bugs.page:11(p)
+msgid ""
+"Search Geary's <link href=\"https://bugzilla.gnome.org/browse.cgi?"
+"product=geary\">bug database</link> to see if someone else has reported the "
+"bug."
+msgstr ""
+"Suchen Sie in Gearys <link href=\"https://bugzilla.gnome.org/browse.cgi?"
+"product=geary\">Fehler Datenbank</link>, um zu sehen, ob jemand anderes "
+"diesen Fehler bereits gemeldet hat."
+
+#: C/bugs.page:13(p)
+msgid ""
+"Don't see your bug listed? Congratulations! You've found a new bug. To "
+"create an bug report, create an account on GNOME's Bugzilla and <link href="
+"\"https://bugzilla.gnome.org/enter_bug.cgi?product=geary\">file a new bug</"
+"link>. Be as specific as you can and describe the steps to reproduce it. "
+"Don't forget to include details about your operating system and what version "
+"of Geary you're running."
+msgstr ""
+"Ihr Fehler wird nicht aufgeführt? Herzlichen Glückwunsch! Sie haben einen "
+"Fehler entdeckt. Um einen Fehlerbericht zu erstellen, legen Sie sich ein "
+"Konto bei GNOMEs Bugzilla an und <link href=\"https://bugzilla.gnome.org/"
+"enter_bug.cgi?product=geary\">melden einen neuen Fehler</link>. Seien Sie so "
+"präzise wie möglich und beschreiben Sie die Schritte um diesen Fehler zu "
+"erzeugen. Vergessen Sie nicht, Details zu Ihrem Betriebssystem und der "
+"verwendeten Geary Version anzugeben."
+
+#: 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 ""
+"Für allgemeine Anfragen, melden Sie sich bitte bei der <link href=\"http://"
+"lists.yorba.org/cgi-bin/mailman/listinfo/geary\">Geary Mailing List</link> "
+"an."
+
+#: C/archive.page:10(title)
+msgid "Delete or archive a message"
+msgstr "Eine Nachricht löschen oder archivieren"
+
+#: 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 ""
+"Wenn Sie Geary mit einem Gmail-Konto verwenden, können Sie Nachrichten "
+"<em>archivieren</em>. Der <gui>Archivieren</gui> Knopf in der Werkzeugleiste "
+"archiviert die ausgewählte(n) Konversation(en). Archivierte Nachrichten "
+"erscheinen im <gui>Alle E-Mails</gui> Ordner."
+
+#: C/archive.page:16(p)
+msgid ""
+"With other mail servers, you can trash or delete, but not archive, messages. "
+"To move one or more conversations to the <gui>Trash</gui> folder, select "
+"them and press the <gui>Trash</gui> button on the toolbar. To permanently "
+"delete the conversations, hold down <key>Shift</key> and press the "
+"<gui>Delete</gui> button that appears in place of the <gui>Trash</gui> "
+"button."
+msgstr ""
+"Bei anderen E-Mail-Servern können Sie Nachrichten in den Papierkorb "
+"verschieben oder löschen, nicht aber archivieren. Um eine oder mehrere "
+"Konversationen in den <gui>Papierkorb</gui> zu verschieben, wählen Sie diese "
+"aus und drücken den <gui>Papierkorb</gui> Knopf in der Werkzeugleiste. Um "
+"die Konversationen vollständig zu löschen, halten Sie die <key>Umschalt</"
+"key> Taste gedrückt und klicken auf den <gui>Löschen</gui> Knopf, der an "
+"Stelle von <gui>Papierkorb</gui> erscheint."
+
+#: 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 ""
+"Löschen ist in manchem Ordner, wie beispielsweise Suche, nicht möglich. "
+"Löschen ist auch bei Gmail nicht möglich. Bei Gmail verschiebt "
+"<gui>Papierkorb</gui> Nachrichten nur in den Papierkorb-Ordner des "
+"Verzeichnisses auf dem Server, von wo Sie sie von Hand löschen können. Der "
+"Server löscht sie automatisch nach 30 Tagen."
+
+#: C/accounts.page:13(title)
+msgid "Adding accounts"
+msgstr "Konten hinzufügen"
+
+#: 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 ""
+"Wenn Sie Geary das erste Mal starten, werden Sie gebeten, ein E-Mail-Konto "
+"hinzuzufügen. In diesem Fenster wählen Sie aus, ob es sich um ein Gmail-, "
+"Yahoo-, Outlook.com oder ein anderes E-Mail-Konto handelt. Für andere Konto-"
+"Arten müssen Sie die IMAP- und SMTP-Angaben selbst eingetragen. "
+
+#: C/accounts.page:19(p)
+msgid ""
+"Additional accounts can be added from the Accounts dialog. The "
+"<gui>Accounts</gui> option is available in either Geary's application menu "
+"or the gear menu in the upper-right of the toolbar. (The location depends on "
+"the install desktop shell. For GNOME Shell and Unity, the application menu "
+"is available near the top-left corner of the screen.) Alternately, "
+"<keyseq><key>Ctrl</key><key>M</key></keyseq> will open the Accounts dialog. "
+"To add an account, click the + button."
+msgstr ""
+"Weitere Konten können Sie im Konten-Dialogfenster hinzufügen. Sie erreichen "
+"<gui>Konten</gui> über Gearys Programm-Menü oder das Menü in der oberen "
+"rechten Ecke der Werkzeugleiste. (Das hängt von Ihrem Desktop ab. Bei der "
+"GNOME Shell und Unity befindet sich das Programmmenü nahe der oberen linken "
+"Ecke des Bildschirms.) Alternativ öffnen Sie das Konten-Dialogfenster mit "
+"der Tastenkombination <keyseq><key>Ctrl</key><key>M</key></keyseq>. Klicken "
+"Sie auf den + Knopf, um ein Konto hinzuzufügen ."
+
+#: C/accounts.page:28(title)
+msgid "Editing existing accounts"
+msgstr "Konten bearbeiten"
+
+#: 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 ""
+"Wählen Sie im Konten Dialog ein Konto aus und drücken Sie auf das Stift-"
+"Symbol, um die Einstellungen zu bearbeiten. Bitte beachten Sie, dass Geary "
+"die Server-Einstellungen bestehender Konten nicht verändern kann. Wenn Sie "
+"den IMAP- oder SMTP-Server ändern wollen, müssen Sie das bereits "
+"existierende Konto löschen und neu anlegen."
+
+#: 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 ""
+"Um die Reihenfolge zu ändern in der die Konten in der Ordnerliste angezeigt "
+"werden, ziehen Sie die Konten im Konten Dialog an die gewünschte Position."
+
+#: C/accounts.page:37(p)
+msgid "There are some advanced options available when editing accounts:"
+msgstr "In den Konten-Einstellungen gibt es folgende erweiterte Möglichkeiten:"
+
+#: 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 ""
+"Das Ankreuzfeld <gui>Gesendete E-Mail speichern</gui> bestimmt, 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 "
+"automatisch verschieben. Bei Konten, bei denen Sie diese Möglichkeit "
+"ausgeschaltet haben, können Sie die von Ihnen gesendeten E-Mails nicht mehr "
+"aufrufen."
+
+#: 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 ""
+"Über das <gui>Mail herunterladen</gui> Dropdown-Menü können Sie festlegen, "
+"wieviel E-Mail Geary lokal behält. Geary kann nur lokal verfügbar E-Mails "
+"berücksichtigen, wenn es um das Durchsuchen oder das Bündeln von Nachrichten "
+"in Konversationen geht.   "
+
+#: C/accounts.page:53(title)
+msgid "Removing accounts"
+msgstr "Konten löschen"
+
+#: 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 ""
+"Um ein Konto zu löschen, öffnen Sie den Konten Dialog, wählen das "
+"betreffende Konto und drücken den - Knopf. Geary wird alle mit diesem Konto "
+"verknüpften Daten löschen."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/accounts.page:0(None)
+msgid "translator-credits"
+msgstr ""
+"Andreas Wilhelm <[e-mail]>, 2014\n"
+"Frank Schiersner <[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 ""
+#~ "Um Einstellungen in Geary vorzunehmen, wähle das Einstellungsmenü in der "
+#~ "oberen rechten Ecke der Werkzeugleiste und Wähle <gui>Einstellungen</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 ""
+#~ "Bei anderen E-Mail-Servern können Nachrichten gelöscht, jedoch nicht "
+#~ "archiviert werden. Um eine oder mehrere Konversationen zu löschen wähle "
+#~ "diese aus und drücke den <gui>Löschen</gui> Knopf in der Werkzeugleiste."
+
+#~ 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 ""
+#~ "Zusätzliche Konten können im Konten Dialog hinzugefügt werden. Drücke "
+#~ "Konten im Einstellungsmenü (oder drücke <keyseq><key>Strg</key><key>M</"
+#~ "key></keyseq>) um den Konten Dialog zu öffnen. Um ein Konto hinzuzufügen, "
+#~ "drücke den + Knopf."

=== modified file 'help/es/es.po'
--- help/es/es.po	2014-07-26 10:08:43 +0000
+++ help/es/es.po	2014-12-29 05:56:39 +0000
@@ -7,16 +7,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
-"POT-Creation-Date: 2014-03-28 18:21+0000\n"
-"PO-Revision-Date: 2014-03-05 14:14+0100\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 <[e-mail]>\n"
+"Language-Team: Español; Castellano <[e-mail]>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: C/write.page:9(title)
 msgid "Write a message"
@@ -515,7 +515,7 @@
 
 #: C/preferences.page:17(title)
 msgid "Reading"
-msgstr ""
+msgstr "Lectura"
 
 #: C/preferences.page:20(gui)
 msgid "Automatically select next message"
@@ -864,7 +864,7 @@
 
 #: C/accounts.page:28(title)
 msgid "Editing existing accounts"
-msgstr ""
+msgstr "Edición de cuentas existentes"
 
 #: C/accounts.page:30(p)
 msgid ""
@@ -873,16 +873,24 @@
 "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 ""
+"En el cuadro de diálogo Cuentas, seleccione una cuenta y pulse en el icono "
+"del lápiz para modificar varias opciones. Tenga en cuenta que Geary no puede "
+"cambiar la configuración del servidor de una cuenta existente. Si necesita "
+"cambiar el servidor IMAP o SMTP, tendrá que eliminar la cuenta y añadirla de "
+"nuevo."
 
 #: 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 ""
+"Para cambiar el orden en que se muestran las cuentas en la lista de "
+"carpetas, arrastre las cuentas en el cuadro de diálogo Cuentas para "
+"colocarlas en el orden que prefiera."
 
 #: C/accounts.page:37(p)
 msgid "There are some advanced options available when editing accounts:"
-msgstr ""
+msgstr "Existen algunas opciones avanzadas en la edición de cuentas:"
 
 #: C/accounts.page:39(p)
 msgid ""
@@ -893,6 +901,12 @@
 "accounts, if you disable this setting, you may be unable to view messages "
 "you've sent."
 msgstr ""
+"La casilla <gui>Guardar el correo enviado</gui> establece si Geary guardará "
+"los mensajes enviados correctamente en la carpeta <gui>Correo enviado</gui> "
+"de la cuenta. Para las cuentas de Gmail, esto sucede automáticamente. Se "
+"pueden configurar las cuentas de Yahoo y otros proveedores para que también "
+"realicen este proceso automáticamente. Para otras cuentas, si desactiva esta "
+"opción, es posible que no pueda ver los mensajes que haya enviado."
 
 #: C/accounts.page:45(p)
 msgid ""
@@ -900,10 +914,13 @@
 "Geary will keep locally. Geary can only use locally available mail when "
 "searching and forming conversations."
 msgstr ""
+"El cuadro desplegable <gui>Descargar correo</gui> permite configurar cuántos "
+"mensajes se conservarán localmente en Geary. Geary puede utilizar únicamente "
+"el correo disponible localmente para buscar y formar conversaciones."
 
 #: C/accounts.page:53(title)
 msgid "Removing accounts"
-msgstr ""
+msgstr "Eliminar cuentas"
 
 #: C/accounts.page:55(p)
 msgid ""
@@ -911,11 +928,13 @@
 "press the - button. Geary will delete all information associated with the "
 "account."
 msgstr ""
+"Para eliminar una cuenta, abra el cuadro de diálogo Cuentas, seleccione la "
+"cuenta y pulse en el botón «−». Geary eliminará toda la información asociada "
+"con la cuenta."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
 #: C/accounts.page:0(None)
-#, fuzzy
-#| msgctxt "_"
-#| msgid "translator-credits"
 msgid "translator-credits"
-msgstr "Daniel Mustieles <[e-mail]>, 2014"
+msgstr ""
+"Adolfo Jayme Barrientos <[e-mail]>, 2014\n"
+"Daniel Mustieles <[e-mail]>, 2014"

=== modified file 'po/LINGUAS'
--- po/LINGUAS	2014-07-26 10:08:43 +0000
+++ po/LINGUAS	2014-12-29 05:56:39 +0000
@@ -21,6 +21,7 @@
 id
 it
 ja
+kk
 km
 lt
 ms

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-10-02 02:02:09 +0000
+++ po/POTFILES.in	2014-12-29 05:56:39 +0000
@@ -1,6 +1,7 @@
 [encoding: UTF-8]
 desktop/geary.desktop.in
 desktop/geary-autostart.desktop.in
+[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-pane.vala

=== modified file 'po/cs.po'
--- po/cs.po	2014-10-02 02:02:09 +0000
+++ po/cs.po	2014-12-29 05:56:39 +0000
@@ -12,8 +12,8 @@
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-10 05:03+0000\n"
-"PO-Revision-Date: 2014-09-10 07:09+0200\n"
+"POT-Creation-Date: 2014-11-24 17:51+0000\n"
+"PO-Revision-Date: 2014-11-24 20:46+0100\n"
 "Last-Translator: Marek Černocký <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
 "Language: cs\n"
@@ -48,6 +48,14 @@
 msgid "Compose Message"
 msgstr "Napsat zprávu"
 
+#: ../desktop/geary-attach.contract.in.h:1
+msgid "Send by email"
+msgstr "Odesílat e-mailem"
+
+#: ../desktop/geary-attach.contract.in.h:2
+msgid "Send files using Geary"
+msgstr "Odeslat soubory pomocí Geary"
+
 #: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
 #: ../src/client/components/stock.vala:31
 msgid "_Save"
@@ -293,7 +301,7 @@
 msgstr "Označit, že není nevyžá_dané"
 
 #: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:296
 msgid "Mark conversation"
 msgstr "Označit konverzaci"
 
@@ -310,7 +318,7 @@
 msgstr "Přiřadit konverzacím štítek"
 
 #: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:334
+#: ../src/client/application/geary-controller.vala:335
 msgid "Move conversation"
 msgstr "Přesunout konverzaci"
 
@@ -318,107 +326,107 @@
 msgid "Move conversations"
 msgstr "Přesunout konverzace"
 
-#: ../src/client/application/geary-controller.vala:271
+#: ../src/client/application/geary-controller.vala:272
 msgid "A_ccounts"
 msgstr "Úč_ty"
 
-#: ../src/client/application/geary-controller.vala:276
+#: ../src/client/application/geary-controller.vala:277
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Předvolby"
 
-#: ../src/client/application/geary-controller.vala:280
+#: ../src/client/application/geary-controller.vala:281
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Nápo_věda"
 
-#: ../src/client/application/geary-controller.vala:284
+#: ../src/client/application/geary-controller.vala:285
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../src/client/application/geary-controller.vala:288
+#: ../src/client/application/geary-controller.vala:289
 msgid "_Donate"
 msgstr "_Darovat"
 
-#: ../src/client/application/geary-controller.vala:292
+#: ../src/client/application/geary-controller.vala:293
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "U_končit"
 
-#: ../src/client/application/geary-controller.vala:297
+#: ../src/client/application/geary-controller.vala:298
 msgid "_Mark as..."
 msgstr "Oz_načit jako…"
 
-#: ../src/client/application/geary-controller.vala:303
+#: ../src/client/application/geary-controller.vala:304
 msgid "Mark as _Read"
 msgstr "Označit jako _přečtené"
 
-#: ../src/client/application/geary-controller.vala:309
+#: ../src/client/application/geary-controller.vala:310
 msgid "Mark as _Unread"
 msgstr "Označit jako _nepřečtené"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:316
 msgid "_Star"
 msgstr "_Hvězdička"
 
-#: ../src/client/application/geary-controller.vala:320
+#: ../src/client/application/geary-controller.vala:321
 msgid "U_nstar"
 msgstr "O_debrat hvězdičku"
 
-#: ../src/client/application/geary-controller.vala:330
+#: ../src/client/application/geary-controller.vala:331
 msgid "Add label"
 msgstr "Přidat štítek"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:332
 msgid "_Label"
 msgstr "Štít_ek"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:336
 msgid "_Move"
 msgstr "_Přesunout"
 
-#: ../src/client/application/geary-controller.vala:339
+#: ../src/client/application/geary-controller.vala:340
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Napsat novou zprávu (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:343
+#: ../src/client/application/geary-controller.vala:344
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1635
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../src/client/application/geary-controller.vala:344
+#: ../src/client/application/geary-controller.vala:345
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odpovědět (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:348
+#: ../src/client/application/geary-controller.vala:349
 msgid "R_eply All"
 msgstr "O_dpovědět všem"
 
-#: ../src/client/application/geary-controller.vala:349
+#: ../src/client/application/geary-controller.vala:350
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Odpovědět všem (Ctrl+Shift+R, Shift+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:354
+#: ../src/client/application/geary-controller.vala:355
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1645
 msgid "_Forward"
 msgstr "_Přeposlat"
 
-#: ../src/client/application/geary-controller.vala:355
+#: ../src/client/application/geary-controller.vala:356
 msgid "Forward (Ctrl+L, F)"
 msgstr "Přeposlat (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:623
+#: ../src/client/application/geary-controller.vala:624
 msgid "Unable to store server trust exception"
 msgstr "Nelze uložit výjimku důvěry k serveru"
 
-#: ../src/client/application/geary-controller.vala:860
+#: ../src/client/application/geary-controller.vala:861
 msgid "Your settings are insecure"
 msgstr "Vaše nastavení není bezpečené"
 
-#: ../src/client/application/geary-controller.vala:861
+#: ../src/client/application/geary-controller.vala:862
 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 "
@@ -428,17 +436,17 @@
 "vaše uživatelské jméno a heslo může číst jiná osoba na síti. Opravdu to tak "
 "chcete?"
 
-#: ../src/client/application/geary-controller.vala:862
+#: ../src/client/application/geary-controller.vala:863
 msgid "Co_ntinue"
 msgstr "Po_kračovat"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:940
+#: ../src/client/application/geary-controller.vala:941
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Chyba při odesílání e-mailu"
 
-#: ../src/client/application/geary-controller.vala:941
+#: ../src/client/application/geary-controller.vala:942
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -448,12 +456,12 @@
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:945
+#: ../src/client/application/geary-controller.vala:946
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Chyba při ukládání odeslané pošty"
 
-#: ../src/client/application/geary-controller.vala:946
+#: ../src/client/application/geary-controller.vala:947
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -461,19 +469,19 @@
 "V Geary došlo k chybě při ukládání odeslané zprávy. Zpráva zůstane ve vaší "
 "složce Pošta k odeslání, dokud ji nesmažete."
 
-#: ../src/client/application/geary-controller.vala:1015
+#: ../src/client/application/geary-controller.vala:1016
 msgid "Labels"
 msgstr "Štítky"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1027
+#: ../src/client/application/geary-controller.vala:1028
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Nelze otevřít databázi pro %s"
 
-#: ../src/client/application/geary-controller.vala:1028
+#: ../src/client/application/geary-controller.vala:1029
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -497,20 +505,20 @@
 "Opětovné sestavení databáze zničí všechny místně uložené e-maily a jejich "
 "přílohy <b>Na e-maily na vašem serveru to nebude mít vliv.</b>"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1031
 msgid "_Rebuild"
 msgstr "Znovu _sestavit"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1031
 msgid "E_xit"
 msgstr "S_končit"
 
-#: ../src/client/application/geary-controller.vala:1039
+#: ../src/client/application/geary-controller.vala:1040
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Nelze znovu sestavit databázi pro „%s“"
 
-#: ../src/client/application/geary-controller.vala:1040
+#: ../src/client/application/geary-controller.vala:1041
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -523,14 +531,14 @@
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1062
-#: ../src/client/application/geary-controller.vala:1072
-#: ../src/client/application/geary-controller.vala:1083
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/application/geary-controller.vala:1073
+#: ../src/client/application/geary-controller.vala:1084
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Nelze otevřít místní poštovní schránku pro %s"
 
-#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/application/geary-controller.vala:1064
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -549,7 +557,7 @@
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1073
+#: ../src/client/application/geary-controller.vala:1074
 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 "
@@ -562,7 +570,7 @@
 "\n"
 "Nainstalujte prosím nejnovější verzi Geary a zkuste to znovu."
 
-#: ../src/client/application/geary-controller.vala:1084
+#: ../src/client/application/geary-controller.vala:1085
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -575,25 +583,25 @@
 "\n"
 "Zkontrolujte prosím připojení k síti a restartujte Geary."
 
-#: ../src/client/application/geary-controller.vala:1591
+#: ../src/client/application/geary-controller.vala:1592
 #, c-format
 msgid "About %s"
 msgstr "O aplikaci %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <[e-mail]>
-#: ../src/client/application/geary-controller.vala:1594
+#: ../src/client/application/geary-controller.vala:1595
 msgid "translator-credits"
 msgstr ""
 "Petr Šimáček <[e-mail]>\n"
 "Marek Černocký <[e-mail]>"
 
-#: ../src/client/application/geary-controller.vala:1858
+#: ../src/client/application/geary-controller.vala:1859
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Opravdu chcete otevřít „%s“?"
 
-#: ../src/client/application/geary-controller.vala:1859
+#: ../src/client/application/geary-controller.vala:1860
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -601,39 +609,39 @@
 "Příloha by po otevření mohla poškodit váš počítač. Otevírejte pouze soubory "
 "z důvěryhodných zdrojů. "
 
-#: ../src/client/application/geary-controller.vala:1860
+#: ../src/client/application/geary-controller.vala:1861
 msgid "Don't _ask me again"
 msgstr "Příště se nept_at"
 
-#: ../src/client/application/geary-controller.vala:1878
+#: ../src/client/application/geary-controller.vala:1879
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Soubor s názvem „%s“ již existuje. Chcete ho nahradit?"
 
-#: ../src/client/application/geary-controller.vala:1880
+#: ../src/client/application/geary-controller.vala:1881
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Soubor již existuje v „%s“. Nahrazením přepíšete jeho obsah."
 
-#: ../src/client/application/geary-controller.vala:1883
+#: ../src/client/application/geary-controller.vala:1884
 msgid "_Replace"
 msgstr "Nah_radit"
 
 #. Find out what to do with the inline composers.
 #. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2150
+#: ../src/client/application/geary-controller.vala:2151
 msgid "Close open draft messages?"
 msgstr "Zavřít otevřený koncept zprávy?"
 
-#: ../src/client/application/geary-controller.vala:2259
+#: ../src/client/application/geary-controller.vala:2260
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Chcete trvale smazat tuto zprávu?"
 msgstr[1] "Chcete trvale smazat tyto zprávy?"
 msgstr[2] "Chcete trvale smazat tyto zprávy?"
 
-#: ../src/client/application/geary-controller.vala:2261
+#: ../src/client/application/geary-controller.vala:2262
 msgid "Delete"
 msgstr "Smazat"
 
@@ -746,79 +754,79 @@
 msgid "attach|enclosed|enclosing|cover letter"
 msgstr "přiložit|přiložený|přikládá|průvodní dopis"
 
-#: ../src/client/composer/composer-widget.vala:831
+#: ../src/client/composer/composer-widget.vala:830
 msgid "Do you want to discard the unsaved message?"
 msgstr "Chcete zahodit neuloženou zprávu?"
 
-#: ../src/client/composer/composer-widget.vala:834
-#: ../src/client/composer/composer-widget.vala:838
+#: ../src/client/composer/composer-widget.vala:833
+#: ../src/client/composer/composer-widget.vala:837
 msgid "Do you want to discard this message?"
 msgstr "Chcete zahodit tuto zprávu?"
 
-#: ../src/client/composer/composer-widget.vala:919
+#: ../src/client/composer/composer-widget.vala:918
 msgid "Send message with an empty subject and body?"
 msgstr "Poslat zprávu s prázdným předmětem a tělem?"
 
-#: ../src/client/composer/composer-widget.vala:921
+#: ../src/client/composer/composer-widget.vala:920
 msgid "Send message with an empty subject?"
 msgstr "Poslat zprávu s prázdným předmětem?"
 
-#: ../src/client/composer/composer-widget.vala:923
+#: ../src/client/composer/composer-widget.vala:922
 msgid "Send message with an empty body?"
 msgstr "Poslat zprávu s prázdným tělem?"
 
-#: ../src/client/composer/composer-widget.vala:925
+#: ../src/client/composer/composer-widget.vala:924
 msgid "Send message without an attachment?"
 msgstr "Poslat zprávu bez přílohy?"
 
-#: ../src/client/composer/composer-widget.vala:1108
+#: ../src/client/composer/composer-widget.vala:1107
 msgid "Cannot add attachment"
 msgstr "Nelze připojit přílohu"
 
-#: ../src/client/composer/composer-widget.vala:1119
+#: ../src/client/composer/composer-widget.vala:1118
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "Soubor „%s“ nebyl nalezen."
 
-#: ../src/client/composer/composer-widget.vala:1126
+#: ../src/client/composer/composer-widget.vala:1125
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "„%s“ je složka."
 
-#: ../src/client/composer/composer-widget.vala:1133
+#: ../src/client/composer/composer-widget.vala:1132
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "Soubor „%s“ je prázdný."
 
-#: ../src/client/composer/composer-widget.vala:1147
+#: ../src/client/composer/composer-widget.vala:1146
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "Soubor „%s“ nemohl být otevřen pro čtení."
 
-#: ../src/client/composer/composer-widget.vala:1154
+#: ../src/client/composer/composer-widget.vala:1153
 #, c-format
 msgid "\"%s\" already attached for delivery."
 msgstr "Soubor „%s“ už byl pro doručení přiložen."
 
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1163
+#: ../src/client/composer/composer-widget.vala:1162
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1223
+#: ../src/client/composer/composer-widget.vala:1222
 msgid "To: "
 msgstr "Komu: "
 
-#: ../src/client/composer/composer-widget.vala:1226
+#: ../src/client/composer/composer-widget.vala:1225
 msgid "Cc: "
 msgstr "Kopie: "
 
-#: ../src/client/composer/composer-widget.vala:1229
+#: ../src/client/composer/composer-widget.vala:1228
 msgid "Bcc: "
 msgstr "Skrytá kopie: "
 
-#: ../src/client/composer/composer-widget.vala:1446
+#: ../src/client/composer/composer-widget.vala:1445
 msgid "Select Color"
 msgstr "Vybrat barvu"
 
@@ -1009,7 +1017,7 @@
 msgid "none"
 msgstr "žádný"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2126
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2131
 msgid "Failed to open default text editor."
 msgstr "Nepodařilo se otevřít výchozí textový editor."
 

=== modified file 'po/de.po'
--- po/de.po	2014-07-26 10:08:43 +0000
+++ po/de.po	2014-12-29 05:56:39 +0000
@@ -18,8 +18,8 @@
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-29 06:22+0000\n"
-"PO-Revision-Date: 2014-03-30 18:51+0100\n"
+"POT-Creation-Date: 2014-09-20 05:05+0000\n"
+"PO-Revision-Date: 2014-09-21 11:44+0200\n"
 "Last-Translator: Benjamin Steinwender <[e-mail]>\n"
 "Language-Team: Deutsch <[e-mail]>\n"
 "Language: de\n"
@@ -27,26 +27,26 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: ../desktop/geary.desktop.in.h:1
+#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
 msgid "Geary"
 msgstr "Geary"
 
-#: ../desktop/geary.desktop.in.h:2
+#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
 #: ../src/client/application/geary-application.vala:18
 msgid "Mail Client"
 msgstr "Mail-Client"
 
-#: ../desktop/geary.desktop.in.h:3
+#: ../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.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
 msgid "Send and receive email"
 msgstr "Senden und empfangen"
 
-#: ../desktop/geary.desktop.in.h:5
+#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
 msgid "Email;E-mail;Mail;"
 msgstr "Email;E-Mail;Mail;"
 
@@ -80,89 +80,89 @@
 msgid "First Last"
 msgstr "Vorname Nachname"
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Welcome to Geary."
 msgstr "Willkommen bei Geary."
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Enter your account information to get started."
 msgstr "Tragen Sie zum Loslegen bitte Ihre Kontodaten ein."
 
-#: ../src/client/accounts/add-edit-page.vala:223
+#: ../src/client/accounts/add-edit-page.vala:247
 msgid "2 weeks back"
 msgstr "2 Wochen zurück"
 
 #. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:224
+#: ../src/client/accounts/add-edit-page.vala:248
 msgid "1 month back"
 msgstr "1 Monat zurück"
 
-#: ../src/client/accounts/add-edit-page.vala:225
+#: ../src/client/accounts/add-edit-page.vala:249
 msgid "3 months back"
 msgstr "3 Monate zurück"
 
-#: ../src/client/accounts/add-edit-page.vala:226
+#: ../src/client/accounts/add-edit-page.vala:250
 msgid "6 months back"
 msgstr "6 Monate zurück"
 
-#: ../src/client/accounts/add-edit-page.vala:227
+#: ../src/client/accounts/add-edit-page.vala:251
 msgid "1 year back"
 msgstr "1 Jahr zurück"
 
-#: ../src/client/accounts/add-edit-page.vala:228
+#: ../src/client/accounts/add-edit-page.vala:252
 msgid "2 years back"
 msgstr "2 Jahre zurück"
 
-#: ../src/client/accounts/add-edit-page.vala:229
+#: ../src/client/accounts/add-edit-page.vala:253
 msgid "4 years back"
 msgstr "4 Jahre zurück"
 
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:231
+#: ../src/client/accounts/add-edit-page.vala:255
 msgid "Everything"
 msgstr "Alles"
 
-#: ../src/client/accounts/add-edit-page.vala:630
+#: ../src/client/accounts/add-edit-page.vala:686
 msgid "Remem_ber passwords"
 msgstr "Passwörter _merken"
 
-#: ../src/client/accounts/add-edit-page.vala:637 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "Passwort _merken"
 
-#: ../src/client/accounts/add-edit-page.vala:671
+#: ../src/client/accounts/add-edit-page.vala:727
 msgid "Unable to validate:\n"
 msgstr "Bestätigung nicht möglich:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:673
+#: ../src/client/accounts/add-edit-page.vala:729
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Ungültiger Konto-Nickname.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:676
+#: ../src/client/accounts/add-edit-page.vala:732
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr "        &#8226; E-Mail-Adresse wurde bereits zu Geary hinzugefügt.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:680
+#: ../src/client/accounts/add-edit-page.vala:736
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; IMAP-Verbindungsfehler.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:683
+#: ../src/client/accounts/add-edit-page.vala:739
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; IMAP-Benutzername oder Passwort ungültig.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:686
+#: ../src/client/accounts/add-edit-page.vala:742
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; SMTP-Verbindungsfehler.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:689
+#: ../src/client/accounts/add-edit-page.vala:745
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; SMTP-Benutzername oder Passwort ungültig.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:693
+#: ../src/client/accounts/add-edit-page.vala:749
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Verbindungsfehler.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:697
+#: ../src/client/accounts/add-edit-page.vala:753
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; IMAP-Benutzername oder Passwort ungültig.\n"
 
@@ -175,243 +175,257 @@
 msgstr "Yorba-Webseite besuchen"
 
 #: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Geary mit verstecktem Hauptfenster starten"
+
+#: ../src/client/application/geary-args.vala:11
 msgid "Output debugging information"
 msgstr "Debuginformationen ausgeben"
 
-#: ../src/client/application/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "Gesprächsmonitoring protokollieren"
 
-#: ../src/client/application/geary-args.vala:12
+#: ../src/client/application/geary-args.vala:13
 msgid "Log network deserialization"
 msgstr "Netzwerkdeserialisierung protokollieren"
 
-#: ../src/client/application/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "Netzwerkaktivitäten protokollieren"
 
 #. / The IMAP replay queue is how changes on the server are replicated on the client.
 #. / It could also be called the IMAP events queue.
-#: ../src/client/application/geary-args.vala:16
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "IMAP-Ereigniswarteschlange protokollieren"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../src/client/application/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "Netzwerkserialisierung protokollieren"
 
-#: ../src/client/application/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "Regelmäßige Aktivitäten protokollieren"
 
-#: ../src/client/application/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr ""
 "Datenbankabfragen protokollieren (dabei werden sehr viele Einträge erzeugt)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Ordnersynchronisation protokollieren"
 
-#: ../src/client/application/geary-args.vala:24
+#: ../src/client/application/geary-args.vala:25
 msgid "Allow inspection of WebView"
 msgstr "Untersuchung der Webansicht erlauben"
 
-#: ../src/client/application/geary-args.vala:25
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Alle Server-Zertifikate mit TLS-Warnungen widerrufen"
+
+#: ../src/client/application/geary-args.vala:27
 msgid "Display program version"
 msgstr "Programmversion anzeigen"
 
 #. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:47
+#: ../src/client/application/geary-args.vala:51
 #, c-format
 msgid "Use %s to open a new composer window"
 msgstr "Benutzen Sie %s um ein neues »Verfassen«-Fenster zu öffnen"
 
-#: ../src/client/application/geary-args.vala:48
+#: ../src/client/application/geary-args.vala:52
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Bitte melden Sie Kommentare, Vorschläge und Fehler an:"
 
 #. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:55
+#: ../src/client/application/geary-args.vala:59
 #, c-format
 msgid "Failed to parse command line options: %s\n"
 msgstr "Die Kommandozeilenargumente konnten nicht interpretiert werden: %s\n"
 
-#: ../src/client/application/geary-args.vala:66
+#: ../src/client/application/geary-args.vala:70
 #, c-format
 msgid "Unrecognized command line option \"%s\"\n"
 msgstr "Unbekanntes Kommandozeilenargument »%s«\n"
 
-#: ../src/client/application/geary-controller.vala:46
+#: ../src/client/application/geary-controller.vala:56
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../src/client/application/geary-controller.vala:47
+#: ../src/client/application/geary-controller.vala:57
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Konversation löschen (Umschalt+Entf)"
 
-#: ../src/client/application/geary-controller.vala:48
+#: ../src/client/application/geary-controller.vala:58
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Konversationen löschen (Umschalt+Entf)"
 
-#: ../src/client/application/geary-controller.vala:51
+#. This refers to the action ("move email to the trash"), not the Trash folder itself
+#: ../src/client/application/geary-controller.vala:62
 msgid "_Trash"
 msgstr "_Papierkorb"
 
-#: ../src/client/application/geary-controller.vala:52
+#: ../src/client/application/geary-controller.vala:63
 msgid "Move conversation to trash (Delete, Backspace)"
 msgstr "Konversation in den Papierkorb verschieben (Entf, Rücktaste)"
 
-#: ../src/client/application/geary-controller.vala:53
+#: ../src/client/application/geary-controller.vala:64
 msgid "Move conversations to trash (Delete, Backspace)"
 msgstr "Konversationen in den Papierkorb verschieben (Entf, Rücktaste)"
 
-#: ../src/client/application/geary-controller.vala:56
+#. This refers to the action ("archive an email"), not the Archive folder itself
+#: ../src/client/application/geary-controller.vala:68
 msgid "_Archive"
 msgstr "_Archivieren"
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:69
 msgid "Archive conversation (A)"
 msgstr "Konversation archivieren (A)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:70
 msgid "Archive conversations (A)"
 msgstr "Konversationen archivieren (A)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:73
 msgid "Mark as S_pam"
 msgstr "Als S_pam markieren"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:74
 msgid "Mark as not S_pam"
 msgstr " S_pam-Markierung entfernen"
 
-#: ../src/client/application/geary-controller.vala:64
-#: ../src/client/application/geary-controller.vala:275
+#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:295
 msgid "Mark conversation"
 msgstr "Konversation markieren"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark conversations"
 msgstr "Konversationen markieren"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:78
 msgid "Add label to conversation"
 msgstr "Konversation ein Label zuweisen"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:79
 msgid "Add label to conversations"
 msgstr " Konversationen ein Label zuweisen"
 
-#: ../src/client/application/geary-controller.vala:68
-#: ../src/client/application/geary-controller.vala:314
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:334
 msgid "Move conversation"
 msgstr "Konversation verschieben"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:81
 msgid "Move conversations"
 msgstr "Konversationen verschieben"
 
-#: ../src/client/application/geary-controller.vala:251
+#: ../src/client/application/geary-controller.vala:271
 msgid "A_ccounts"
 msgstr "Konten"
 
-#: ../src/client/application/geary-controller.vala:256
+#: ../src/client/application/geary-controller.vala:276
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/client/application/geary-controller.vala:260
+#: ../src/client/application/geary-controller.vala:280
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/client/application/geary-controller.vala:264
+#: ../src/client/application/geary-controller.vala:284
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Über"
 
-#: ../src/client/application/geary-controller.vala:268
+#: ../src/client/application/geary-controller.vala:288
 msgid "_Donate"
 msgstr "_Spenden"
 
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:292
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:297
 msgid "_Mark as..."
 msgstr "_Markieren als …"
 
-#: ../src/client/application/geary-controller.vala:283
+#: ../src/client/application/geary-controller.vala:303
 msgid "Mark as _Read"
 msgstr "Als _gelesen markieren"
 
-#: ../src/client/application/geary-controller.vala:289
+#: ../src/client/application/geary-controller.vala:309
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:315
 msgid "_Star"
 msgstr "_Stern"
 
-#: ../src/client/application/geary-controller.vala:300
+#: ../src/client/application/geary-controller.vala:320
 msgid "U_nstar"
 msgstr "_Stern entfernen"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:330
 msgid "Add label"
 msgstr "Label zuweisen"
 
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:331
 msgid "_Label"
 msgstr "_Label"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:335
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../src/client/application/geary-controller.vala:319
+#: ../src/client/application/geary-controller.vala:339
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Neue Nachricht verfassen (Strg+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:323
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1567
+#: ../src/client/application/geary-controller.vala:343
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1635
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:344
 msgid "Reply (Ctrl+R, R)"
 msgstr "Antworten (Strg+R, R)"
 
-#: ../src/client/application/geary-controller.vala:328
+#: ../src/client/application/geary-controller.vala:348
 msgid "R_eply All"
 msgstr "Allen _antworten"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:349
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Allen antworten (Strg+Umschalt+R, Umschalt+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:334
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1577
+#: ../src/client/application/geary-controller.vala:354
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1645
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:355
 msgid "Forward (Ctrl+L, F)"
 msgstr "Weiter (Strg+L, F)"
 
-#: ../src/client/application/geary-controller.vala:618
+#: ../src/client/application/geary-controller.vala:623
+msgid "Unable to store server trust exception"
+msgstr "Ausnahme für Serververtrauen konnte nicht gespeichert werden"
+
+#: ../src/client/application/geary-controller.vala:860
 msgid "Your settings are insecure"
 msgstr "Ihre Einstellungen sind unsicher"
 
-#: ../src/client/application/geary-controller.vala:619
+#: ../src/client/application/geary-controller.vala:861
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -422,17 +436,17 @@
 "anderen Personen im selben Netzwerk gelesen werden können. Sind Sie sicher, "
 "dass Sie dies tun möchten?"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:862
 msgid "Co_ntinue"
 msgstr "Weiter"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:698
+#: ../src/client/application/geary-controller.vala:940
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Fehler beim Senden der E-Mail"
 
-#: ../src/client/application/geary-controller.vala:699
+#: ../src/client/application/geary-controller.vala:941
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -442,12 +456,12 @@
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:703
+#: ../src/client/application/geary-controller.vala:945
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Fehler beim Speichern der gesendeten E-Mail"
 
-#: ../src/client/application/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:946
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -455,19 +469,19 @@
 "Beim Speichern einer gesendeten E-Mail trat ein Fehler auf. Die Nachricht "
 "bleibt im Postausgang bis Sie sie löschen."
 
-#: ../src/client/application/geary-controller.vala:773
+#: ../src/client/application/geary-controller.vala:1015
 msgid "Labels"
 msgstr "Labels"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:785
+#: ../src/client/application/geary-controller.vala:1027
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Die Datenbank für %s konnte nicht geöffnet werden"
 
-#: ../src/client/application/geary-controller.vala:786
+#: ../src/client/application/geary-controller.vala:1028
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -492,20 +506,20 @@
 "dazugehörigen Anhänge verloren. <b>E-Mails auf Ihrem Server werden nicht "
 "betroffen sein.</b>"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1030
 msgid "_Rebuild"
 msgstr "_Wiedererstellen"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1030
 msgid "E_xit"
 msgstr "B_eenden"
 
-#: ../src/client/application/geary-controller.vala:797
+#: ../src/client/application/geary-controller.vala:1039
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Die Datenbank für %s konnte nicht wieder hergestellt werden"
 
-#: ../src/client/application/geary-controller.vala:798
+#: ../src/client/application/geary-controller.vala:1040
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -518,14 +532,14 @@
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:820
-#: ../src/client/application/geary-controller.vala:830
-#: ../src/client/application/geary-controller.vala:841
+#: ../src/client/application/geary-controller.vala:1062
+#: ../src/client/application/geary-controller.vala:1072
+#: ../src/client/application/geary-controller.vala:1083
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Der lokale Posteingang für %s konnte nicht geöffnet werden"
 
-#: ../src/client/application/geary-controller.vala:821
+#: ../src/client/application/geary-controller.vala:1063
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -544,7 +558,7 @@
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:831
+#: ../src/client/application/geary-controller.vala:1073
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
@@ -559,7 +573,7 @@
 "Bitte installieren Sie die neueste Version von Geary und versuchen Sie es "
 "erneut. "
 
-#: ../src/client/application/geary-controller.vala:842
+#: ../src/client/application/geary-controller.vala:1084
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -571,23 +585,23 @@
 "\n"
 "Bitte überprüfen Sie Ihre Verbindung und starten Sie Geary neu."
 
-#: ../src/client/application/geary-controller.vala:1335
+#: ../src/client/application/geary-controller.vala:1591
 #, c-format
 msgid "About %s"
 msgstr "Info zu %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <[e-mail]>
-#: ../src/client/application/geary-controller.vala:1338
+#: ../src/client/application/geary-controller.vala:1594
 msgid "translator-credits"
 msgstr "Benjamin Steinwender <[e-mail]>"
 
-#: ../src/client/application/geary-controller.vala:1602
+#: ../src/client/application/geary-controller.vala:1858
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Möchten Sie »%s« wirklich öffnen?"
 
-#: ../src/client/application/geary-controller.vala:1603
+#: ../src/client/application/geary-controller.vala:1859
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -595,32 +609,38 @@
 "Anhänge können Ihr System beschädigen, wenn diese geöffnet werden. Öffnen "
 "Sie nur Dateien von vertrauenswürdigen Quellen."
 
-#: ../src/client/application/geary-controller.vala:1604
+#: ../src/client/application/geary-controller.vala:1860
 msgid "Don't _ask me again"
 msgstr "Nicht noch einmal fragen"
 
-#: ../src/client/application/geary-controller.vala:1622
+#: ../src/client/application/geary-controller.vala:1878
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Die Datei »%s« existiert schon. Möchten Sie diese ersetzen?"
 
-#: ../src/client/application/geary-controller.vala:1624
+#: ../src/client/application/geary-controller.vala:1880
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Die Datei existiert bereits in »%s«. Sie wird überschrieben."
 
-#: ../src/client/application/geary-controller.vala:1627
+#: ../src/client/application/geary-controller.vala:1883
 msgid "_Replace"
 msgstr "_Ersetzen"
 
-#: ../src/client/application/geary-controller.vala:1929
+#. Find out what to do with the inline composers.
+#. TODO: Remove this in favor of automatically saving drafts
+#: ../src/client/application/geary-controller.vala:2150
+msgid "Close open draft messages?"
+msgstr "Offene Nachrichtenentwürfe schließen?"
+
+#: ../src/client/application/geary-controller.vala:2259
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Möchten Sie diese Nachricht dauerhaft löschen?"
 msgstr[1] "Möchten Sie diese Nachrichten dauerhaft löschen?"
 
-#: ../src/client/application/geary-controller.vala:1931
+#: ../src/client/application/geary-controller.vala:2261
 msgid "Delete"
 msgstr "Löschen"
 
@@ -648,23 +668,27 @@
 msgid "Search"
 msgstr "Suchen"
 
-#. Spacer.
 #. Search bar.
-#: ../src/client/components/main-toolbar.vala:84
+#: ../src/client/components/main-toolbar.vala:78
 msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr "Alle E-Mails dieses Kontos nach Stichworten durchsuchen (Strg+S)"
 
-#: ../src/client/components/main-toolbar.vala:205
+#: ../src/client/components/main-toolbar.vala:212
 #, c-format
 msgid "Indexing %s account"
 msgstr "%s-Konto indizieren"
 
-#: ../src/client/components/main-toolbar.vala:212
+#: ../src/client/components/main-toolbar.vala:223
 #: ../src/client/folder-list/folder-list-search-branch.vala:39
 #, c-format
 msgid "Search %s account"
 msgstr "%s-Konto durchsuchen"
 
+#: ../src/client/components/main-window.vala:323
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
@@ -680,7 +704,7 @@
 msgstr "_Abbrechen"
 
 #: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:1
+#: ../ui/preferences.glade.h:2
 msgid "_Close"
 msgstr "_Schließen"
 
@@ -702,7 +726,7 @@
 
 #. Select all.
 #: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1035
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1103
 msgid "Select _All"
 msgstr "Alles _auswählen"
 
@@ -710,173 +734,190 @@
 msgid "_Keep"
 msgstr "_Behalten"
 
-#: ../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Neue Nachricht"
-
-#: ../src/client/composer/composer-window.vala:41
+#: ../src/client/composer/composer-widget.vala:57
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: ../src/client/composer/composer-window.vala:42
+#: ../src/client/composer/composer-widget.vala:58
 msgid "Saving"
 msgstr "Speichern"
 
-#: ../src/client/composer/composer-window.vala:43
+#: ../src/client/composer/composer-widget.vala:59
 msgid "Error saving"
 msgstr "Fehler beim Speichern"
 
 #. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-window.vala:90
+#: ../src/client/composer/composer-widget.vala:117
 msgid "attach|enclosed|enclosing|cover letter"
 msgstr "anhängen | angehängt | anhängend | Deckblatt"
 
-#: ../src/client/composer/composer-window.vala:679
+#: ../src/client/composer/composer-widget.vala:830
 msgid "Do you want to discard the unsaved message?"
 msgstr "Möchten Sie die nicht gespeicherte Nachricht verwerfen?"
 
-#: ../src/client/composer/composer-window.vala:682
+#: ../src/client/composer/composer-widget.vala:833
+#: ../src/client/composer/composer-widget.vala:837
 msgid "Do you want to discard this message?"
 msgstr "Möchten Sie diese Nachricht verwerfen?"
 
-#: ../src/client/composer/composer-window.vala:759
+#: ../src/client/composer/composer-widget.vala:918
 msgid "Send message with an empty subject and body?"
 msgstr "Nachricht ohne Betreff und Inhalt senden?"
 
-#: ../src/client/composer/composer-window.vala:761
+#: ../src/client/composer/composer-widget.vala:920
 msgid "Send message with an empty subject?"
 msgstr "Nachricht ohne Betreff?"
 
-#: ../src/client/composer/composer-window.vala:763
+#: ../src/client/composer/composer-widget.vala:922
 msgid "Send message with an empty body?"
 msgstr "Nachricht ohne Inhalt senden?"
 
-#: ../src/client/composer/composer-window.vala:765
+#: ../src/client/composer/composer-widget.vala:924
 msgid "Send message without an attachment?"
 msgstr "Nachricht ohne Anhang senden?"
 
-#: ../src/client/composer/composer-window.vala:948
+#: ../src/client/composer/composer-widget.vala:1107
 msgid "Cannot add attachment"
 msgstr "Anhang kann nicht hinzugefügt werden"
 
-#: ../src/client/composer/composer-window.vala:959
+#: ../src/client/composer/composer-widget.vala:1118
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "»%s« konnte nicht gefunden werden."
 
-#: ../src/client/composer/composer-window.vala:966
+#: ../src/client/composer/composer-widget.vala:1125
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "»%s« ist ein Ordner."
 
-#: ../src/client/composer/composer-window.vala:973
+#: ../src/client/composer/composer-widget.vala:1132
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "»%s« ist eine leere Datei."
 
-#: ../src/client/composer/composer-window.vala:987
+#: ../src/client/composer/composer-widget.vala:1146
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "»%s« konnte nicht zum Lesen geöffnet werden."
 
-#: ../src/client/composer/composer-window.vala:994
+#: ../src/client/composer/composer-widget.vala:1153
 #, c-format
 msgid "\"%s\" already attached for delivery."
 msgstr "»%s« ist bereits als Anhang ausgewählt worden."
 
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-window.vala:1003
+#: ../src/client/composer/composer-widget.vala:1162
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-window.vala:1265
+#: ../src/client/composer/composer-widget.vala:1222
+msgid "To: "
+msgstr "An: "
+
+#: ../src/client/composer/composer-widget.vala:1225
+msgid "Cc: "
+msgstr "Cc: "
+
+#: ../src/client/composer/composer-widget.vala:1228
+msgid "Bcc: "
+msgstr "Bcc:"
+
+#: ../src/client/composer/composer-widget.vala:1445
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: ../src/client/composer/composer-window.vala:1660
+#: ../src/client/composer/composer-widget.vala:1894
 msgid "_From:"
 msgstr "_Von:"
 
 #. For other types of messages, just show the from account.
 #. Composer label (without mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#. Geary account mail will be sent from
-#: ../src/client/composer/composer-window.vala:1676
-#: ../src/client/conversation-viewer/conversation-viewer.vala:628
-#: ../ui/composer.glade.h:41
+#: ../src/client/composer/composer-widget.vala:1910
+#: ../src/client/conversation-viewer/conversation-viewer.vala:637
 msgid "From:"
 msgstr "Von:"
 
+#. Copyright 2011-2014 Yorba Foundation
+#. *
+#. * This software is licensed under the GNU Lesser General Public License
+#. * (version 2.1 or later).  See the COPYING file in this distribution.
+#.
+#. Window for sending messages.
+#: ../src/client/composer/composer-window.vala:10
+msgid "New Message"
+msgstr "Neue Nachricht"
+
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Ich"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:255
+#: ../src/client/conversation-viewer/conversation-viewer.vala:262
 msgid "No conversations selected."
 msgstr "Keine Konversation ausgewählt"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:257
+#: ../src/client/conversation-viewer/conversation-viewer.vala:264
 #, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u Konversation ausgewählt."
 msgstr[1] "%u Konversationen ausgewählt."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:286
+#: ../src/client/conversation-viewer/conversation-viewer.vala:293
 msgid "No search results found."
 msgstr "Suche erfolglos"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:288
+#: ../src/client/conversation-viewer/conversation-viewer.vala:295
 msgid "No conversations in folder."
 msgstr "Keine Konversation in diesem Ordner."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:536
 msgid "This message contains remote images."
 msgstr "Diese Nachricht enthält Bilder, die im Internet liegen."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:536
 msgid "Show Images"
 msgstr "Bilder anzeigen"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:528
+#: ../src/client/conversation-viewer/conversation-viewer.vala:537
 msgid "Always Show From Sender"
 msgstr "Von diesem Absender immer anzeigen"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:552
+#: ../src/client/conversation-viewer/conversation-viewer.vala:561
 msgid "Edit Draft"
 msgstr "Entwurf bearbeiten"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:631
+#: ../src/client/conversation-viewer/conversation-viewer.vala:640
 msgid "To:"
 msgstr "An:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
+#: ../src/client/conversation-viewer/conversation-viewer.vala:643
 msgid "Cc:"
 msgstr "Cc:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
+#: ../src/client/conversation-viewer/conversation-viewer.vala:646
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
+#: ../src/client/conversation-viewer/conversation-viewer.vala:649
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
+#: ../src/client/conversation-viewer/conversation-viewer.vala:652
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:850
+#: ../src/client/conversation-viewer/conversation-viewer.vala:918
 #, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u gelesene Nachricht"
 msgstr[1] "%u gelesene Nachrichten"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:982
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1050
 #, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
@@ -884,99 +925,99 @@
 "gespeichert werden."
 
 #. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1008
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1076
 #: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Kopieren"
 
 #. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1016
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1084
 msgid "Copy _Email Address"
 msgstr "E-Mail-Adresse kopieren"
 
 #. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1021
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1089
 #: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Link kopieren"
 
 #. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1029
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1097
 msgid "Select _Message"
 msgstr "_Nachricht auswählen"
 
 #. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1109
 msgid "_Inspect"
 msgstr "_Untersuchen"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1267
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1335
 msgid "This link appears to go to"
 msgstr "Dieser Verweis scheint zu folgender Seite zu führen:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1268
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1336
 msgid "but actually goes to"
 msgstr "aber führt tatsächlich zu"
 
 #. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1323
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1391
 msgid " (Invalid?)"
 msgstr " (Unzulässig?)"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1515
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1583
 msgid "_Save As..."
 msgstr "_Speichern unter …"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1520
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1588
 msgid "Save All A_ttachments..."
 msgstr "Alle Anhänge speichern"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1534
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1602
 msgid "_Save Image As..."
 msgstr "_Bild speichern unter …"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1625
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Anhang speichern"
 msgstr[1] "Alle Anhänge speichern"
 
 #. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1572
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1640
 msgid "Reply to _All"
 msgstr "Allen antworten"
 
 #. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1657
 msgid "_Mark as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1661
 msgid "_Mark as Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1599
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1667
 msgid "Mark Unread From _Here"
 msgstr "Von _hier ab als ungelesen markieren"
 
 #. Separator.
 #. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1614
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1682
 msgid "_View Source"
 msgstr "_Quelltext anzeigen"
 
 #. Generate the attachment table.
 #. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1908
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1996
 #: ../src/engine/rfc822/rfc822-utils.vala:327
 msgid "none"
 msgstr "keine"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2038
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2126
 msgid "Failed to open default text editor."
 msgstr "Der Standard-Texteditor konnte nicht geöffnet werden."
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:296
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
 #, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Konversationsinspektor"
@@ -989,6 +1030,93 @@
 msgid "_Attach"
 msgstr "_Anhängen"
 
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+#, c-format
+msgid "Untrusted Connection: %s"
+msgstr "Nicht vertrauenswürdige Verbindung: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+#, c-format
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"Die Identität des %s E-Mail-Servers an der Adresse %s:%u konnte nicht "
+"verifiziert werden."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
+"Wenn Sie »Diesem Server vertrauen« oder »Diesem Server immer vertrauen« "
+"auswählen, ist es möglich, dass Ihr Benutzername und Passwort auf unsichere "
+"Art übertragen werden."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Wenn Sie »Diesem Server nicht vertrauen« auswählen, wird Geary nicht auf "
+"diesen Server zugreifen."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary wird dieses E-Mail-Konto nicht hinzufügen oder aktualisieren"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Wenn Sie »Diesem Server nicht vertrauen« auswählen, wird Geary nicht auf "
+"dieses Konto zugreifen."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+"Geary wird beendet, falls Sie keine anderen offenen E-Mail-Konten haben."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Kontaktieren Sie Ihren Systemadministrator oder E-Mail-Provider, falls Sie "
+"irgendwelche Fragen zu diesen Problemen haben."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
+"Das Server-Zertifikat wurde von keiner bekannten Zertifizierungsstelle "
+"signiert"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
+"Die Identität des Servers stimmt nicht mit der Identität im Zertifikat "
+"überein"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Das Zertifikat des Servers ist abgelaufen"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Das Zertifikat des Servers wurde nicht aktiviert"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Das Zertifikat des Servers wurde widerrufen und ist jetzt ungültig"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Das Zertifikat des Servers wird als unsicher erachtet"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+"Ein Fehler ist während der Bearbeitung des Server-Zertifikats aufgetreten"
+
 #. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
 #. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
@@ -997,7 +1125,7 @@
 msgstr "Bitte geben Sie Ihr Passwort ein"
 
 #. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:30
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1005,7 +1133,7 @@
 msgstr[1] "%d Nachrichten"
 
 #. / Label displaying number of unread email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:37
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1015,7 +1143,7 @@
 #. / This string represents the divider between two messages: "n messages" and "n unread",
 #. / shown in the folder list as a tooltip.  Please use your languages conventions for
 #. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../src/client/folder-list/folder-list-folder-entry.vala:43
+#: ../src/client/folder-list/folder-list-folder-entry.vala:45
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -1150,7 +1278,7 @@
 msgstr "%A"
 
 #: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:742
+#: ../src/engine/rfc822/rfc822-message.vala:741
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
@@ -1178,6 +1306,14 @@
 msgid "KB"
 msgstr "KB"
 
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
+
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
+
 #: ../src/engine/api/geary-service-provider.vala:52
 msgid "Gmail"
 msgstr "Gmail"
@@ -1295,14 +1431,14 @@
 #. List of folder names to match for Drafts, separated by |.  Please add localized common
 #. names for the Drafts folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:521
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
 msgid "Drafts | Draft"
 msgstr "Entwürfe | Entwurf"
 
 #. List of folder names to match for Sent Mail, separated by |.  Please add localized common
 #. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:526
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Gesendet | Gesendete E-Mail | Gesendete E-Mails | Sent | Sent Mail | Sent "
@@ -1311,7 +1447,7 @@
 #. List of folder names to match for Spam, separated by |.  Please add localized common
 #. names for the Spam folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:531
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:545
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1322,7 +1458,7 @@
 #. List of folder names to match for Trash, separated by |.  Please add localized common
 #. names for the Trash folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:536
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Papierkorb | Müll | Trash | Rubbish | Rubbish Bin"
 
@@ -1415,6 +1551,22 @@
 msgid "Please wait while Geary validates your account."
 msgstr "Bitte warten, bis Geary Ihr Konto bestätigt hat."
 
+#: ../ui/certificate_warning_dialog.glade.h:1
+msgid "Untrusted Connection"
+msgstr "Nicht vertrauenswürdige Verbindung"
+
+#: ../ui/certificate_warning_dialog.glade.h:2
+msgid "_Always Trust This Server"
+msgstr "Diesem Server _immer vertrauen"
+
+#: ../ui/certificate_warning_dialog.glade.h:3
+msgid "_Trust This Server"
+msgstr "Diesem Server _vertrauen"
+
+#: ../ui/certificate_warning_dialog.glade.h:4
+msgid "_Don't Trust This Server"
+msgstr "Diesem Server _nicht vertrauen"
+
 #: ../ui/composer.glade.h:1
 msgid "_Undo"
 msgstr "_Rückgängig machen"
@@ -1544,47 +1696,64 @@
 msgid "Fixed Width"
 msgstr "Feste Breite"
 
-#. Address(es) e-mail is to be sent to
+#: ../ui/composer.glade.h:35
+msgid "Detach"
+msgstr "Loslösen"
+
 #: ../ui/composer.glade.h:36
-msgid "_To:"
-msgstr "_An:"
+msgid "_Send"
+msgstr "_Senden"
 
 #: ../ui/composer.glade.h:37
-msgid "_Cc:"
-msgstr "_CC:"
+msgid "Send"
+msgstr "Senden"
 
 #: ../ui/composer.glade.h:38
-msgid "_Subject:"
-msgstr "_Betreff:"
+msgid "_Attach File"
+msgstr "_Datei anhängen"
 
 #: ../ui/composer.glade.h:39
-msgid "_Bcc:"
-msgstr "_Bcc:"
-
-#: ../ui/composer.glade.h:42
+msgid "Attach File"
+msgstr "Datei anhängen"
+
+#: ../ui/composer.glade.h:40
+msgid "_Include Original Attachments"
+msgstr "_Ursprüngliche Anhänge übernehmen"
+
+#: ../ui/composer.glade.h:41
+msgid "Include Original Attachments"
+msgstr "Ursprüngliche Anhänge übernehmen"
+
+#. Address(es) e-mail is to be sent to
+#: ../ui/composer.glade.h:43
+msgid "_To"
+msgstr "_An"
+
+#: ../ui/composer.glade.h:44
+msgid "_Cc"
+msgstr "_CC"
+
+#: ../ui/composer.glade.h:45
+msgid "_Subject"
+msgstr "_Betreff"
+
+#: ../ui/composer.glade.h:46
+msgid "_Bcc"
+msgstr "_Bcc"
+
+#. Geary account mail will be sent from
+#: ../ui/composer.glade.h:48
+msgid "From"
+msgstr "Von"
+
+#: ../ui/composer.glade.h:49
 msgid "Drop files here"
 msgstr "Dateien hier ablegen"
 
-#: ../ui/composer.glade.h:43
+#: ../ui/composer.glade.h:50
 msgid "To add them as attachments"
 msgstr "Als Anhang einfügen"
 
-#: ../ui/composer.glade.h:44
-msgid "_Attach File"
-msgstr "_Datei anhängen"
-
-#: ../ui/composer.glade.h:45
-msgid "_Include Original Attachments"
-msgstr "_Ursprüngliche Anhänge übernehmen"
-
-#: ../ui/composer.glade.h:46
-msgid "C_lose"
-msgstr "S_chließen"
-
-#: ../ui/composer.glade.h:47
-msgid "_Send"
-msgstr "_Senden"
-
 #: ../ui/find_bar.glade.h:1
 msgid "Find:"
 msgstr "Suchen:"
@@ -1602,7 +1771,6 @@
 msgstr "_Groß-/ Kleinschreibung"
 
 #: ../ui/find_bar.glade.h:5
-#| msgid "Labels"
 msgid "label"
 msgstr "Beschriftung"
 
@@ -1611,24 +1779,24 @@
 msgstr "Passwort"
 
 #: ../ui/login.glade.h:2
-msgid "E_mail address:"
-msgstr "E-_Mail-Adresse:"
+msgid "E_mail address"
+msgstr "E-_Mail-Adresse"
 
 #: ../ui/login.glade.h:3
-msgid "_Password:"
-msgstr "_Passwort:"
+msgid "_Password"
+msgstr "_Passwort"
 
 #: ../ui/login.glade.h:4
-msgid "S_ervice:"
-msgstr "Di_enst:"
+msgid "S_ervice"
+msgstr "Di_enst"
 
 #: ../ui/login.glade.h:5
-msgid "N_ame:"
-msgstr "N_ame:"
+msgid "N_ame"
+msgstr "N_ame"
 
 #: ../ui/login.glade.h:7
-msgid "N_ickname:"
-msgstr "N_ickname:"
+msgid "N_ickname"
+msgstr "N_ickname"
 
 #: ../ui/login.glade.h:8
 msgid "Work, Home, etc."
@@ -1643,32 +1811,32 @@
 msgstr "IMAP-Einstellungen"
 
 #: ../ui/login.glade.h:11
-msgid "Se_rver:"
-msgstr "Se_rver:"
+msgid "Se_rver"
+msgstr "Se_rver"
 
 #: ../ui/login.glade.h:12
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "P_ort"
+msgstr "P_ort"
 
 #: ../ui/login.glade.h:13
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
+msgid "Ser_ver"
+msgstr "Ser_ver"
 
 #: ../ui/login.glade.h:14
-msgid "Por_t:"
-msgstr "Por_t:"
+msgid "Por_t"
+msgstr "Por_t"
 
 #: ../ui/login.glade.h:15
 msgid "SMTP settings"
 msgstr "SMTP Einstellungen"
 
 #: ../ui/login.glade.h:16
-msgid "User_name:"
+msgid "User_name"
 msgstr "Be_nutzername"
 
 #: ../ui/login.glade.h:17
-msgid "Pass_word:"
-msgstr "Pass_wort:"
+msgid "Pass_word"
+msgstr "Pass_wort"
 
 #: ../ui/login.glade.h:18
 msgid "SMTP username"
@@ -1679,8 +1847,8 @@
 msgstr "SMTP-Passwort"
 
 #: ../ui/login.glade.h:20
-msgid "_Username:"
-msgstr "Ben_utzername:"
+msgid "_Username"
+msgstr "Ben_utzername"
 
 #: ../ui/login.glade.h:21
 msgid "IMAP username"
@@ -1691,12 +1859,12 @@
 msgstr "IMAP-Passwort"
 
 #: ../ui/login.glade.h:23
-msgid "Encr_yption:"
-msgstr "Verschlüsselung"
+msgid "Encr_yption"
+msgstr "_Verschlüsselung"
 
 #: ../ui/login.glade.h:24
-msgid "Encrypt_ion:"
-msgstr "Verschlüsselung"
+msgid "Encrypt_ion"
+msgstr "_Verschlüsselung"
 
 #: ../ui/login.glade.h:26
 msgid "SSL/TLS"
@@ -1719,8 +1887,20 @@
 msgstr "Speicher"
 
 #: ../ui/login.glade.h:31
-msgid "_Download mail:"
-msgstr "_Mail herunterladen:"
+msgid "_Download mail"
+msgstr "_Mail herunterladen"
+
+#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
+msgid "Composer"
+msgstr "Verfassen"
+
+#: ../ui/login.glade.h:33
+msgid "Save dra_fts on server"
+msgstr "_Entwürfe auf dem Server speichern"
+
+#: ../ui/login.glade.h:34
+msgid "Si_gn emails:"
+msgstr "E-Mails _signieren"
 
 #: ../ui/password-dialog.glade.h:1
 msgid "SMTP Credentials"
@@ -1738,38 +1918,42 @@
 msgid "_Remember password"
 msgstr "_Passwort speichern"
 
-#: ../ui/preferences.glade.h:2
+#: ../ui/preferences.glade.h:1
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../ui/preferences.glade.h:3
 msgid "Reading"
 msgstr "Lesen"
 
-#: ../ui/preferences.glade.h:3
+#: ../ui/preferences.glade.h:4
 msgid "_Automatically select next message"
 msgstr "Automatisch die nächste Nachricht _wählen"
 
-#: ../ui/preferences.glade.h:4
+#: ../ui/preferences.glade.h:5
 msgid "_Display conversation preview"
 msgstr "Konversations_vorschau anzeigen"
 
-#: ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Verfassen"
-
-#: ../ui/preferences.glade.h:6
+#: ../ui/preferences.glade.h:7
 msgid "Enable _spell checking"
 msgstr "_Rechtschreibprüfung aktivieren"
 
-#: ../ui/preferences.glade.h:7
+#: ../ui/preferences.glade.h:8
 msgid "Notifications"
 msgstr "Benachrichtungen"
 
-#: ../ui/preferences.glade.h:8
+#: ../ui/preferences.glade.h:9
 msgid "_Play notification sounds"
 msgstr "_Benachrichtigungstöne abspielen"
 
-#: ../ui/preferences.glade.h:9
+#: ../ui/preferences.glade.h:10
 msgid "Show _notifications for new mail"
 msgstr "Benachrichtigung bei neuer E-Mail _zeigen"
 
+#: ../ui/preferences.glade.h:11
+msgid "Notify of new mail at start_up"
+msgstr "Beim _Start über neue E-Mails benachrichtigen"
+
 #: ../ui/remove_confirm.glade.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
@@ -1799,6 +1983,9 @@
 msgid "Geary upgrade in progress."
 msgstr "Geary-Upgrade wird durchgeführt."
 
+#~ msgid "C_lose"
+#~ msgstr "S_chließen"
+
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "Konversation archivieren (Entf, Backspace, A)"
 

=== modified file 'po/el.po'
--- po/el.po	2014-10-02 02:02:09 +0000
+++ po/el.po	2014-12-29 05:56:39 +0000
@@ -12,8 +12,8 @@
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-06-07 05:02+0000\n"
-"PO-Revision-Date: 2014-06-13 14:45+0200\n"
+"POT-Creation-Date: 2014-11-11 23:29+0000\n"
+"PO-Revision-Date: 2014-11-17 12:04+0200\n"
 "Last-Translator: Tom Tryfonidis <[e-mail]>\n"
 "Language-Team: www.gnome.gr\n"
 "Language: el\n"
@@ -21,27 +21,27 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.6.10\n"
 "X-Project-Style: gnome\n"
 
-#: ../desktop/geary.desktop.in.h:1
+#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
 msgid "Geary"
 msgstr "Geary"
 
-#: ../desktop/geary.desktop.in.h:2
+#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
 #: ../src/client/application/geary-application.vala:18
 msgid "Mail Client"
 msgstr "Πελάτης αλληλογραφίας"
 
-#: ../desktop/geary.desktop.in.h:3
+#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
 msgid "Geary Mail"
 msgstr "Αλληλογραφία Geary"
 
-#: ../desktop/geary.desktop.in.h:4
+#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
 msgid "Send and receive email"
 msgstr "Αποστολή και λήψη ηλεκτρονικού ταχυδρομείου"
 
-#: ../desktop/geary.desktop.in.h:5
+#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
 msgid "Email;E-mail;Mail;"
 msgstr "μήνυμα;ηλεκτρονικό ταχυδρομείο;αλληλογραφία;Email;E-mail;Mail;"
 
@@ -49,6 +49,14 @@
 msgid "Compose Message"
 msgstr "Σύνθεση μηνύματος"
 
+#: ../desktop/geary-attach.contract.in.h:1
+msgid "Send by email"
+msgstr "Αποστολή μέσω ηλεκτρονικού ταχυδρομείου"
+
+#: ../desktop/geary-attach.contract.in.h:2
+msgid "Send files using Geary"
+msgstr "Αποστολή αρχείων χρησιμοποιώντας το Geary"
+
 #: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
 #: ../src/client/components/stock.vala:31
 msgid "_Save"
@@ -117,49 +125,49 @@
 msgid "Everything"
 msgstr "Όλα"
 
-#: ../src/client/accounts/add-edit-page.vala:687
+#: ../src/client/accounts/add-edit-page.vala:686
 msgid "Remem_ber passwords"
 msgstr "Απο_μνημόνευση κωδικών πρόσβασης"
 
-#: ../src/client/accounts/add-edit-page.vala:694 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "Απο_μνημόνευση κωδικού πρόσβασης"
 
-#: ../src/client/accounts/add-edit-page.vala:728
+#: ../src/client/accounts/add-edit-page.vala:727
 msgid "Unable to validate:\n"
 msgstr "Δεν ήταν δυνατή η επικύρωση:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:730
+#: ../src/client/accounts/add-edit-page.vala:729
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Μη έγκυρο ψευδώνυμο λογαριασμού.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:733
+#: ../src/client/accounts/add-edit-page.vala:732
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 "        &#8226; Η διεύθυνση ηλεκτρονικού ταχυδρομείου είναι ήδη καταχωρημένη "
 "στο Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:737
+#: ../src/client/accounts/add-edit-page.vala:736
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; Σφάλμα σύνδεσης IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:740
+#: ../src/client/accounts/add-edit-page.vala:739
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:743
+#: ../src/client/accounts/add-edit-page.vala:742
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; Σφάλμα σύνδεσης SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:746
+#: ../src/client/accounts/add-edit-page.vala:745
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης για το SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:750
+#: ../src/client/accounts/add-edit-page.vala:749
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Σφάλμα σύνδεσης.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:754
+#: ../src/client/accounts/add-edit-page.vala:753
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης.\n"
 
@@ -169,247 +177,259 @@
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
-msgstr "Επισκεφθείτε την ιστοσελίδα Yorba"
+msgstr "Επισκεφθείτε την ιστοσελίδα του Yorba"
 
 #: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Εκκίνηση του Geary με κρυφό κύριο παράθυρο"
+
+#: ../src/client/application/geary-args.vala:11
 msgid "Output debugging information"
 msgstr "Εμφάνιση πληροφοριών αποσφαλμάτωσης"
 
-#: ../src/client/application/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "Καταγραφή παρακολούθησης της συνομιλίας"
 
-#: ../src/client/application/geary-args.vala:12
+#: ../src/client/application/geary-args.vala:13
 msgid "Log network deserialization"
 msgstr "Καταγραφή δραματοποίησης δικτύου"
 
-#: ../src/client/application/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "Καταγραφή δραστηριότητας του δικτύου"
 
 #. / The IMAP replay queue is how changes on the server are replicated on the client.
 #. / It could also be called the IMAP events queue.
-#: ../src/client/application/geary-args.vala:16
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "Καταγραφή ουράς επανάληψης IMAP"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission